From 072dbc0720911f9be639a6f50dfc71d453063215 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 15 Jan 2018 17:33:29 +0530 Subject: [PATCH 001/145] Updating pom.xml version numbers for master to 4.12.0.0-SNAPSHOT Signed-off-by: Rohit Yadav --- agent/pom.xml | 2 +- api/pom.xml | 2 +- client/pom.xml | 2 +- core/pom.xml | 2 +- debian/changelog | 8 +++++++- developer/pom.xml | 2 +- engine/api/pom.xml | 2 +- engine/components-api/pom.xml | 2 +- engine/network/pom.xml | 2 +- engine/orchestration/pom.xml | 2 +- engine/pom.xml | 2 +- engine/schema/pom.xml | 2 +- engine/service/pom.xml | 2 +- engine/storage/cache/pom.xml | 2 +- engine/storage/datamotion/pom.xml | 2 +- engine/storage/image/pom.xml | 2 +- engine/storage/integration-test/pom.xml | 2 +- engine/storage/pom.xml | 2 +- engine/storage/snapshot/pom.xml | 2 +- engine/storage/volume/pom.xml | 2 +- framework/ca/pom.xml | 2 +- framework/cluster/pom.xml | 2 +- framework/config/pom.xml | 2 +- framework/db/pom.xml | 2 +- framework/direct-download/pom.xml | 2 +- framework/events/pom.xml | 2 +- framework/ipc/pom.xml | 2 +- framework/jobs/pom.xml | 2 +- framework/managed-context/pom.xml | 2 +- framework/pom.xml | 2 +- framework/quota/pom.xml | 2 +- framework/rest/pom.xml | 2 +- framework/security/pom.xml | 2 +- framework/spring/lifecycle/pom.xml | 2 +- framework/spring/module/pom.xml | 2 +- maven-standard/pom.xml | 2 +- plugins/acl/dynamic-role-based/pom.xml | 2 +- plugins/acl/static-role-based/pom.xml | 2 +- .../affinity-group-processors/explicit-dedication/pom.xml | 2 +- .../affinity-group-processors/host-anti-affinity/pom.xml | 2 +- plugins/alert-handlers/snmp-alerts/pom.xml | 2 +- plugins/alert-handlers/syslog-alerts/pom.xml | 2 +- plugins/api/discovery/pom.xml | 2 +- plugins/api/rate-limit/pom.xml | 2 +- plugins/api/solidfire-intg-test/pom.xml | 2 +- plugins/api/vmware-sioc/pom.xml | 2 +- plugins/ca/root-ca/pom.xml | 2 +- plugins/database/mysql-ha/pom.xml | 2 +- plugins/database/quota/pom.xml | 2 +- plugins/dedicated-resources/pom.xml | 2 +- plugins/deployment-planners/implicit-dedication/pom.xml | 2 +- plugins/deployment-planners/user-concentrated-pod/pom.xml | 2 +- plugins/deployment-planners/user-dispersing/pom.xml | 2 +- plugins/event-bus/inmemory/pom.xml | 2 +- plugins/event-bus/kafka/pom.xml | 2 +- plugins/event-bus/rabbitmq/pom.xml | 2 +- plugins/file-systems/netapp/pom.xml | 2 +- plugins/ha-planners/skip-heurestics/pom.xml | 2 +- plugins/host-allocators/random/pom.xml | 2 +- plugins/hypervisors/baremetal/pom.xml | 2 +- plugins/hypervisors/hyperv/pom.xml | 2 +- plugins/hypervisors/kvm/pom.xml | 2 +- plugins/hypervisors/ovm/pom.xml | 2 +- plugins/hypervisors/ovm3/pom.xml | 2 +- plugins/hypervisors/simulator/pom.xml | 2 +- plugins/hypervisors/ucs/pom.xml | 2 +- plugins/hypervisors/vmware/pom.xml | 2 +- plugins/hypervisors/xenserver/pom.xml | 2 +- plugins/integrations/cloudian/pom.xml | 2 +- plugins/integrations/prometheus/pom.xml | 2 +- plugins/metrics/pom.xml | 2 +- plugins/network-elements/bigswitch/pom.xml | 2 +- plugins/network-elements/brocade-vcs/pom.xml | 2 +- plugins/network-elements/cisco-vnmc/pom.xml | 2 +- plugins/network-elements/dns-notifier/pom.xml | 2 +- plugins/network-elements/elastic-loadbalancer/pom.xml | 2 +- plugins/network-elements/f5/pom.xml | 2 +- plugins/network-elements/globodns/pom.xml | 2 +- plugins/network-elements/internal-loadbalancer/pom.xml | 2 +- plugins/network-elements/juniper-contrail/pom.xml | 2 +- plugins/network-elements/juniper-srx/pom.xml | 2 +- plugins/network-elements/netscaler/pom.xml | 2 +- plugins/network-elements/nicira-nvp/pom.xml | 4 ++-- plugins/network-elements/nuage-vsp/pom.xml | 2 +- plugins/network-elements/opendaylight/pom.xml | 2 +- plugins/network-elements/ovs/pom.xml | 2 +- plugins/network-elements/palo-alto/pom.xml | 2 +- plugins/network-elements/stratosphere-ssp/pom.xml | 2 +- plugins/network-elements/vxlan/pom.xml | 2 +- plugins/outofbandmanagement-drivers/ipmitool/pom.xml | 2 +- .../outofbandmanagement-drivers/nested-cloudstack/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/storage-allocators/random/pom.xml | 2 +- plugins/storage/image/default/pom.xml | 2 +- plugins/storage/image/s3/pom.xml | 2 +- plugins/storage/image/sample/pom.xml | 2 +- plugins/storage/image/swift/pom.xml | 2 +- plugins/storage/volume/cloudbyte/pom.xml | 2 +- plugins/storage/volume/default/pom.xml | 2 +- plugins/storage/volume/nexenta/pom.xml | 2 +- plugins/storage/volume/sample/pom.xml | 2 +- plugins/storage/volume/solidfire/pom.xml | 2 +- plugins/user-authenticators/ldap/pom.xml | 2 +- plugins/user-authenticators/md5/pom.xml | 2 +- plugins/user-authenticators/pbkdf2/pom.xml | 2 +- plugins/user-authenticators/plain-text/pom.xml | 2 +- plugins/user-authenticators/saml2/pom.xml | 2 +- plugins/user-authenticators/sha256salted/pom.xml | 2 +- pom.xml | 2 +- quickcloud/pom.xml | 2 +- server/pom.xml | 2 +- services/console-proxy-rdp/rdpconsole/pom.xml | 2 +- services/console-proxy/plugin/pom.xml | 2 +- services/console-proxy/pom.xml | 2 +- services/console-proxy/server/pom.xml | 2 +- services/iam/plugin/pom.xml | 2 +- services/iam/server/pom.xml | 2 +- services/pom.xml | 2 +- services/secondary-storage/controller/pom.xml | 2 +- services/secondary-storage/pom.xml | 2 +- services/secondary-storage/server/pom.xml | 2 +- systemvm/pom.xml | 2 +- test/pom.xml | 2 +- tools/apidoc/pom.xml | 2 +- tools/checkstyle/pom.xml | 2 +- tools/devcloud-kvm/pom.xml | 2 +- tools/devcloud4/pom.xml | 2 +- tools/docker/Dockerfile | 2 +- tools/docker/Dockerfile.centos6 | 6 +++--- tools/docker/Dockerfile.marvin | 4 ++-- tools/marvin/pom.xml | 2 +- tools/marvin/setup.py | 2 +- tools/pom.xml | 2 +- tools/wix-cloudstack-maven-plugin/pom.xml | 2 +- usage/pom.xml | 2 +- utils/pom.xml | 2 +- vmware-base/pom.xml | 2 +- 137 files changed, 147 insertions(+), 141 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index 3ee1c5dbacbe..089b2718b817 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT diff --git a/api/pom.xml b/api/pom.xml index 5daa76a3982b..e8cea9ceb16d 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT diff --git a/client/pom.xml b/client/pom.xml index 2d6a2f83d388..f492030689ae 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -17,7 +17,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index d6624e5725b8..2313b29be758 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT diff --git a/debian/changelog b/debian/changelog index 5ee33f2edebc..09dd44ae523a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ +cloudstack (4.12.0.0-SNAPSHOT) unstable; urgency=low + + * Update the version to 4.12.0.0-SNAPSHOT + + -- the Apache CloudStack project Mon, 15 Jan 2018 17:42:30 +0530 + cloudstack (4.11.0.0-SNAPSHOT) unstable; urgency=low * Update the version to 4.11.0.0-SNAPSHOT -- the Apache CloudStack project Mon, 03 Jul 2017 10:06:42 +0530 -cloudstack (4.11.0.0-SNAPSHOT-SNAPSHOT) unstable; urgency=low +cloudstack (4.10.0.0-SNAPSHOT) unstable; urgency=low * Update the version to 4.10.0.snapshot diff --git a/developer/pom.xml b/developer/pom.xml index cf2af4febc1d..3f6236fd6903 100644 --- a/developer/pom.xml +++ b/developer/pom.xml @@ -18,7 +18,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT diff --git a/engine/api/pom.xml b/engine/api/pom.xml index e11d70e25e98..e0af91d2de16 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/engine/components-api/pom.xml b/engine/components-api/pom.xml index 5b5c7b3ab0b7..b690f8e1017c 100644 --- a/engine/components-api/pom.xml +++ b/engine/components-api/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-engine - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/engine/network/pom.xml b/engine/network/pom.xml index 178130ec04d0..4755874aea71 100644 --- a/engine/network/pom.xml +++ b/engine/network/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-engine - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/engine/orchestration/pom.xml b/engine/orchestration/pom.xml index dab3c389c0b1..80adccbe30dc 100755 --- a/engine/orchestration/pom.xml +++ b/engine/orchestration/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-engine - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/engine/pom.xml b/engine/pom.xml index 1bf1249ffbda..7b8e1c101e52 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/engine/schema/pom.xml b/engine/schema/pom.xml index 594225a520cf..ead2e01f367e 100644 --- a/engine/schema/pom.xml +++ b/engine/schema/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-engine - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/engine/service/pom.xml b/engine/service/pom.xml index a14e995ebf6a..58487cf26ae4 100644 --- a/engine/service/pom.xml +++ b/engine/service/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloud-engine - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT cloud-engine-service war diff --git a/engine/storage/cache/pom.xml b/engine/storage/cache/pom.xml index 5cc6ffafac6c..db82afaeca81 100644 --- a/engine/storage/cache/pom.xml +++ b/engine/storage/cache/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloud-engine - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/engine/storage/datamotion/pom.xml b/engine/storage/datamotion/pom.xml index 5b7346cdd6bf..47ef8427d26a 100644 --- a/engine/storage/datamotion/pom.xml +++ b/engine/storage/datamotion/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/engine/storage/image/pom.xml b/engine/storage/image/pom.xml index d49f336ad681..f58155216a08 100644 --- a/engine/storage/image/pom.xml +++ b/engine/storage/image/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml index 26f0f24332f0..3bceb24b7347 100644 --- a/engine/storage/integration-test/pom.xml +++ b/engine/storage/integration-test/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/engine/storage/pom.xml b/engine/storage/pom.xml index 8da1259605a9..cd553e167700 100644 --- a/engine/storage/pom.xml +++ b/engine/storage/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/engine/storage/snapshot/pom.xml b/engine/storage/snapshot/pom.xml index 2d8f54f059d0..fa2aab2b4acb 100644 --- a/engine/storage/snapshot/pom.xml +++ b/engine/storage/snapshot/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/engine/storage/volume/pom.xml b/engine/storage/volume/pom.xml index bc6eaf8bf60f..57879703a79f 100644 --- a/engine/storage/volume/pom.xml +++ b/engine/storage/volume/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/framework/ca/pom.xml b/framework/ca/pom.xml index 9412649b3b97..c886bb027b5a 100644 --- a/framework/ca/pom.xml +++ b/framework/ca/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/framework/cluster/pom.xml b/framework/cluster/pom.xml index 42b8042df222..2d0eb20c62e9 100644 --- a/framework/cluster/pom.xml +++ b/framework/cluster/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/framework/config/pom.xml b/framework/config/pom.xml index 105ab9501ca2..98be7aa6ce66 100644 --- a/framework/config/pom.xml +++ b/framework/config/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/framework/db/pom.xml b/framework/db/pom.xml index f3e8a0190507..6483f4f9b037 100644 --- a/framework/db/pom.xml +++ b/framework/db/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/framework/direct-download/pom.xml b/framework/direct-download/pom.xml index 34a4aecdaba5..62a18e9da5da 100644 --- a/framework/direct-download/pom.xml +++ b/framework/direct-download/pom.xml @@ -25,7 +25,7 @@ cloudstack-framework org.apache.cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml \ No newline at end of file diff --git a/framework/events/pom.xml b/framework/events/pom.xml index 8f3030387053..c39f1d880e04 100644 --- a/framework/events/pom.xml +++ b/framework/events/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/framework/ipc/pom.xml b/framework/ipc/pom.xml index 39976f97e0e9..3454c3012a79 100644 --- a/framework/ipc/pom.xml +++ b/framework/ipc/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/framework/jobs/pom.xml b/framework/jobs/pom.xml index d75f89d145d8..530b0d5e9beb 100644 --- a/framework/jobs/pom.xml +++ b/framework/jobs/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/framework/managed-context/pom.xml b/framework/managed-context/pom.xml index 9140753a85bc..1f7950ac8139 100644 --- a/framework/managed-context/pom.xml +++ b/framework/managed-context/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-maven-standard - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../maven-standard/pom.xml diff --git a/framework/pom.xml b/framework/pom.xml index 66d60de2be14..b7322fe3540e 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT install diff --git a/framework/quota/pom.xml b/framework/quota/pom.xml index 5649d6370249..29a48ba3495d 100644 --- a/framework/quota/pom.xml +++ b/framework/quota/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml index 4c5923a87012..114071332edb 100644 --- a/framework/rest/pom.xml +++ b/framework/rest/pom.xml @@ -22,7 +22,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml cloud-framework-rest diff --git a/framework/security/pom.xml b/framework/security/pom.xml index 7886edfc2160..c6284edd097f 100644 --- a/framework/security/pom.xml +++ b/framework/security/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/framework/spring/lifecycle/pom.xml b/framework/spring/lifecycle/pom.xml index ee12a67e2799..d2b9ffe63601 100644 --- a/framework/spring/lifecycle/pom.xml +++ b/framework/spring/lifecycle/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-maven-standard - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../../maven-standard/pom.xml diff --git a/framework/spring/module/pom.xml b/framework/spring/module/pom.xml index 6cdadd92e39a..bdbf9fb0080f 100644 --- a/framework/spring/module/pom.xml +++ b/framework/spring/module/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-maven-standard - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../../maven-standard/pom.xml diff --git a/maven-standard/pom.xml b/maven-standard/pom.xml index 6e3d8d93fde1..e33931c03f19 100644 --- a/maven-standard/pom.xml +++ b/maven-standard/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/plugins/acl/dynamic-role-based/pom.xml b/plugins/acl/dynamic-role-based/pom.xml index 760645bd715f..3dcc7591ffb4 100644 --- a/plugins/acl/dynamic-role-based/pom.xml +++ b/plugins/acl/dynamic-role-based/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/acl/static-role-based/pom.xml b/plugins/acl/static-role-based/pom.xml index b3f9ffe151b5..c5e9af33fe46 100644 --- a/plugins/acl/static-role-based/pom.xml +++ b/plugins/acl/static-role-based/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/affinity-group-processors/explicit-dedication/pom.xml b/plugins/affinity-group-processors/explicit-dedication/pom.xml index e1389e46ea31..5ad4b6da6fc8 100644 --- a/plugins/affinity-group-processors/explicit-dedication/pom.xml +++ b/plugins/affinity-group-processors/explicit-dedication/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/affinity-group-processors/host-anti-affinity/pom.xml b/plugins/affinity-group-processors/host-anti-affinity/pom.xml index b5eb906585ca..23d7cc7cf03d 100644 --- a/plugins/affinity-group-processors/host-anti-affinity/pom.xml +++ b/plugins/affinity-group-processors/host-anti-affinity/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/alert-handlers/snmp-alerts/pom.xml b/plugins/alert-handlers/snmp-alerts/pom.xml index 95d8833a5e82..bab20be65f65 100644 --- a/plugins/alert-handlers/snmp-alerts/pom.xml +++ b/plugins/alert-handlers/snmp-alerts/pom.xml @@ -22,7 +22,7 @@ cloudstack-plugins org.apache.cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugins/alert-handlers/syslog-alerts/pom.xml b/plugins/alert-handlers/syslog-alerts/pom.xml index 1b5858460a0a..fc51b46447bb 100644 --- a/plugins/alert-handlers/syslog-alerts/pom.xml +++ b/plugins/alert-handlers/syslog-alerts/pom.xml @@ -22,7 +22,7 @@ cloudstack-plugins org.apache.cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugins/api/discovery/pom.xml b/plugins/api/discovery/pom.xml index 05ba4d6b2400..dda5232429f3 100644 --- a/plugins/api/discovery/pom.xml +++ b/plugins/api/discovery/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/api/rate-limit/pom.xml b/plugins/api/rate-limit/pom.xml index e4177709a791..30e297076d40 100644 --- a/plugins/api/rate-limit/pom.xml +++ b/plugins/api/rate-limit/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/api/solidfire-intg-test/pom.xml b/plugins/api/solidfire-intg-test/pom.xml index 0c1638f1decb..c0cfaaa3573e 100644 --- a/plugins/api/solidfire-intg-test/pom.xml +++ b/plugins/api/solidfire-intg-test/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/api/vmware-sioc/pom.xml b/plugins/api/vmware-sioc/pom.xml index 2845c7cb3e23..2fb95bf36b9f 100644 --- a/plugins/api/vmware-sioc/pom.xml +++ b/plugins/api/vmware-sioc/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/ca/root-ca/pom.xml b/plugins/ca/root-ca/pom.xml index e27f49112239..ffc77a533216 100644 --- a/plugins/ca/root-ca/pom.xml +++ b/plugins/ca/root-ca/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/database/mysql-ha/pom.xml b/plugins/database/mysql-ha/pom.xml index 9db88c771878..baa2faeab682 100644 --- a/plugins/database/mysql-ha/pom.xml +++ b/plugins/database/mysql-ha/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/database/quota/pom.xml b/plugins/database/quota/pom.xml index 031b5de3284c..ca230d824606 100644 --- a/plugins/database/quota/pom.xml +++ b/plugins/database/quota/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/dedicated-resources/pom.xml b/plugins/dedicated-resources/pom.xml index 507f3972d0b8..b99706c13c05 100644 --- a/plugins/dedicated-resources/pom.xml +++ b/plugins/dedicated-resources/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/plugins/deployment-planners/implicit-dedication/pom.xml b/plugins/deployment-planners/implicit-dedication/pom.xml index f6ccc4c2dfac..129856a589f7 100644 --- a/plugins/deployment-planners/implicit-dedication/pom.xml +++ b/plugins/deployment-planners/implicit-dedication/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml index b9628dd44cb7..33f50cf5b865 100644 --- a/plugins/deployment-planners/user-concentrated-pod/pom.xml +++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml index b9e3f3781aab..362767973d2d 100644 --- a/plugins/deployment-planners/user-dispersing/pom.xml +++ b/plugins/deployment-planners/user-dispersing/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/event-bus/inmemory/pom.xml b/plugins/event-bus/inmemory/pom.xml index fdf72f803435..b277b7265708 100644 --- a/plugins/event-bus/inmemory/pom.xml +++ b/plugins/event-bus/inmemory/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml index e39596146f37..added90f737a 100644 --- a/plugins/event-bus/kafka/pom.xml +++ b/plugins/event-bus/kafka/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml index c335bb591456..e407a1cac8c4 100644 --- a/plugins/event-bus/rabbitmq/pom.xml +++ b/plugins/event-bus/rabbitmq/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/file-systems/netapp/pom.xml b/plugins/file-systems/netapp/pom.xml index a330a89e07f8..5103ceb145c1 100644 --- a/plugins/file-systems/netapp/pom.xml +++ b/plugins/file-systems/netapp/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/ha-planners/skip-heurestics/pom.xml b/plugins/ha-planners/skip-heurestics/pom.xml index d0bea854c764..f7bcc0515cad 100644 --- a/plugins/ha-planners/skip-heurestics/pom.xml +++ b/plugins/ha-planners/skip-heurestics/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml index 3f4b35b874b7..e431e9c5ce9a 100644 --- a/plugins/host-allocators/random/pom.xml +++ b/plugins/host-allocators/random/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/baremetal/pom.xml b/plugins/hypervisors/baremetal/pom.xml index 82d3e3ba7c5b..37612935b832 100755 --- a/plugins/hypervisors/baremetal/pom.xml +++ b/plugins/hypervisors/baremetal/pom.xml @@ -21,7 +21,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml cloud-plugin-hypervisor-baremetal diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml index 840f43a505d1..1b44bb46206e 100644 --- a/plugins/hypervisors/hyperv/pom.xml +++ b/plugins/hypervisors/hyperv/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index 4905b028520e..f7acce3cf0a7 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml index f4a1ef7c012e..c6fa7ece884c 100644 --- a/plugins/hypervisors/ovm/pom.xml +++ b/plugins/hypervisors/ovm/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml index b73aec475669..214d71d3b48d 100644 --- a/plugins/hypervisors/ovm3/pom.xml +++ b/plugins/hypervisors/ovm3/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/simulator/pom.xml b/plugins/hypervisors/simulator/pom.xml index a49679e082d1..7f60f523d750 100644 --- a/plugins/hypervisors/simulator/pom.xml +++ b/plugins/hypervisors/simulator/pom.xml @@ -22,7 +22,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml cloud-plugin-hypervisor-simulator diff --git a/plugins/hypervisors/ucs/pom.xml b/plugins/hypervisors/ucs/pom.xml index 8f6e148d7e13..de5bfe711faa 100755 --- a/plugins/hypervisors/ucs/pom.xml +++ b/plugins/hypervisors/ucs/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml cloud-plugin-hypervisor-ucs diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml index 0344ae6862ff..0ffc89b6b98f 100644 --- a/plugins/hypervisors/vmware/pom.xml +++ b/plugins/hypervisors/vmware/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/xenserver/pom.xml b/plugins/hypervisors/xenserver/pom.xml index 24f1d4e7b906..69d3fdf44925 100644 --- a/plugins/hypervisors/xenserver/pom.xml +++ b/plugins/hypervisors/xenserver/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/integrations/cloudian/pom.xml b/plugins/integrations/cloudian/pom.xml index 3138bb668ff5..045abe2abedb 100644 --- a/plugins/integrations/cloudian/pom.xml +++ b/plugins/integrations/cloudian/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/integrations/prometheus/pom.xml b/plugins/integrations/prometheus/pom.xml index 66dbebbf1d1d..b18d5d965c02 100644 --- a/plugins/integrations/prometheus/pom.xml +++ b/plugins/integrations/prometheus/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/metrics/pom.xml b/plugins/metrics/pom.xml index c2a9f95a5753..c0ff8bac56e5 100644 --- a/plugins/metrics/pom.xml +++ b/plugins/metrics/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/plugins/network-elements/bigswitch/pom.xml b/plugins/network-elements/bigswitch/pom.xml index a06f012753bd..8cfb63a1454e 100644 --- a/plugins/network-elements/bigswitch/pom.xml +++ b/plugins/network-elements/bigswitch/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/brocade-vcs/pom.xml b/plugins/network-elements/brocade-vcs/pom.xml index af5ee2d3f07b..84b8426521d9 100644 --- a/plugins/network-elements/brocade-vcs/pom.xml +++ b/plugins/network-elements/brocade-vcs/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/cisco-vnmc/pom.xml b/plugins/network-elements/cisco-vnmc/pom.xml index 0d2ded3a32bf..4b8e07345aca 100644 --- a/plugins/network-elements/cisco-vnmc/pom.xml +++ b/plugins/network-elements/cisco-vnmc/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/dns-notifier/pom.xml b/plugins/network-elements/dns-notifier/pom.xml index 85463996a393..e52e5a75f1d1 100644 --- a/plugins/network-elements/dns-notifier/pom.xml +++ b/plugins/network-elements/dns-notifier/pom.xml @@ -22,7 +22,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml cloud-plugin-example-dns-notifier diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml index 7f0d203df761..9c578cbea6b4 100644 --- a/plugins/network-elements/elastic-loadbalancer/pom.xml +++ b/plugins/network-elements/elastic-loadbalancer/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml index fc6b03a6115d..5eafc3f7e4bc 100644 --- a/plugins/network-elements/f5/pom.xml +++ b/plugins/network-elements/f5/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/globodns/pom.xml b/plugins/network-elements/globodns/pom.xml index 33cf20fbf527..62afd4039617 100644 --- a/plugins/network-elements/globodns/pom.xml +++ b/plugins/network-elements/globodns/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/internal-loadbalancer/pom.xml b/plugins/network-elements/internal-loadbalancer/pom.xml index 36d456e4ca82..b56b97c23580 100644 --- a/plugins/network-elements/internal-loadbalancer/pom.xml +++ b/plugins/network-elements/internal-loadbalancer/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml index f98b629c52cb..7d53aa5d8901 100644 --- a/plugins/network-elements/juniper-contrail/pom.xml +++ b/plugins/network-elements/juniper-contrail/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml index d541ea9f621a..ee8fbcbbbdbf 100644 --- a/plugins/network-elements/juniper-srx/pom.xml +++ b/plugins/network-elements/juniper-srx/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml index a8a7eb1628c2..e920236f4fa4 100644 --- a/plugins/network-elements/netscaler/pom.xml +++ b/plugins/network-elements/netscaler/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml index 8f14779fdc9d..400a8546266e 100644 --- a/plugins/network-elements/nicira-nvp/pom.xml +++ b/plugins/network-elements/nicira-nvp/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml @@ -34,7 +34,7 @@ org.apache.cloudstack cloud-utils - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT test-jar test diff --git a/plugins/network-elements/nuage-vsp/pom.xml b/plugins/network-elements/nuage-vsp/pom.xml index 7e0b1ef89cd6..5a0a5317a1fc 100644 --- a/plugins/network-elements/nuage-vsp/pom.xml +++ b/plugins/network-elements/nuage-vsp/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/opendaylight/pom.xml b/plugins/network-elements/opendaylight/pom.xml index ad425b0a62f6..d4ab9162f7dc 100644 --- a/plugins/network-elements/opendaylight/pom.xml +++ b/plugins/network-elements/opendaylight/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml index 365f751490df..53cf25544cc8 100644 --- a/plugins/network-elements/ovs/pom.xml +++ b/plugins/network-elements/ovs/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/palo-alto/pom.xml b/plugins/network-elements/palo-alto/pom.xml index 101f24b6cbe6..e22e76b61567 100644 --- a/plugins/network-elements/palo-alto/pom.xml +++ b/plugins/network-elements/palo-alto/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/stratosphere-ssp/pom.xml b/plugins/network-elements/stratosphere-ssp/pom.xml index e2865316764e..4e40fe3f88a4 100644 --- a/plugins/network-elements/stratosphere-ssp/pom.xml +++ b/plugins/network-elements/stratosphere-ssp/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/vxlan/pom.xml b/plugins/network-elements/vxlan/pom.xml index 3f890f9392ed..ccc7abf4c158 100644 --- a/plugins/network-elements/vxlan/pom.xml +++ b/plugins/network-elements/vxlan/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/outofbandmanagement-drivers/ipmitool/pom.xml b/plugins/outofbandmanagement-drivers/ipmitool/pom.xml index 649bc9a4fbb3..0df7c0948f63 100644 --- a/plugins/outofbandmanagement-drivers/ipmitool/pom.xml +++ b/plugins/outofbandmanagement-drivers/ipmitool/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml b/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml index 5375ffbab275..9b126db7f7c0 100644 --- a/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml +++ b/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 680f670ff85f..3634d60f7817 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml index 9a3b5e8b5476..38f0c45f2005 100644 --- a/plugins/storage-allocators/random/pom.xml +++ b/plugins/storage-allocators/random/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/storage/image/default/pom.xml b/plugins/storage/image/default/pom.xml index 076a9c45c2b7..fd27388537e8 100644 --- a/plugins/storage/image/default/pom.xml +++ b/plugins/storage/image/default/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/image/s3/pom.xml b/plugins/storage/image/s3/pom.xml index 9a63fd27a031..8852f3ac82f7 100644 --- a/plugins/storage/image/s3/pom.xml +++ b/plugins/storage/image/s3/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/image/sample/pom.xml b/plugins/storage/image/sample/pom.xml index dff7d38f632a..55402da6aba1 100644 --- a/plugins/storage/image/sample/pom.xml +++ b/plugins/storage/image/sample/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/image/swift/pom.xml b/plugins/storage/image/swift/pom.xml index 659e1304b158..b243cfaa8900 100644 --- a/plugins/storage/image/swift/pom.xml +++ b/plugins/storage/image/swift/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml index 42827d310ddb..11ce1876afcf 100755 --- a/plugins/storage/volume/cloudbyte/pom.xml +++ b/plugins/storage/volume/cloudbyte/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/volume/default/pom.xml b/plugins/storage/volume/default/pom.xml index cb872a6ec536..dc84c27cedbb 100644 --- a/plugins/storage/volume/default/pom.xml +++ b/plugins/storage/volume/default/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/volume/nexenta/pom.xml b/plugins/storage/volume/nexenta/pom.xml index b0bcddc2ca55..5698f38ab462 100644 --- a/plugins/storage/volume/nexenta/pom.xml +++ b/plugins/storage/volume/nexenta/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/volume/sample/pom.xml b/plugins/storage/volume/sample/pom.xml index fed7aae4aa09..7eb60fe5bb21 100644 --- a/plugins/storage/volume/sample/pom.xml +++ b/plugins/storage/volume/sample/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/volume/solidfire/pom.xml b/plugins/storage/volume/solidfire/pom.xml index 57f759b691db..07c31506863f 100644 --- a/plugins/storage/volume/solidfire/pom.xml +++ b/plugins/storage/volume/solidfire/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml index e2b0ead17e00..1f5ebddbea92 100644 --- a/plugins/user-authenticators/ldap/pom.xml +++ b/plugins/user-authenticators/ldap/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml index 29d4ace25c75..28ad8e304752 100644 --- a/plugins/user-authenticators/md5/pom.xml +++ b/plugins/user-authenticators/md5/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/pbkdf2/pom.xml b/plugins/user-authenticators/pbkdf2/pom.xml index bcbcbcea97df..8a0db2815466 100644 --- a/plugins/user-authenticators/pbkdf2/pom.xml +++ b/plugins/user-authenticators/pbkdf2/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/plain-text/pom.xml b/plugins/user-authenticators/plain-text/pom.xml index c4011b37d24a..77365cb35c1f 100644 --- a/plugins/user-authenticators/plain-text/pom.xml +++ b/plugins/user-authenticators/plain-text/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml index 890d85e372df..c53fa6a48a89 100644 --- a/plugins/user-authenticators/saml2/pom.xml +++ b/plugins/user-authenticators/saml2/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/sha256salted/pom.xml b/plugins/user-authenticators/sha256salted/pom.xml index cf1a8dd08a72..0b9310146d27 100644 --- a/plugins/user-authenticators/sha256salted/pom.xml +++ b/plugins/user-authenticators/sha256salted/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index d639b1268926..3f096f081198 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT pom Apache CloudStack Apache CloudStack is an IaaS ("Infrastructure as a Service") cloud orchestration platform. diff --git a/quickcloud/pom.xml b/quickcloud/pom.xml index efccb96596a2..2d882283a700 100644 --- a/quickcloud/pom.xml +++ b/quickcloud/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-maven-standard - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../maven-standard/pom.xml diff --git a/server/pom.xml b/server/pom.xml index 4067b8590a07..a891bd12e3b8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml index f16d23150467..57a038a26ed4 100755 --- a/services/console-proxy-rdp/rdpconsole/pom.xml +++ b/services/console-proxy-rdp/rdpconsole/pom.xml @@ -27,7 +27,7 @@ org.apache.cloudstack cloudstack-services - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/services/console-proxy/plugin/pom.xml b/services/console-proxy/plugin/pom.xml index db7774f61f5a..2041547561fb 100644 --- a/services/console-proxy/plugin/pom.xml +++ b/services/console-proxy/plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-service-console-proxy - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/services/console-proxy/pom.xml b/services/console-proxy/pom.xml index e219b13b9cc3..7018e0c21010 100644 --- a/services/console-proxy/pom.xml +++ b/services/console-proxy/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-services - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml index 7ec58bbd2c57..611e96a21ec8 100644 --- a/services/console-proxy/server/pom.xml +++ b/services/console-proxy/server/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-service-console-proxy - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/services/iam/plugin/pom.xml b/services/iam/plugin/pom.xml index e7e2aa4e1a96..e1123784c132 100644 --- a/services/iam/plugin/pom.xml +++ b/services/iam/plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-service-iam - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/services/iam/server/pom.xml b/services/iam/server/pom.xml index fb9c4ed160d0..37b70c5c159c 100644 --- a/services/iam/server/pom.xml +++ b/services/iam/server/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-service-iam - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/services/pom.xml b/services/pom.xml index 3972f951d451..45404883924e 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/services/secondary-storage/controller/pom.xml b/services/secondary-storage/controller/pom.xml index d90c985a46dd..2a65c5074a0f 100644 --- a/services/secondary-storage/controller/pom.xml +++ b/services/secondary-storage/controller/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-service-secondary-storage - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/services/secondary-storage/pom.xml b/services/secondary-storage/pom.xml index d91665155caa..067975d2286e 100644 --- a/services/secondary-storage/pom.xml +++ b/services/secondary-storage/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-services - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/services/secondary-storage/server/pom.xml b/services/secondary-storage/server/pom.xml index b1b9e45f2e5a..409d0ee5b736 100644 --- a/services/secondary-storage/server/pom.xml +++ b/services/secondary-storage/server/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-service-secondary-storage - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/systemvm/pom.xml b/systemvm/pom.xml index e5d252313d92..cf9a5543f710 100644 --- a/systemvm/pom.xml +++ b/systemvm/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 1812b0390cf1..fd36b0acc9b5 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml index 61c1ccd59370..728cbb4e6497 100644 --- a/tools/apidoc/pom.xml +++ b/tools/apidoc/pom.xml @@ -17,7 +17,7 @@ org.apache.cloudstack cloud-tools - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml index c8555a3c7481..10fcda94ec20 100644 --- a/tools/checkstyle/pom.xml +++ b/tools/checkstyle/pom.xml @@ -24,7 +24,7 @@ Apache CloudStack Developer Tools - Checkstyle Configuration org.apache.cloudstack checkstyle - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT diff --git a/tools/devcloud-kvm/pom.xml b/tools/devcloud-kvm/pom.xml index 155e0b7231a8..48d520053069 100644 --- a/tools/devcloud-kvm/pom.xml +++ b/tools/devcloud-kvm/pom.xml @@ -17,7 +17,7 @@ org.apache.cloudstack cloud-tools - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/tools/devcloud4/pom.xml b/tools/devcloud4/pom.xml index c3124e00bb7d..97bd1a57b2b5 100644 --- a/tools/devcloud4/pom.xml +++ b/tools/devcloud4/pom.xml @@ -17,7 +17,7 @@ org.apache.cloudstack cloud-tools - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index a927e9b3c3d5..4a9f39819a71 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -20,7 +20,7 @@ FROM ubuntu:16.04 MAINTAINER "Apache CloudStack" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.0.0-SNAPSHOT" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.12.0.0-SNAPSHOT" RUN apt-get -y update && apt-get install -y \ genisoimage \ diff --git a/tools/docker/Dockerfile.centos6 b/tools/docker/Dockerfile.centos6 index 7ccd81467bae..62c750e82948 100644 --- a/tools/docker/Dockerfile.centos6 +++ b/tools/docker/Dockerfile.centos6 @@ -18,7 +18,7 @@ FROM centos:6 MAINTAINER "Apache CloudStack" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.0.0-SNAPSHOT" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.12.0.0-SNAPSHOT" ENV PKG_URL=https://builds.cloudstack.org/job/package-master-rhel63/lastSuccessfulBuild/artifact/dist/rpmbuild/RPMS/x86_64 @@ -26,8 +26,8 @@ ENV PKG_URL=https://builds.cloudstack.org/job/package-master-rhel63/lastSuccessf RUN rpm -i http://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-2.1.3-1.el6.x86_64.rpm RUN yum install -y nc wget \ - ${PKG_URL}/cloudstack-common-4.11.0.0-SNAPSHOT.el6.x86_64.rpm \ - ${PKG_URL}/cloudstack-management-4.11.0.0-SNAPSHOT.el6.x86_64.rpm + ${PKG_URL}/cloudstack-common-4.12.0.0-SNAPSHOT.el6.x86_64.rpm \ + ${PKG_URL}/cloudstack-management-4.12.0.0-SNAPSHOT.el6.x86_64.rpm RUN cd /etc/cloudstack/management; \ ln -s tomcat6-nonssl.conf tomcat6.conf; \ diff --git a/tools/docker/Dockerfile.marvin b/tools/docker/Dockerfile.marvin index e6811bfecb97..632518233779 100644 --- a/tools/docker/Dockerfile.marvin +++ b/tools/docker/Dockerfile.marvin @@ -20,11 +20,11 @@ FROM python:2 MAINTAINER "Apache CloudStack" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.0.0-SNAPSHOT" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.12.0.0-SNAPSHOT" ENV WORK_DIR=/marvin -ENV PKG_URL=https://builds.cloudstack.org/job/build-master-marvin/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.11.0.0-SNAPSHOT.tar.gz +ENV PKG_URL=https://builds.cloudstack.org/job/build-master-marvin/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.12.0.0-SNAPSHOT.tar.gz RUN apt-get update && apt-get install -y vim RUN pip install --upgrade paramiko nose requests diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml index b7f3cfc1562f..931d0ac30c7a 100644 --- a/tools/marvin/pom.xml +++ b/tools/marvin/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-tools - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py index 347d056c45ff..fc60fcb5fa87 100644 --- a/tools/marvin/setup.py +++ b/tools/marvin/setup.py @@ -27,7 +27,7 @@ raise RuntimeError("python setuptools is required to build Marvin") -VERSION = "4.11.0.0-SNAPSHOT" +VERSION = "4.12.0.0-SNAPSHOT" setup(name="Marvin", version=VERSION, diff --git a/tools/pom.xml b/tools/pom.xml index 5287b384a218..9190f5447e62 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -27,7 +27,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/tools/wix-cloudstack-maven-plugin/pom.xml b/tools/wix-cloudstack-maven-plugin/pom.xml index 2d0e81de72d0..19916578a048 100644 --- a/tools/wix-cloudstack-maven-plugin/pom.xml +++ b/tools/wix-cloudstack-maven-plugin/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/usage/pom.xml b/usage/pom.xml index bf3ab665666c..53eeb5ee6dfb 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT diff --git a/utils/pom.xml b/utils/pom.xml index 9005e626cb84..986827d2908e 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT ../pom.xml diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml index 01cfb3a52f14..7928bc22e45c 100644 --- a/vmware-base/pom.xml +++ b/vmware-base/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.11.0.0-SNAPSHOT + 4.12.0.0-SNAPSHOT From 893a88d225276e45f12f9490e6af2c94a81c2965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Aur=C3=A8le=20Brothier?= Date: Fri, 19 Jan 2018 22:49:27 +0100 Subject: [PATCH 002/145] CLOUDSTACK-10105: Use maven standard project structure in all projects (#2283) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove maven standard module (which only a few were using) and get ride of maven customization for the projects structure. - moved all directories to src/main/java, src/main/resources, src/main/scripts, src/test/java, src/test/resources - grep scan to search for src/com and src/org left over - grep for /scripts to fix pom.xml configuration - remove custom configuration in pom.xml Signed-off-by: Marc-Aurèle Brothier --- LICENSE | 4 +- .../java}/com/cloud/agent/Agent.java | 0 .../java}/com/cloud/agent/AgentShell.java | 0 .../java}/com/cloud/agent/IAgentShell.java | 0 .../download/DirectTemplateDownloader.java | 0 .../DirectTemplateDownloaderImpl.java | 0 .../HttpDirectTemplateDownloader.java | 0 .../HttpsDirectTemplateDownloader.java | 0 .../MetalinkDirectTemplateDownloader.java | 0 .../download/NfsDirectTemplateDownloader.java | 0 .../com/cloud/agent/dao/StorageComponent.java | 0 .../agent/dao/impl/PropertiesStorage.java | 0 .../agent/dhcp/DhcpProtocolParserServer.java | 0 .../com/cloud/agent/dhcp/DhcpSnooper.java | 0 .../com/cloud/agent/dhcp/FakeDhcpSnooper.java | 0 .../java}/com/cloud/agent/mockvm/MockVm.java | 0 .../com/cloud/agent/mockvm/MockVmMgr.java | 0 .../java}/com/cloud/agent/mockvm/VmMgr.java | 0 .../cloud/agent/resource/DummyResource.java | 0 .../ConsoleProxyAuthenticationResult.java | 0 .../consoleproxy/ConsoleProxyResource.java | 0 .../com/cloud/agent/vmdata/VmDataServer.java | 0 .../java}/com/cloud/agent/AgentShellTest.java | 0 .../DirectTemplateDownloaderImplTest.java | 0 .../agent/dao/impl/PropertiesStorageTest.java | 0 .../java}/com/cloud/agent/api/Answer.java | 0 .../java}/com/cloud/agent/api/BadCommand.java | 0 .../java}/com/cloud/agent/api/Command.java | 0 .../agent/api/HostVmStateReportEntry.java | 0 .../java}/com/cloud/agent/api/LogLevel.java | 0 .../cloud/agent/api/PvlanSetupCommand.java | 0 .../com/cloud/agent/api/StoragePoolInfo.java | 0 .../cloud/agent/api/UnsupportedAnswer.java | 0 .../com/cloud/agent/api/VgpuTypesInfo.java | 0 .../agent/api}/api/storage/OVFHelper.java | 0 .../cloud/agent/api}/api/to/DatadiskTO.java | 0 .../CopyTemplateToPrimaryStorageAnswer.java | 0 .../api/storage/CreateVolumeOVACommand.java | 0 .../cloud/agent/api/storage/PasswordAuth.java | 0 .../api/storage/PrepareOVAPackingCommand.java | 0 .../cloud/agent/api/to/DataObjectType.java | 0 .../com/cloud/agent/api/to/DataStoreTO.java | 0 .../java}/com/cloud/agent/api/to/DataTO.java | 0 .../java}/com/cloud/agent/api/to/DhcpTO.java | 0 .../java}/com/cloud/agent/api/to/DiskTO.java | 0 .../cloud/agent/api/to/FirewallRuleTO.java | 0 .../com/cloud/agent/api/to/GPUDeviceTO.java | 0 .../java}/com/cloud/agent/api/to/HostTO.java | 0 .../com/cloud/agent/api/to/IpAddressTO.java | 0 .../cloud/agent/api/to/LoadBalancerTO.java | 0 .../cloud/agent/api/to/MonitorServiceTO.java | 0 .../com/cloud/agent/api/to/NetworkACLTO.java | 0 .../com/cloud/agent/api/to/NetworkTO.java | 0 .../java}/com/cloud/agent/api/to/NfsTO.java | 0 .../java}/com/cloud/agent/api/to/NicTO.java | 0 .../agent/api/to/PortForwardingRuleTO.java | 0 .../java}/com/cloud/agent/api/to/S3TO.java | 0 .../cloud/agent/api/to/StaticNatRuleTO.java | 0 .../cloud/agent/api/to/StorageFilerTO.java | 0 .../java}/com/cloud/agent/api/to/SwiftTO.java | 0 .../com/cloud/agent/api/to/TemplateTO.java | 0 .../cloud/agent/api/to/VirtualMachineTO.java | 0 .../com/cloud/agent/api/to/VolumeTO.java | 0 .../manager/allocator/HostAllocator.java | 0 .../agent/manager/allocator/PodAllocator.java | 0 .../java}/com/cloud/alert/Alert.java | 0 .../java}/com/cloud/alert/AlertAdapter.java | 0 .../java}/com/cloud/api/commands/.gitignore | 0 .../ListRecurringSnapshotScheduleCmd.java | 0 .../java}/com/cloud/capacity/Capacity.java | 0 .../com/cloud/capacity/CapacityState.java | 0 .../configuration/ConfigurationService.java | 0 .../com/cloud/configuration/Resource.java | 0 .../cloud/configuration/ResourceCount.java | 0 .../cloud/configuration/ResourceLimit.java | 0 .../consoleproxy/ConsoleProxyAllocator.java | 0 .../java}/com/cloud/dc/DataCenter.java | 0 .../com/cloud/dc/DedicatedResources.java | 0 api/src/{ => main/java}/com/cloud/dc/Pod.java | 0 .../com/cloud/dc/StorageNetworkIpRange.java | 0 .../{ => main/java}/com/cloud/dc/Vlan.java | 0 .../cloud/deploy/DataCenterDeployment.java | 0 .../com/cloud/deploy/DeployDestination.java | 0 .../deploy/DeploymentClusterPlanner.java | 0 .../com/cloud/deploy/DeploymentPlan.java | 0 .../com/cloud/deploy/DeploymentPlanner.java | 0 .../java}/com/cloud/deploy/HAPlanner.java | 0 .../java}/com/cloud/domain/Domain.java | 0 .../java}/com/cloud/domain/PartOf.java | 0 .../java}/com/cloud/event/ActionEvent.java | 0 .../java}/com/cloud/event/ActionEvents.java | 0 .../java}/com/cloud/event/Event.java | 0 .../java}/com/cloud/event/EventCategory.java | 0 .../java}/com/cloud/event/EventTypes.java | 0 .../java}/com/cloud/event/UsageEvent.java | 0 .../exception/AccountLimitException.java | 0 .../exception/AffinityConflictException.java | 0 .../AgentControlChannelException.java | 0 .../exception/AgentUnavailableException.java | 0 .../CloudAuthenticationException.java | 0 .../com/cloud/exception/CloudException.java | 0 .../ConcurrentOperationException.java | 0 .../ConflictingNetworkSettingsException.java | 0 .../cloud/exception/ConnectionException.java | 0 .../DiscoveredWithErrorException.java | 0 .../cloud/exception/DiscoveryException.java | 0 .../com/cloud/exception/HAStateException.java | 0 .../InsufficientAddressCapacityException.java | 0 .../InsufficientCapacityException.java | 0 .../InsufficientNetworkCapacityException.java | 0 .../InsufficientServerCapacityException.java | 0 .../InsufficientStorageCapacityException.java | 0 ...icientVirtualNetworkCapacityException.java | 0 .../exception/InternalErrorException.java | 0 .../InvalidParameterValueException.java | 0 .../exception/ManagementServerException.java | 0 .../NetworkRuleConflictException.java | 0 .../exception/OperationTimedoutException.java | 0 .../exception/PermissionDeniedException.java | 0 .../exception/RequestLimitException.java | 0 .../ResourceAllocationException.java | 0 .../exception/ResourceInUseException.java | 0 .../ResourceUnavailableException.java | 0 .../exception/StorageConflictException.java | 0 .../StorageUnavailableException.java | 0 .../UnsupportedServiceException.java | 0 .../VirtualMachineMigrationException.java | 0 .../{ => main/java}/com/cloud/gpu/GPU.java | 0 .../java}/com/cloud/ha/FenceBuilder.java | 0 .../java}/com/cloud/ha/Investigator.java | 0 .../{ => main/java}/com/cloud/host/Host.java | 0 .../java}/com/cloud/host/HostEnvironment.java | 0 .../java}/com/cloud/host/HostStats.java | 0 .../java}/com/cloud/host/Status.java | 0 .../com/cloud/hypervisor/Hypervisor.java | 0 .../hypervisor/HypervisorCapabilities.java | 0 .../com/cloud/hypervisor/HypervisorGuru.java | 0 .../com/cloud/info/ConsoleProxyLoadInfo.java | 0 .../com/cloud/info/RunningHostCountInfo.java | 0 .../java}/com/cloud/network/GuestVlan.java | 0 .../java}/com/cloud/network/IpAddress.java | 0 .../com/cloud/network/MonitoringService.java | 0 .../java}/com/cloud/network/Network.java | 0 .../network/NetworkMigrationResponder.java | 0 .../java}/com/cloud/network/NetworkModel.java | 0 .../com/cloud/network/NetworkProfile.java | 0 .../com/cloud/network/NetworkRuleApplier.java | 0 .../com/cloud/network/NetworkService.java | 0 .../cloud/network/NetworkUsageService.java | 0 .../java}/com/cloud/network/Networks.java | 0 .../java}/com/cloud/network/OvsProvider.java | 0 .../com/cloud/network/PhysicalNetwork.java | 0 .../PhysicalNetworkServiceProvider.java | 0 .../network/PhysicalNetworkSetupInfo.java | 0 .../network/PhysicalNetworkTrafficType.java | 0 .../com/cloud/network/PublicIpAddress.java | 0 .../com/cloud/network/RemoteAccessVpn.java | 0 .../network/Site2SiteCustomerGateway.java | 0 .../cloud/network/Site2SiteVpnConnection.java | 0 .../cloud/network/Site2SiteVpnGateway.java | 0 .../cloud/network/StorageNetworkService.java | 0 .../java}/com/cloud/network/TrafficLabel.java | 0 .../com/cloud/network/UserIpv6Address.java | 0 .../VirtualNetworkApplianceService.java | 0 .../cloud/network/VirtualRouterProvider.java | 0 .../VpcVirtualNetworkApplianceService.java | 0 .../java}/com/cloud/network/VpnUser.java | 0 .../cloud/network/as/AutoScaleCounter.java | 0 .../com/cloud/network/as/AutoScalePolicy.java | 0 .../cloud/network/as/AutoScaleService.java | 0 .../cloud/network/as/AutoScaleVmGroup.java | 0 .../cloud/network/as/AutoScaleVmProfile.java | 0 .../java}/com/cloud/network/as/Condition.java | 0 .../java}/com/cloud/network/as/Counter.java | 0 .../element/AggregatedCommandExecutor.java | 0 .../network/element/ConnectivityProvider.java | 0 .../network/element/DhcpServiceProvider.java | 0 .../network/element/DnsServiceProvider.java | 0 .../element/FirewallServiceProvider.java | 0 .../com/cloud/network/element/IpDeployer.java | 0 .../network/element/IpDeployingRequester.java | 0 .../element/LoadBalancingServiceProvider.java | 0 .../element/NetworkACLServiceProvider.java | 0 .../cloud/network/element/NetworkElement.java | 0 .../PortForwardingServiceProvider.java | 0 .../network/element/RedundantResource.java | 0 .../RemoteAccessVPNServiceProvider.java | 0 .../element/Site2SiteVpnServiceProvider.java | 0 .../element/SourceNatServiceProvider.java | 0 .../element/StaticNatServiceProvider.java | 0 .../element/UserDataServiceProvider.java | 0 .../element/VirtualRouterElementService.java | 0 .../cloud/network/element/VpcProvider.java | 0 .../network/firewall/FirewallService.java | 0 .../com/cloud/network/guru/NetworkGuru.java | 0 .../guru/NetworkGuruAdditionalFunctions.java | 0 .../cloud/network/lb/LoadBalancingRule.java | 0 .../network/lb/LoadBalancingRulesService.java | 0 .../cloud/network/router/VirtualRouter.java | 0 .../com/cloud/network/rules/FirewallRule.java | 0 .../network/rules/HealthCheckPolicy.java | 0 .../network/rules/LbStickinessMethod.java | 0 .../com/cloud/network/rules/LoadBalancer.java | 0 .../network/rules/LoadBalancerContainer.java | 0 .../network/rules/PortForwardingRule.java | 0 .../com/cloud/network/rules/RulesService.java | 0 .../com/cloud/network/rules/StaticNat.java | 0 .../cloud/network/rules/StaticNatRule.java | 0 .../cloud/network/rules/StickinessPolicy.java | 0 .../cloud/network/security/SecurityGroup.java | 0 .../network/security/SecurityGroupRules.java | 0 .../security/SecurityGroupService.java | 0 .../cloud/network/security/SecurityRule.java | 0 .../com/cloud/network/vpc/NetworkACL.java | 0 .../com/cloud/network/vpc/NetworkACLItem.java | 0 .../cloud/network/vpc/NetworkACLService.java | 0 .../com/cloud/network/vpc/PrivateGateway.java | 0 .../com/cloud/network/vpc/PrivateIp.java | 0 .../com/cloud/network/vpc/StaticRoute.java | 0 .../cloud/network/vpc/StaticRouteProfile.java | 0 .../java}/com/cloud/network/vpc/Vpc.java | 0 .../com/cloud/network/vpc/VpcGateway.java | 0 .../com/cloud/network/vpc/VpcOffering.java | 0 .../network/vpc/VpcProvisioningService.java | 0 .../com/cloud/network/vpc/VpcService.java | 0 .../network/vpn/RemoteAccessVpnService.java | 0 .../network/vpn/Site2SiteVpnService.java | 0 .../com/cloud/offering/DiskOffering.java | 0 .../com/cloud/offering/DiskOfferingInfo.java | 0 .../com/cloud/offering/NetworkOffering.java | 0 .../com/cloud/offering/OfferingManager.java | 0 .../com/cloud/offering/ServiceOffering.java | 0 .../java}/com/cloud/org/Cluster.java | 0 .../java}/com/cloud/org/Grouping.java | 0 .../java}/com/cloud/org/Managed.java | 0 .../java}/com/cloud/org/RunningIn.java | 0 .../java}/com/cloud/projects/Project.java | 0 .../com/cloud/projects/ProjectAccount.java | 0 .../com/cloud/projects/ProjectInvitation.java | 0 .../com/cloud/projects/ProjectService.java | 0 .../region/ha/GlobalLoadBalancerRule.java | 0 .../ha/GlobalLoadBalancingRulesService.java | 0 .../com/cloud/resource/ResourceService.java | 0 .../com/cloud/resource/ResourceState.java | 0 .../resource/UnableDeleteHostException.java | 0 .../java}/com/cloud/serializer/Param.java | 0 .../com/cloud/server/ManagementService.java | 0 .../cloud/server/ResourceMetaDataService.java | 0 .../java}/com/cloud/server/ResourceTag.java | 0 .../cloud/server/TaggedResourceService.java | 0 .../storage/DataStoreProviderApiService.java | 0 .../com/cloud/storage/DataStoreRole.java | 0 .../java}/com/cloud/storage/GuestOS.java | 0 .../com/cloud/storage/GuestOSHypervisor.java | 0 .../com/cloud/storage/GuestOsCategory.java | 0 .../java}/com/cloud/storage/ImageStore.java | 0 .../java}/com/cloud/storage/ScopeType.java | 0 .../java}/com/cloud/storage/Snapshot.java | 0 .../java}/com/cloud/storage/Storage.java | 0 .../java}/com/cloud/storage/StorageGuru.java | 0 .../java}/com/cloud/storage/StoragePool.java | 0 .../cloud/storage/StoragePoolDiscoverer.java | 0 .../com/cloud/storage/StoragePoolStatus.java | 0 .../com/cloud/storage/StorageService.java | 0 .../java}/com/cloud/storage/StorageStats.java | 0 .../java}/com/cloud/storage/Upload.java | 0 .../VMTemplateStorageResourceAssoc.java | 0 .../java}/com/cloud/storage/Volume.java | 0 .../com/cloud/storage/VolumeApiService.java | 0 .../java}/com/cloud/storage/VolumeStats.java | 0 .../storage/snapshot/SnapshotApiService.java | 0 .../storage/snapshot/SnapshotPolicy.java | 0 .../storage/snapshot/SnapshotSchedule.java | 0 .../cloud/storage/template/TemplateProp.java | 0 .../java}/com/cloud/template/BasedOn.java | 0 .../cloud/template/TemplateApiService.java | 0 .../template/VirtualMachineTemplate.java | 0 .../java}/com/cloud/user/Account.java | 0 .../java}/com/cloud/user/AccountService.java | 0 .../java}/com/cloud/user/DomainService.java | 0 .../java}/com/cloud/user/OwnedBy.java | 0 .../com/cloud/user/ResourceLimitService.java | 0 .../java}/com/cloud/user/SSHKeyPair.java | 0 .../{ => main/java}/com/cloud/user/User.java | 0 .../java}/com/cloud/user/UserAccount.java | 0 .../java}/com/cloud/uservm/UserVm.java | 0 .../com/cloud/vm/BareMetalVmService.java | 0 .../java}/com/cloud/vm/ConsoleProxy.java | 0 .../java}/com/cloud/vm/DiskProfile.java | 0 .../java}/com/cloud/vm/InstanceGroup.java | 0 api/src/{ => main/java}/com/cloud/vm/Nic.java | 0 .../com/cloud/vm/NicExtraDhcpOption.java | 0 .../java}/com/cloud/vm/NicIpAlias.java | 0 .../java}/com/cloud/vm/NicProfile.java | 0 .../java}/com/cloud/vm/NicSecondaryIp.java | 0 .../com/cloud/vm/ReservationContext.java | 0 .../java}/com/cloud/vm/RunningOn.java | 0 .../com/cloud/vm/SecondaryStorageVm.java | 0 .../java}/com/cloud/vm/SystemVm.java | 0 .../java}/com/cloud/vm/UserVmService.java | 0 .../java}/com/cloud/vm/VirtualMachine.java | 0 .../com/cloud/vm/VirtualMachineName.java | 0 .../com/cloud/vm/VirtualMachineProfile.java | 0 .../java}/com/cloud/vm/VmDetailConstants.java | 0 .../java}/com/cloud/vm/VmDiskStats.java | 0 .../java}/com/cloud/vm/VmNetworkStats.java | 0 .../{ => main/java}/com/cloud/vm/VmStats.java | 0 .../com/cloud/vm/snapshot/VMSnapshot.java | 0 .../cloud/vm/snapshot/VMSnapshotService.java | 0 .../org/apache/cloudstack/acl/APIChecker.java | 0 .../cloudstack/acl/APILimitChecker.java | 0 .../cloudstack/acl/ControlledEntity.java | 0 .../cloudstack/acl/InfrastructureEntity.java | 0 .../cloudstack/acl/PermissionScope.java | 0 .../apache/cloudstack/acl/QuerySelector.java | 0 .../java}/org/apache/cloudstack/acl/Role.java | 0 .../apache/cloudstack/acl/RolePermission.java | 0 .../apache/cloudstack/acl/RoleService.java | 0 .../org/apache/cloudstack/acl/RoleType.java | 0 .../java}/org/apache/cloudstack/acl/Rule.java | 0 .../cloudstack/acl/SecurityChecker.java | 0 .../cloudstack/affinity/AffinityGroup.java | 0 .../affinity/AffinityGroupProcessor.java | 0 .../affinity/AffinityGroupResponse.java | 0 .../affinity/AffinityGroupService.java | 0 .../affinity/AffinityGroupTypeResponse.java | 0 .../affinity/AffinityProcessorBase.java | 0 .../apache/cloudstack/alert/AlertService.java | 0 .../cloudstack/annotation/Annotation.java | 0 .../annotation/AnnotationService.java | 0 .../java}/org/apache/cloudstack/api/ACL.java | 0 .../org/apache/cloudstack/api/APICommand.java | 0 .../api/AbstractGetUploadParamsCmd.java | 0 .../cloudstack/api/ApiArgValidator.java | 0 .../cloudstack/api/ApiCommandJobType.java | 0 .../apache/cloudstack/api/ApiConstants.java | 0 .../apache/cloudstack/api/ApiErrorCode.java | 0 .../cloudstack/api/ApiServerService.java | 0 .../apache/cloudstack/api/BaseAsyncCmd.java | 0 .../cloudstack/api/BaseAsyncCreateCmd.java | 0 .../api/BaseAsyncCreateCustomIdCmd.java | 0 .../cloudstack/api/BaseAsyncCustomIdCmd.java | 0 .../org/apache/cloudstack/api/BaseCmd.java | 0 .../cloudstack/api/BaseCustomIdCmd.java | 0 .../api/BaseListAccountResourcesCmd.java | 0 .../apache/cloudstack/api/BaseListCmd.java | 0 .../api/BaseListDomainResourcesCmd.java | 0 ...BaseListProjectAndAccountResourcesCmd.java | 0 .../api/BaseListTaggedResourcesCmd.java | 0 .../BaseListTemplateOrIsoPermissionsCmd.java | 0 .../apache/cloudstack/api/BaseResponse.java | 0 .../api/BaseResponseWithTagInformation.java | 0 .../api/BaseUpdateTemplateOrIsoCmd.java | 0 ...BaseUpdateTemplateOrIsoPermissionsCmd.java | 0 .../apache/cloudstack/api/Displayable.java | 0 .../cloudstack/api/EntityReference.java | 0 .../api/IBaseListAccountResourcesCmd.java | 0 .../apache/cloudstack/api/IBaseListCmd.java | 0 .../api/IBaseListDomainResourcesCmd.java | 0 ...BaseListProjectAndAccountResourcesCmd.java | 0 .../api/IBaseListTaggedResourcesCmd.java | 0 .../org/apache/cloudstack/api/Identity.java | 0 .../cloudstack/api/InternalIdentity.java | 0 .../apache/cloudstack/api/LdapValidator.java | 0 .../org/apache/cloudstack/api/Parameter.java | 0 .../apache/cloudstack/api/ResourceDetail.java | 0 .../cloudstack/api/ResponseGenerator.java | 0 .../apache/cloudstack/api/ResponseObject.java | 0 .../cloudstack/api/ServerApiException.java | 0 .../org/apache/cloudstack/api/Validate.java | 0 .../api/auth/APIAuthenticationManager.java | 0 .../api/auth/APIAuthenticationType.java | 0 .../cloudstack/api/auth/APIAuthenticator.java | 0 .../api/auth/PluggableAPIAuthenticator.java | 0 .../admin/account/CreateAccountCmd.java | 0 .../admin/account/DeleteAccountCmd.java | 0 .../admin/account/DisableAccountCmd.java | 0 .../admin/account/EnableAccountCmd.java | 0 .../admin/account/ListAccountsCmdByAdmin.java | 0 .../command/admin/account/LockAccountCmd.java | 0 .../admin/account/UpdateAccountCmd.java | 0 .../api/command/admin/acl/CreateRoleCmd.java | 0 .../admin/acl/CreateRolePermissionCmd.java | 0 .../api/command/admin/acl/DeleteRoleCmd.java | 0 .../admin/acl/DeleteRolePermissionCmd.java | 0 .../admin/acl/ListRolePermissionsCmd.java | 0 .../api/command/admin/acl/ListRolesCmd.java | 0 .../api/command/admin/acl/UpdateRoleCmd.java | 0 .../admin/acl/UpdateRolePermissionCmd.java | 0 .../admin/address/AcquirePodIpCmdByAdmin.java | 0 .../address/AssociateIPAddrCmdByAdmin.java | 0 .../ListPublicIpAddressesCmdByAdmin.java | 0 .../admin/address/ReleasePodIpCmdByAdmin.java | 0 .../UpdateVMAffinityGroupCmdByAdmin.java | 0 .../command/admin/alert/GenerateAlertCmd.java | 0 .../admin/annotation/AddAnnotationCmd.java | 0 .../admin/annotation/ListAnnotationsCmd.java | 0 .../admin/annotation/RemoveAnnotationCmd.java | 0 .../admin/autoscale/CreateCounterCmd.java | 0 .../admin/autoscale/DeleteCounterCmd.java | 0 .../command/admin/ca/IssueCertificateCmd.java | 0 .../command/admin/ca/ListCAProvidersCmd.java | 0 .../admin/ca/ListCaCertificateCmd.java | 0 .../admin/ca/ProvisionCertificateCmd.java | 0 .../admin/ca/RevokeCertificateCmd.java | 0 .../command/admin/cluster/AddClusterCmd.java | 0 .../admin/cluster/DeleteClusterCmd.java | 0 .../admin/cluster/ListClustersCmd.java | 0 .../admin/cluster/UpdateClusterCmd.java | 0 .../command/admin/config/ListCfgsByCmd.java | 0 .../config/ListDeploymentPlannersCmd.java | 0 .../config/ListHypervisorCapabilitiesCmd.java | 0 .../command/admin/config/UpdateCfgCmd.java | 0 .../UpdateHypervisorCapabilitiesCmd.java | 0 .../command/admin/domain/CreateDomainCmd.java | 0 .../command/admin/domain/DeleteDomainCmd.java | 0 .../admin/domain/ListDomainChildrenCmd.java | 0 .../command/admin/domain/ListDomainsCmd.java | 0 .../admin/domain/ListDomainsCmdByAdmin.java | 0 .../command/admin/domain/UpdateDomainCmd.java | 0 .../command/admin/guest/AddGuestOsCmd.java | 0 .../admin/guest/AddGuestOsMappingCmd.java | 0 .../admin/guest/ListGuestOsMappingCmd.java | 0 .../command/admin/guest/RemoveGuestOsCmd.java | 0 .../admin/guest/RemoveGuestOsMappingCmd.java | 0 .../command/admin/guest/UpdateGuestOsCmd.java | 0 .../admin/guest/UpdateGuestOsMappingCmd.java | 0 .../admin/ha/ConfigureHAForHostCmd.java | 0 .../admin/ha/DisableHAForClusterCmd.java | 0 .../command/admin/ha/DisableHAForHostCmd.java | 0 .../command/admin/ha/DisableHAForZoneCmd.java | 0 .../admin/ha/EnableHAForClusterCmd.java | 0 .../command/admin/ha/EnableHAForHostCmd.java | 0 .../command/admin/ha/EnableHAForZoneCmd.java | 0 .../admin/ha/ListHostHAProvidersCmd.java | 0 .../admin/ha/ListHostHAResourcesCmd.java | 0 .../api/command/admin/host/AddHostCmd.java | 0 .../admin/host/AddSecondaryStorageCmd.java | 0 .../admin/host/CancelMaintenanceCmd.java | 0 .../api/command/admin/host/DeleteHostCmd.java | 0 .../admin/host/FindHostsForMigrationCmd.java | 0 .../command/admin/host/ListHostTagsCmd.java | 0 .../api/command/admin/host/ListHostsCmd.java | 0 .../admin/host/PrepareForMaintenanceCmd.java | 0 .../command/admin/host/ReconnectHostCmd.java | 0 .../admin/host/ReleaseHostReservationCmd.java | 0 .../api/command/admin/host/UpdateHostCmd.java | 0 .../admin/host/UpdateHostPasswordCmd.java | 0 ...nfigureInternalLoadBalancerElementCmd.java | 0 .../CreateInternalLoadBalancerElementCmd.java | 0 .../internallb/ListInternalLBVMsCmd.java | 0 .../ListInternalLoadBalancerElementsCmd.java | 0 .../internallb/StartInternalLBVMCmd.java | 0 .../admin/internallb/StopInternalLBVMCmd.java | 0 .../admin/iso/AttachIsoCmdByAdmin.java | 0 .../command/admin/iso/CopyIsoCmdByAdmin.java | 0 .../admin/iso/DetachIsoCmdByAdmin.java | 0 .../iso/ListIsoPermissionsCmdByAdmin.java | 0 .../command/admin/iso/ListIsosCmdByAdmin.java | 0 .../admin/iso/RegisterIsoCmdByAdmin.java | 0 .../admin/iso/UpdateIsoCmdByAdmin.java | 0 ...stLoadBalancerRuleInstancesCmdByAdmin.java | 0 .../admin/network/AddNetworkDeviceCmd.java | 0 .../network/AddNetworkServiceProviderCmd.java | 0 .../network/CreateNetworkCmdByAdmin.java | 0 .../network/CreateNetworkOfferingCmd.java | 0 .../network/CreatePhysicalNetworkCmd.java | 0 .../CreateStorageNetworkIpRangeCmd.java | 0 .../network/DedicateGuestVlanRangeCmd.java | 0 .../admin/network/DeleteNetworkDeviceCmd.java | 0 .../network/DeleteNetworkOfferingCmd.java | 0 .../DeleteNetworkServiceProviderCmd.java | 0 .../network/DeletePhysicalNetworkCmd.java | 0 .../DeleteStorageNetworkIpRangeCmd.java | 0 .../ListDedicatedGuestVlanRangesCmd.java | 0 .../admin/network/ListNetworkDeviceCmd.java | 0 .../ListNetworkIsolationMethodsCmd.java | 0 .../ListNetworkServiceProvidersCmd.java | 0 .../admin/network/ListNetworksCmdByAdmin.java | 0 .../network/ListPhysicalNetworksCmd.java | 0 .../network/ListStorageNetworkIpRangeCmd.java | 0 .../ListSupportedNetworkServicesCmd.java | 0 .../ReleaseDedicatedGuestVlanRangeCmd.java | 0 .../network/UpdateNetworkCmdByAdmin.java | 0 .../network/UpdateNetworkOfferingCmd.java | 0 .../UpdateNetworkServiceProviderCmd.java | 0 .../network/UpdatePhysicalNetworkCmd.java | 0 .../UpdateStorageNetworkIpRangeCmd.java | 0 .../admin/offering/CreateDiskOfferingCmd.java | 0 .../offering/CreateServiceOfferingCmd.java | 0 .../admin/offering/DeleteDiskOfferingCmd.java | 0 .../offering/DeleteServiceOfferingCmd.java | 0 .../admin/offering/UpdateDiskOfferingCmd.java | 0 .../offering/UpdateServiceOfferingCmd.java | 0 .../ChangeOutOfBandManagementPasswordCmd.java | 0 .../ConfigureOutOfBandManagementCmd.java | 0 ...sableOutOfBandManagementForClusterCmd.java | 0 .../DisableOutOfBandManagementForHostCmd.java | 0 .../DisableOutOfBandManagementForZoneCmd.java | 0 ...nableOutOfBandManagementForClusterCmd.java | 0 .../EnableOutOfBandManagementForHostCmd.java | 0 .../EnableOutOfBandManagementForZoneCmd.java | 0 ...ssueOutOfBandManagementPowerActionCmd.java | 0 .../api/command/admin/pod/CreatePodCmd.java | 0 .../api/command/admin/pod/DeletePodCmd.java | 0 .../api/command/admin/pod/ListPodsByCmd.java | 0 .../api/command/admin/pod/UpdatePodCmd.java | 0 .../command/admin/region/AddRegionCmd.java | 0 .../region/CreatePortableIpRangeCmd.java | 0 .../region/DeletePortableIpRangeCmd.java | 0 .../admin/region/ListPortableIpRangesCmd.java | 0 .../command/admin/region/RemoveRegionCmd.java | 0 .../command/admin/region/UpdateRegionCmd.java | 0 .../admin/resource/ArchiveAlertsCmd.java | 0 .../resource/CleanVMReservationsCmd.java | 0 .../admin/resource/DeleteAlertsCmd.java | 0 .../command/admin/resource/ListAlertsCmd.java | 0 .../admin/resource/ListCapacityCmd.java | 0 .../resource/UploadCustomCertificateCmd.java | 0 .../admin/router/ConfigureOvsElementCmd.java | 0 .../ConfigureVirtualRouterElementCmd.java | 0 .../router/CreateVirtualRouterElementCmd.java | 0 .../admin/router/DestroyRouterCmd.java | 0 .../admin/router/ListOvsElementsCmd.java | 0 .../command/admin/router/ListRoutersCmd.java | 0 .../router/ListVirtualRouterElementsCmd.java | 0 .../command/admin/router/RebootRouterCmd.java | 0 .../command/admin/router/StartRouterCmd.java | 0 .../command/admin/router/StopRouterCmd.java | 0 .../admin/router/UpgradeRouterCmd.java | 0 .../router/UpgradeRouterTemplateCmd.java | 0 .../admin/storage/AddImageStoreCmd.java | 0 .../admin/storage/AddImageStoreS3CMD.java | 0 .../CancelPrimaryStorageMaintenanceCmd.java | 0 .../CreateSecondaryStagingStoreCmd.java | 0 .../admin/storage/CreateStoragePoolCmd.java | 0 .../admin/storage/DeleteImageStoreCmd.java | 0 .../command/admin/storage/DeletePoolCmd.java | 0 .../DeleteSecondaryStagingStoreCmd.java | 0 .../FindStoragePoolsForMigrationCmd.java | 0 .../admin/storage/ListImageStoresCmd.java | 0 .../ListSecondaryStagingStoresCmd.java | 0 .../admin/storage/ListStoragePoolsCmd.java | 0 .../storage/ListStorageProvidersCmd.java | 0 .../admin/storage/ListStorageTagsCmd.java | 0 ...reparePrimaryStorageForMaintenanceCmd.java | 0 .../UpdateCloudToUseObjectStoreCmd.java | 0 .../admin/storage/UpdateStoragePoolCmd.java | 0 .../api/command/admin/swift/AddSwiftCmd.java | 0 .../command/admin/swift/ListSwiftsCmd.java | 0 .../admin/systemvm/DestroySystemVmCmd.java | 0 .../admin/systemvm/ListSystemVMsCmd.java | 0 .../admin/systemvm/MigrateSystemVMCmd.java | 0 .../admin/systemvm/RebootSystemVmCmd.java | 0 .../admin/systemvm/ScaleSystemVMCmd.java | 0 .../admin/systemvm/StartSystemVMCmd.java | 0 .../admin/systemvm/StopSystemVmCmd.java | 0 .../admin/systemvm/UpgradeSystemVMCmd.java | 0 .../template/CopyTemplateCmdByAdmin.java | 0 .../template/CreateTemplateCmdByAdmin.java | 0 .../ListTemplatePermissionsCmdByAdmin.java | 0 .../template/ListTemplatesCmdByAdmin.java | 0 .../admin/template/PrepareTemplateCmd.java | 0 .../template/RegisterTemplateCmdByAdmin.java | 0 .../template/UpdateTemplateCmdByAdmin.java | 0 .../admin/usage/AddTrafficMonitorCmd.java | 0 .../admin/usage/AddTrafficTypeCmd.java | 0 .../admin/usage/DeleteTrafficMonitorCmd.java | 0 .../admin/usage/DeleteTrafficTypeCmd.java | 0 .../admin/usage/GenerateUsageRecordsCmd.java | 0 .../admin/usage/GetUsageRecordsCmd.java | 0 .../admin/usage/ListTrafficMonitorsCmd.java | 0 .../usage/ListTrafficTypeImplementorsCmd.java | 0 .../admin/usage/ListTrafficTypesCmd.java | 0 .../admin/usage/ListUsageTypesCmd.java | 0 .../admin/usage/RemoveRawUsageRecordsCmd.java | 0 .../admin/usage/UpdateTrafficTypeCmd.java | 0 .../api/command/admin/user/CreateUserCmd.java | 0 .../api/command/admin/user/DeleteUserCmd.java | 0 .../command/admin/user/DisableUserCmd.java | 0 .../api/command/admin/user/EnableUserCmd.java | 0 .../api/command/admin/user/GetUserCmd.java | 0 .../command/admin/user/GetUserKeysCmd.java | 0 .../api/command/admin/user/ListUsersCmd.java | 0 .../api/command/admin/user/LockUserCmd.java | 0 .../api/command/admin/user/RegisterCmd.java | 0 .../api/command/admin/user/UpdateUserCmd.java | 0 .../admin/vlan/CreateVlanIpRangeCmd.java | 0 .../admin/vlan/DedicatePublicIpRangeCmd.java | 0 .../admin/vlan/DeleteVlanIpRangeCmd.java | 0 .../admin/vlan/ListVlanIpRangesCmd.java | 0 .../admin/vlan/ReleasePublicIpRangeCmd.java | 0 .../admin/vm/AddNicToVMCmdByAdmin.java | 0 .../api/command/admin/vm/AssignVMCmd.java | 0 .../command/admin/vm/DeployVMCmdByAdmin.java | 0 .../command/admin/vm/DestroyVMCmdByAdmin.java | 0 .../api/command/admin/vm/ExpungeVMCmd.java | 0 .../command/admin/vm/GetVMUserDataCmd.java | 0 .../command/admin/vm/ListVMsCmdByAdmin.java | 0 .../api/command/admin/vm/MigrateVMCmd.java | 0 .../MigrateVirtualMachineWithVolumeCmd.java | 0 .../command/admin/vm/RebootVMCmdByAdmin.java | 0 .../api/command/admin/vm/RecoverVMCmd.java | 0 .../admin/vm/RemoveNicFromVMCmdByAdmin.java | 0 .../admin/vm/ResetVMPasswordCmdByAdmin.java | 0 .../admin/vm/ResetVMSSHKeyCmdByAdmin.java | 0 .../command/admin/vm/RestoreVMCmdByAdmin.java | 0 .../command/admin/vm/ScaleVMCmdByAdmin.java | 0 .../command/admin/vm/StartVMCmdByAdmin.java | 0 .../command/admin/vm/StopVMCmdByAdmin.java | 0 .../vm/UpdateDefaultNicForVMCmdByAdmin.java | 0 .../command/admin/vm/UpdateVMCmdByAdmin.java | 0 .../command/admin/vm/UpgradeVMCmdByAdmin.java | 0 .../RevertToVMSnapshotCmdByAdmin.java | 0 .../admin/volume/AttachVolumeCmdByAdmin.java | 0 .../admin/volume/CreateVolumeCmdByAdmin.java | 0 .../admin/volume/DetachVolumeCmdByAdmin.java | 0 .../admin/volume/ListVolumesCmdByAdmin.java | 0 .../admin/volume/MigrateVolumeCmdByAdmin.java | 0 .../admin/volume/ResizeVolumeCmdByAdmin.java | 0 .../admin/volume/UpdateVolumeCmdByAdmin.java | 0 .../admin/volume/UploadVolumeCmdByAdmin.java | 0 .../admin/vpc/CreatePrivateGatewayCmd.java | 0 .../admin/vpc/CreateVPCCmdByAdmin.java | 0 .../admin/vpc/CreateVPCOfferingCmd.java | 0 .../admin/vpc/DeletePrivateGatewayCmd.java | 0 .../admin/vpc/DeleteVPCOfferingCmd.java | 0 .../command/admin/vpc/ListVPCsCmdByAdmin.java | 0 .../admin/vpc/UpdateVPCCmdByAdmin.java | 0 .../admin/vpc/UpdateVPCOfferingCmd.java | 0 .../api/command/admin/zone/CreateZoneCmd.java | 0 .../api/command/admin/zone/DeleteZoneCmd.java | 0 .../admin/zone/ListZonesCmdByAdmin.java | 0 .../zone/MarkDefaultZoneForAccountCmd.java | 0 .../api/command/admin/zone/UpdateZoneCmd.java | 0 .../user/account/AddAccountToProjectCmd.java | 0 .../account/DeleteAccountFromProjectCmd.java | 0 .../command/user/account/ListAccountsCmd.java | 0 .../user/account/ListProjectAccountsCmd.java | 0 .../user/address/AssociateIPAddrCmd.java | 0 .../user/address/DisassociateIPAddrCmd.java | 0 .../address/ListPublicIpAddressesCmd.java | 0 .../command/user/address/UpdateIPAddrCmd.java | 0 .../affinitygroup/CreateAffinityGroupCmd.java | 0 .../affinitygroup/DeleteAffinityGroupCmd.java | 0 .../ListAffinityGroupTypesCmd.java | 0 .../affinitygroup/ListAffinityGroupsCmd.java | 0 .../UpdateVMAffinityGroupCmd.java | 0 .../autoscale/CreateAutoScalePolicyCmd.java | 0 .../autoscale/CreateAutoScaleVmGroupCmd.java | 0 .../CreateAutoScaleVmProfileCmd.java | 0 .../user/autoscale/CreateConditionCmd.java | 0 .../autoscale/DeleteAutoScalePolicyCmd.java | 0 .../autoscale/DeleteAutoScaleVmGroupCmd.java | 0 .../DeleteAutoScaleVmProfileCmd.java | 0 .../user/autoscale/DeleteConditionCmd.java | 0 .../autoscale/DisableAutoScaleVmGroupCmd.java | 0 .../autoscale/EnableAutoScaleVmGroupCmd.java | 0 .../autoscale/ListAutoScalePoliciesCmd.java | 0 .../autoscale/ListAutoScaleVmGroupsCmd.java | 0 .../autoscale/ListAutoScaleVmProfilesCmd.java | 0 .../user/autoscale/ListConditionsCmd.java | 0 .../user/autoscale/ListCountersCmd.java | 0 .../autoscale/UpdateAutoScalePolicyCmd.java | 0 .../autoscale/UpdateAutoScaleVmGroupCmd.java | 0 .../UpdateAutoScaleVmProfileCmd.java | 0 .../user/config/ListCapabilitiesCmd.java | 0 .../command/user/event/ArchiveEventsCmd.java | 0 .../command/user/event/DeleteEventsCmd.java | 0 .../command/user/event/ListEventTypesCmd.java | 0 .../api/command/user/event/ListEventsCmd.java | 0 .../firewall/CreateEgressFirewallRuleCmd.java | 0 .../user/firewall/CreateFirewallRuleCmd.java | 0 .../firewall/CreatePortForwardingRuleCmd.java | 0 .../firewall/DeleteEgressFirewallRuleCmd.java | 0 .../user/firewall/DeleteFirewallRuleCmd.java | 0 .../firewall/DeletePortForwardingRuleCmd.java | 0 .../user/firewall/IListFirewallRulesCmd.java | 0 .../firewall/ListEgressFirewallRulesCmd.java | 0 .../user/firewall/ListFirewallRulesCmd.java | 0 .../firewall/ListPortForwardingRulesCmd.java | 0 .../firewall/UpdateEgressFirewallRuleCmd.java | 0 .../user/firewall/UpdateFirewallRuleCmd.java | 0 .../firewall/UpdatePortForwardingRuleCmd.java | 0 .../user/guest/ListGuestOsCategoriesCmd.java | 0 .../command/user/guest/ListGuestOsCmd.java | 0 .../api/command/user/iso/AttachIsoCmd.java | 0 .../api/command/user/iso/CopyIsoCmd.java | 0 .../api/command/user/iso/DeleteIsoCmd.java | 0 .../api/command/user/iso/DetachIsoCmd.java | 0 .../api/command/user/iso/ExtractIsoCmd.java | 0 .../user/iso/ListIsoPermissionsCmd.java | 0 .../api/command/user/iso/ListIsosCmd.java | 0 .../api/command/user/iso/RegisterIsoCmd.java | 0 .../api/command/user/iso/UpdateIsoCmd.java | 0 .../user/iso/UpdateIsoPermissionsCmd.java | 0 .../command/user/job/ListAsyncJobsCmd.java | 0 .../user/job/QueryAsyncJobResultCmd.java | 0 .../AssignCertToLoadBalancerCmd.java | 0 .../AssignToLoadBalancerRuleCmd.java | 0 .../CreateApplicationLoadBalancerCmd.java | 0 .../CreateLBHealthCheckPolicyCmd.java | 0 .../CreateLBStickinessPolicyCmd.java | 0 .../CreateLoadBalancerRuleCmd.java | 0 .../DeleteApplicationLoadBalancerCmd.java | 0 .../DeleteLBHealthCheckPolicyCmd.java | 0 .../DeleteLBStickinessPolicyCmd.java | 0 .../DeleteLoadBalancerRuleCmd.java | 0 .../user/loadbalancer/DeleteSslCertCmd.java | 0 .../ListApplicationLoadBalancersCmd.java | 0 .../ListLBHealthCheckPoliciesCmd.java | 0 .../ListLBStickinessPoliciesCmd.java | 0 .../ListLoadBalancerRuleInstancesCmd.java | 0 .../ListLoadBalancerRulesCmd.java | 0 .../user/loadbalancer/ListSslCertsCmd.java | 0 .../RemoveCertFromLoadBalancerCmd.java | 0 .../RemoveFromLoadBalancerRuleCmd.java | 0 .../UpdateApplicationLoadBalancerCmd.java | 0 .../UpdateLBHealthCheckPolicyCmd.java | 0 .../UpdateLBStickinessPolicyCmd.java | 0 .../UpdateLoadBalancerRuleCmd.java | 0 .../user/loadbalancer/UploadSslCertCmd.java | 0 .../user/nat/CreateIpForwardingRuleCmd.java | 0 .../user/nat/DeleteIpForwardingRuleCmd.java | 0 .../command/user/nat/DisableStaticNatCmd.java | 0 .../command/user/nat/EnableStaticNatCmd.java | 0 .../user/nat/ListIpForwardingRulesCmd.java | 0 .../user/network/CreateNetworkACLCmd.java | 0 .../user/network/CreateNetworkACLListCmd.java | 0 .../user/network/CreateNetworkCmd.java | 0 .../user/network/DeleteNetworkACLCmd.java | 0 .../user/network/DeleteNetworkACLListCmd.java | 0 .../user/network/DeleteNetworkCmd.java | 0 .../user/network/ListNetworkACLListsCmd.java | 0 .../user/network/ListNetworkACLsCmd.java | 0 .../user/network/ListNetworkOfferingsCmd.java | 0 .../command/user/network/ListNetworksCmd.java | 0 .../network/ReplaceNetworkACLListCmd.java | 0 .../user/network/RestartNetworkCmd.java | 0 .../user/network/UpdateNetworkACLItemCmd.java | 0 .../user/network/UpdateNetworkACLListCmd.java | 0 .../user/network/UpdateNetworkCmd.java | 0 .../user/offering/ListDiskOfferingsCmd.java | 0 .../offering/ListServiceOfferingsCmd.java | 0 .../user/project/ActivateProjectCmd.java | 0 .../user/project/CreateProjectCmd.java | 0 .../user/project/DeleteProjectCmd.java | 0 .../project/DeleteProjectInvitationCmd.java | 0 .../project/ListProjectInvitationsCmd.java | 0 .../command/user/project/ListProjectsCmd.java | 0 .../user/project/SuspendProjectCmd.java | 0 .../user/project/UpdateProjectCmd.java | 0 .../project/UpdateProjectInvitationCmd.java | 0 .../command/user/region/ListRegionsCmd.java | 0 .../AssignToGlobalLoadBalancerRuleCmd.java | 0 .../gslb/CreateGlobalLoadBalancerRuleCmd.java | 0 .../gslb/DeleteGlobalLoadBalancerRuleCmd.java | 0 .../gslb/ListGlobalLoadBalancerRuleCmd.java | 0 .../RemoveFromGlobalLoadBalancerRuleCmd.java | 0 .../gslb/UpdateGlobalLoadBalancerRuleCmd.java | 0 .../user/resource/GetCloudIdentifierCmd.java | 0 .../user/resource/ListHypervisorsCmd.java | 0 .../user/resource/ListResourceLimitsCmd.java | 0 .../user/resource/UpdateResourceCountCmd.java | 0 .../user/resource/UpdateResourceLimitCmd.java | 0 .../AuthorizeSecurityGroupEgressCmd.java | 0 .../AuthorizeSecurityGroupIngressCmd.java | 0 .../securitygroup/CreateSecurityGroupCmd.java | 0 .../securitygroup/DeleteSecurityGroupCmd.java | 0 .../securitygroup/ListSecurityGroupsCmd.java | 0 .../RevokeSecurityGroupEgressCmd.java | 0 .../RevokeSecurityGroupIngressCmd.java | 0 .../user/snapshot/CreateSnapshotCmd.java | 0 .../CreateSnapshotFromVMSnapshotCmd.java | 0 .../snapshot/CreateSnapshotPolicyCmd.java | 0 .../user/snapshot/DeleteSnapshotCmd.java | 0 .../snapshot/DeleteSnapshotPoliciesCmd.java | 0 .../snapshot/ListSnapshotPoliciesCmd.java | 0 .../user/snapshot/ListSnapshotsCmd.java | 0 .../user/snapshot/RevertSnapshotCmd.java | 0 .../snapshot/UpdateSnapshotPolicyCmd.java | 0 .../command/user/ssh/CreateSSHKeyPairCmd.java | 0 .../command/user/ssh/DeleteSSHKeyPairCmd.java | 0 .../command/user/ssh/ListSSHKeyPairsCmd.java | 0 .../user/ssh/RegisterSSHKeyPairCmd.java | 0 .../api/command/user/tag/CreateTagsCmd.java | 0 .../api/command/user/tag/DeleteTagsCmd.java | 0 .../api/command/user/tag/ListTagsCmd.java | 0 .../user/template/CopyTemplateCmd.java | 0 .../user/template/CreateTemplateCmd.java | 0 .../user/template/DeleteTemplateCmd.java | 0 .../user/template/ExtractTemplateCmd.java | 0 .../GetUploadParamsForTemplateCmd.java | 0 .../template/ListTemplatePermissionsCmd.java | 0 .../user/template/ListTemplatesCmd.java | 0 .../user/template/RegisterTemplateCmd.java | 0 .../user/template/UpdateTemplateCmd.java | 0 .../UpdateTemplatePermissionsCmd.java | 0 .../api/command/user/vm/AddIpToVmNicCmd.java | 0 .../api/command/user/vm/AddNicToVMCmd.java | 0 .../api/command/user/vm/DeployVMCmd.java | 0 .../api/command/user/vm/DestroyVMCmd.java | 0 .../api/command/user/vm/GetVMPasswordCmd.java | 0 .../api/command/user/vm/ListNicsCmd.java | 0 .../api/command/user/vm/ListVMsCmd.java | 0 .../api/command/user/vm/RebootVMCmd.java | 0 .../command/user/vm/RemoveIpFromVmNicCmd.java | 0 .../command/user/vm/RemoveNicFromVMCmd.java | 0 .../command/user/vm/ResetVMPasswordCmd.java | 0 .../api/command/user/vm/ResetVMSSHKeyCmd.java | 0 .../api/command/user/vm/RestoreVMCmd.java | 0 .../api/command/user/vm/ScaleVMCmd.java | 0 .../command/user/vm/SecurityGroupAction.java | 0 .../api/command/user/vm/StartVMCmd.java | 0 .../api/command/user/vm/StopVMCmd.java | 0 .../user/vm/UpdateDefaultNicForVMCmd.java | 0 .../api/command/user/vm/UpdateVMCmd.java | 0 .../api/command/user/vm/UpdateVmNicIpCmd.java | 0 .../api/command/user/vm/UpgradeVMCmd.java | 0 .../user/vmgroup/CreateVMGroupCmd.java | 0 .../user/vmgroup/DeleteVMGroupCmd.java | 0 .../command/user/vmgroup/ListVMGroupsCmd.java | 0 .../user/vmgroup/UpdateVMGroupCmd.java | 0 .../user/vmsnapshot/CreateVMSnapshotCmd.java | 0 .../user/vmsnapshot/DeleteVMSnapshotCmd.java | 0 .../user/vmsnapshot/ListVMSnapshotCmd.java | 0 .../vmsnapshot/RevertToVMSnapshotCmd.java | 0 .../user/volume/AddResourceDetailCmd.java | 0 .../command/user/volume/AttachVolumeCmd.java | 0 .../command/user/volume/CreateVolumeCmd.java | 0 .../command/user/volume/DeleteVolumeCmd.java | 0 .../command/user/volume/DetachVolumeCmd.java | 0 .../command/user/volume/ExtractVolumeCmd.java | 0 .../volume/GetUploadParamsForVolumeCmd.java | 0 .../user/volume/ListResourceDetailsCmd.java | 0 .../command/user/volume/ListVolumesCmd.java | 0 .../command/user/volume/MigrateVolumeCmd.java | 0 .../user/volume/RemoveResourceDetailCmd.java | 0 .../command/user/volume/ResizeVolumeCmd.java | 0 .../command/user/volume/UpdateVolumeCmd.java | 0 .../command/user/volume/UploadVolumeCmd.java | 0 .../user/vpc/CreateStaticRouteCmd.java | 0 .../api/command/user/vpc/CreateVPCCmd.java | 0 .../user/vpc/DeleteStaticRouteCmd.java | 0 .../api/command/user/vpc/DeleteVPCCmd.java | 0 .../user/vpc/ListPrivateGatewaysCmd.java | 0 .../command/user/vpc/ListStaticRoutesCmd.java | 0 .../command/user/vpc/ListVPCOfferingsCmd.java | 0 .../api/command/user/vpc/ListVPCsCmd.java | 0 .../api/command/user/vpc/RestartVPCCmd.java | 0 .../api/command/user/vpc/UpdateVPCCmd.java | 0 .../api/command/user/vpn/AddVpnUserCmd.java | 0 .../user/vpn/CreateRemoteAccessVpnCmd.java | 0 .../user/vpn/CreateVpnConnectionCmd.java | 0 .../user/vpn/CreateVpnCustomerGatewayCmd.java | 0 .../command/user/vpn/CreateVpnGatewayCmd.java | 0 .../user/vpn/DeleteRemoteAccessVpnCmd.java | 0 .../user/vpn/DeleteVpnConnectionCmd.java | 0 .../user/vpn/DeleteVpnCustomerGatewayCmd.java | 0 .../command/user/vpn/DeleteVpnGatewayCmd.java | 0 .../user/vpn/ListRemoteAccessVpnsCmd.java | 0 .../user/vpn/ListVpnConnectionsCmd.java | 0 .../user/vpn/ListVpnCustomerGatewaysCmd.java | 0 .../command/user/vpn/ListVpnGatewaysCmd.java | 0 .../api/command/user/vpn/ListVpnUsersCmd.java | 0 .../command/user/vpn/RemoveVpnUserCmd.java | 0 .../user/vpn/ResetVpnConnectionCmd.java | 0 .../user/vpn/UpdateRemoteAccessVpnCmd.java | 0 .../user/vpn/UpdateVpnConnectionCmd.java | 0 .../user/vpn/UpdateVpnCustomerGatewayCmd.java | 0 .../command/user/vpn/UpdateVpnGatewayCmd.java | 0 .../api/command/user/zone/ListZonesCmd.java | 0 .../api/response/AccountResponse.java | 0 .../response/AcquireIPAddressResponse.java | 0 .../api/response/AcquirePodIpCmdResponse.java | 0 .../api/response/AlertResponse.java | 0 .../api/response/AnnotationResponse.java | 0 ...plicationLoadBalancerInstanceResponse.java | 0 .../ApplicationLoadBalancerResponse.java | 0 .../ApplicationLoadBalancerRuleResponse.java | 0 .../api/response/AsyncJobResponse.java | 0 .../response/AuthenticationCmdResponse.java | 0 .../api/response/AutoScalePolicyResponse.java | 0 .../response/AutoScaleVmGroupResponse.java | 0 .../response/AutoScaleVmProfileResponse.java | 0 .../api/response/CAProviderResponse.java | 0 .../api/response/CapabilitiesResponse.java | 0 .../api/response/CapabilityResponse.java | 0 .../api/response/CapacityResponse.java | 0 .../api/response/CertificateResponse.java | 0 .../api/response/CloudIdentifierResponse.java | 0 .../api/response/ClusterResponse.java | 0 .../api/response/ConditionResponse.java | 0 .../api/response/ConfigurationResponse.java | 0 .../response/ControlledEntityResponse.java | 0 .../ControlledViewEntityResponse.java | 0 .../api/response/CounterResponse.java | 0 .../api/response/CreateCmdResponse.java | 0 .../response/CreateSSHKeyPairResponse.java | 0 .../response/CustomCertificateResponse.java | 0 .../response/DeploymentPlannersResponse.java | 0 .../api/response/DiskOfferingResponse.java | 0 .../api/response/DomainResponse.java | 0 .../api/response/DomainRouterResponse.java | 0 .../api/response/EventResponse.java | 0 .../api/response/EventTypeResponse.java | 0 .../api/response/ExceptionResponse.java | 0 .../response/ExternalFirewallResponse.java | 0 .../ExternalLoadBalancerResponse.java | 0 .../api/response/ExtractResponse.java | 0 .../api/response/FirewallResponse.java | 0 .../api/response/FirewallRuleResponse.java | 0 .../api/response/GetUploadParamsResponse.java | 0 .../api/response/GetVMPasswordResponse.java | 0 .../response/GlobalLoadBalancerResponse.java | 0 .../cloudstack/api/response/GpuResponse.java | 0 .../api/response/GuestOSCategoryResponse.java | 0 .../api/response/GuestOSResponse.java | 0 .../api/response/GuestOsMappingResponse.java | 0 .../api/response/GuestVlanRangeResponse.java | 0 .../api/response/HAProviderResponse.java | 0 .../response/HostForMigrationResponse.java | 0 .../api/response/HostHAResponse.java | 0 .../cloudstack/api/response/HostResponse.java | 0 .../api/response/HostTagResponse.java | 0 .../HypervisorCapabilitiesResponse.java | 0 .../api/response/HypervisorResponse.java | 0 .../api/response/IPAddressResponse.java | 0 .../response/ImageStoreDetailResponse.java | 0 .../api/response/ImageStoreResponse.java | 0 .../api/response/InstanceGroupResponse.java | 0 .../InternalLoadBalancerElementResponse.java | 0 .../response/IpForwardingRuleResponse.java | 0 .../api/response/IsoVmResponse.java | 0 .../api/response/IsolationMethodResponse.java | 0 .../response/LBHealthCheckPolicyResponse.java | 0 .../api/response/LBHealthCheckResponse.java | 0 .../response/LBStickinessPolicyResponse.java | 0 .../api/response/LBStickinessResponse.java | 0 .../cloudstack/api/response/ListResponse.java | 0 .../api/response/LoadBalancerResponse.java | 0 .../LoadBalancerRuleVmMapResponse.java | 0 .../api/response/LoginCmdResponse.java | 0 .../api/response/LogoutCmdResponse.java | 0 .../api/response/NetworkACLItemResponse.java | 0 .../api/response/NetworkACLResponse.java | 0 .../api/response/NetworkDeviceResponse.java | 0 .../api/response/NetworkOfferingResponse.java | 0 .../api/response/NetworkResponse.java | 0 .../response/NicExtraDhcpOptionResponse.java | 0 .../cloudstack/api/response/NicResponse.java | 0 .../api/response/NicSecondaryIpResponse.java | 0 .../response/OutOfBandManagementResponse.java | 0 .../api/response/OvsProviderResponse.java | 0 .../api/response/PhysicalNetworkResponse.java | 0 .../cloudstack/api/response/PodResponse.java | 0 .../api/response/PortableIpRangeResponse.java | 0 .../api/response/PortableIpResponse.java | 0 .../api/response/PrivateGatewayResponse.java | 0 .../api/response/ProjectAccountResponse.java | 0 .../response/ProjectInvitationResponse.java | 0 .../api/response/ProjectResponse.java | 0 .../api/response/ProviderResponse.java | 0 .../api/response/RegionResponse.java | 0 .../api/response/RegisterResponse.java | 0 .../api/response/RemoteAccessVpnResponse.java | 0 .../api/response/ResourceCountResponse.java | 0 .../api/response/ResourceDetailResponse.java | 0 .../ResourceLimitAndCountResponse.java | 0 .../api/response/ResourceLimitResponse.java | 0 .../api/response/ResourceTagResponse.java | 0 .../api/response/RolePermissionResponse.java | 0 .../cloudstack/api/response/RoleResponse.java | 0 .../api/response/SSHKeyPairResponse.java | 0 .../api/response/SecurityGroupResponse.java | 0 .../response/SecurityGroupRuleResponse.java | 0 .../api/response/ServiceOfferingResponse.java | 0 .../api/response/ServiceResponse.java | 0 .../Site2SiteCustomerGatewayResponse.java | 0 .../Site2SiteVpnConnectionResponse.java | 0 .../response/Site2SiteVpnGatewayResponse.java | 0 .../api/response/SnapshotPolicyResponse.java | 0 .../api/response/SnapshotResponse.java | 0 .../response/SnapshotScheduleResponse.java | 0 .../api/response/SslCertResponse.java | 0 .../api/response/StaticRouteResponse.java | 0 .../StorageNetworkIpRangeResponse.java | 0 .../api/response/StoragePoolResponse.java | 0 .../api/response/StorageProviderResponse.java | 0 .../api/response/StorageTagResponse.java | 0 .../api/response/SuccessResponse.java | 0 .../response/SystemVmInstanceResponse.java | 0 .../api/response/SystemVmResponse.java | 0 .../response/TemplatePermissionsResponse.java | 0 .../api/response/TemplateResponse.java | 0 .../api/response/TrafficMonitorResponse.java | 0 .../TrafficTypeImplementorResponse.java | 0 .../api/response/TrafficTypeResponse.java | 0 .../UpgradeRouterTemplateResponse.java | 0 .../api/response/UsageRecordResponse.java | 0 .../api/response/UsageTypeResponse.java | 0 .../cloudstack/api/response/UserResponse.java | 0 .../api/response/UserVmResponse.java | 0 .../api/response/VMSnapshotResponse.java | 0 .../api/response/VMUserDataResponse.java | 0 .../cloudstack/api/response/VgpuResponse.java | 0 .../VirtualRouterProviderResponse.java | 0 .../api/response/VlanIpRangeResponse.java | 0 .../api/response/VolumeResponse.java | 0 .../api/response/VpcOfferingResponse.java | 0 .../cloudstack/api/response/VpcResponse.java | 0 .../api/response/VpnUsersResponse.java | 0 .../cloudstack/api/response/ZoneResponse.java | 0 .../org/apache/cloudstack/ca/CAManager.java | 0 ...loadTemplateDirectDownloadCertificate.java | 0 .../CreateManagementNetworkIpRangeCmd.java | 0 .../DeleteManagementNetworkIpRangeCmd.java | 0 .../admin/network/MigrateNetworkCmd.java | 0 .../command/admin/network/MigrateVPCCmd.java | 0 .../api/command/admin/user/MoveUserCmd.java | 0 .../api/response/ChildTemplateResponse.java | 0 .../download/DirectDownloadManager.java | 0 .../config/ApiServiceConfiguration.java | 0 .../cloudstack/context/CallContext.java | 0 .../context/CallContextListener.java | 0 .../apache/cloudstack/context/LogContext.java | 0 .../context/LogContextListener.java | 0 .../org/apache/cloudstack/ha/HAConfig.java | 0 .../apache/cloudstack/ha/HAConfigManager.java | 0 .../org/apache/cloudstack/ha/HAResource.java | 0 .../org/apache/cloudstack/jobs/JobInfo.java | 0 .../apache/cloudstack/kernel/Partition.java | 0 .../network/ExternalNetworkDeviceManager.java | 0 .../InternalLoadBalancerElementService.java | 0 .../lb/ApplicationLoadBalancerContainer.java | 0 .../lb/ApplicationLoadBalancerRule.java | 0 .../lb/ApplicationLoadBalancerService.java | 0 .../lb/InternalLoadBalancerVMService.java | 0 .../cloudstack/network/tls/CertService.java | 0 .../cloudstack/network/tls/SslCert.java | 0 .../OutOfBandManagement.java | 0 .../OutOfBandManagementDriver.java | 0 .../OutOfBandManagementService.java | 0 ...ManagementDriverChangePasswordCommand.java | 0 .../OutOfBandManagementDriverCommand.java | 0 ...OutOfBandManagementDriverPowerCommand.java | 0 .../OutOfBandManagementDriverResponse.java | 0 .../poll/BackgroundPollManager.java | 0 .../cloudstack/poll/BackgroundPollTask.java | 0 .../apache/cloudstack/query/QueryService.java | 0 .../apache/cloudstack/region/PortableIp.java | 0 .../cloudstack/region/PortableIpRange.java | 0 .../org/apache/cloudstack/region/Region.java | 0 .../cloudstack/region/RegionService.java | 0 .../apache/cloudstack/region/RegionSync.java | 0 .../org/apache/cloudstack/usage/Usage.java | 0 .../apache/cloudstack/usage/UsageService.java | 0 .../apache/cloudstack/usage/UsageTypes.java | 0 .../cloudstack/api-config/module.properties | 0 .../api-config/spring-api-config-context.xml | 0 .../cloudstack/api-planner/module.properties | 0 .../spring-api-planner-context.xml | 0 .../cloud/network/IsolationMethodTest.java | 0 .../java}/com/cloud/network/NetworksTest.java | 0 .../java}/com/cloud/storage/StorageTest.java | 0 .../apache/cloudstack/acl/RoleTypeTest.java | 0 .../org/apache/cloudstack/acl/RuleTest.java | 0 .../apache/cloudstack/api/ApiCmdTestUtil.java | 0 .../apache/cloudstack/api/BaseCmdTest.java | 0 .../admin/account/CreateAccountCmdTest.java | 0 .../annotation/AddAnnotationCmdTest.java | 0 .../CreateSecondaryStagingStoreCmdTest.java | 0 .../command/admin/user/CreateUserCmdTest.java | 0 .../admin/vpc/CreateVPCOfferingCmdTest.java | 0 .../command/test/ActivateProjectCmdTest.java | 0 .../test/AddAccountToProjectCmdTest.java | 0 .../api/command/test/AddClusterCmdTest.java | 0 .../api/command/test/AddHostCmdTest.java | 0 .../api/command/test/AddIpToVmNicTest.java | 0 .../AddNetworkServiceProviderCmdTest.java | 0 .../test/AddSecondaryStorageCmdTest.java | 0 .../api/command/test/AddVpnUserCmdTest.java | 0 .../command/test/CreateSnapshotCmdTest.java | 0 .../api/command/test/ListCfgCmdTest.java | 0 .../api/command/test/RegionCmdTest.java | 0 .../api/command/test/ScaleVMCmdTest.java | 0 .../api/command/test/UpdateCfgCmdTest.java | 0 .../test/UpdateHostPasswordCmdTest.java | 0 .../api/command/test/UpdateVmNicIpTest.java | 0 .../api/command/test/UsageCmdTest.java | 0 .../template/CopyTemplateCmdByAdminTest.java | 0 .../user/template/CopyTemplateCmdTest.java | 0 .../RegisterTemplateCmdByAdminTest.java | 0 .../template/RegisterTemplateCmdTest.java | 0 .../api/response/HostResponseTest.java | 0 .../cloudstack/context/CallContextTest.java | 0 .../cloudstack/test/utils/SpringUtils.java | 0 client/pom.xml | 4 +- .../org/apache/cloudstack/ServerDaemon.java | 0 .../cloudstack/webApplicationContext.xml | 0 client/{ => src/main/webapp}/WEB-INF/web.xml | 0 .../java}/com/cloud/agent/IAgentControl.java | 0 .../cloud/agent/IAgentControlListener.java | 0 .../cloud/agent/StartupCommandProcessor.java | 0 .../cloud/agent/api/AgentControlAnswer.java | 0 .../cloud/agent/api/AgentControlCommand.java | 0 .../com/cloud/agent/api/AttachIsoAnswer.java | 0 .../com/cloud/agent/api/AttachIsoCommand.java | 0 .../AttachOrDettachConfigDriveCommand.java | 0 .../cloud/agent/api/BackupSnapshotAnswer.java | 0 .../agent/api/BackupSnapshotCommand.java | 0 .../agent/api/BumpUpPriorityCommand.java | 0 .../com/cloud/agent/api/CancelCommand.java | 0 .../cloud/agent/api/ChangeAgentAnswer.java | 0 .../cloud/agent/api/ChangeAgentCommand.java | 0 .../cloud/agent/api/CheckHealthAnswer.java | 0 .../cloud/agent/api/CheckHealthCommand.java | 0 .../cloud/agent/api/CheckNetworkAnswer.java | 0 .../cloud/agent/api/CheckNetworkCommand.java | 0 .../cloud/agent/api/CheckOnHostAnswer.java | 0 .../cloud/agent/api/CheckOnHostCommand.java | 0 .../cloud/agent/api/CheckRouterAnswer.java | 0 .../cloud/agent/api/CheckRouterCommand.java | 0 .../api/CheckS2SVpnConnectionsAnswer.java | 0 .../api/CheckS2SVpnConnectionsCommand.java | 0 .../com/cloud/agent/api/CheckStateAnswer.java | 0 .../cloud/agent/api/CheckStateCommand.java | 0 .../CheckVMActivityOnStoragePoolCommand.java | 0 .../agent/api/CheckVirtualMachineAnswer.java | 0 .../agent/api/CheckVirtualMachineCommand.java | 0 .../agent/api/CleanupNetworkRulesCmd.java | 0 .../api/ClusterVMMetaDataSyncAnswer.java | 0 .../api/ClusterVMMetaDataSyncCommand.java | 0 .../agent/api/ComputeChecksumCommand.java | 0 .../ConsoleAccessAuthenticationAnswer.java | 0 .../ConsoleAccessAuthenticationCommand.java | 0 .../api/ConsoleProxyLoadReportCommand.java | 0 ...atePrivateTemplateFromSnapshotCommand.java | 0 ...reatePrivateTemplateFromVolumeCommand.java | 0 .../agent/api/CreateStoragePoolCommand.java | 0 .../agent/api/CreateVMSnapshotAnswer.java | 0 .../agent/api/CreateVMSnapshotCommand.java | 0 .../api/CreateVolumeFromSnapshotAnswer.java | 0 .../api/CreateVolumeFromSnapshotCommand.java | 0 .../api/CreateVolumeFromVMSnapshotAnswer.java | 0 .../CreateVolumeFromVMSnapshotCommand.java | 0 .../com/cloud/agent/api/CronCommand.java | 0 .../agent/api/DeleteSnapshotsDirCommand.java | 0 .../agent/api/DeleteStoragePoolCommand.java | 0 .../agent/api/DeleteVMSnapshotAnswer.java | 0 .../agent/api/DeleteVMSnapshotCommand.java | 0 .../agent/api/DirectNetworkUsageAnswer.java | 0 .../agent/api/DirectNetworkUsageCommand.java | 0 .../ExternalNetworkResourceUsageAnswer.java | 0 .../ExternalNetworkResourceUsageCommand.java | 0 .../com/cloud/agent/api/FenceAnswer.java | 0 .../com/cloud/agent/api/FenceCommand.java | 0 .../cloud/agent/api/GetDomRVersionAnswer.java | 0 .../cloud/agent/api/GetDomRVersionCmd.java | 0 .../cloud/agent/api/GetGPUStatsAnswer.java | 0 .../cloud/agent/api/GetGPUStatsCommand.java | 0 .../cloud/agent/api/GetHostStatsAnswer.java | 0 .../cloud/agent/api/GetHostStatsCommand.java | 0 .../agent/api/GetRouterAlertsAnswer.java | 0 .../agent/api/GetStorageStatsAnswer.java | 0 .../agent/api/GetStorageStatsCommand.java | 0 .../cloud/agent/api/GetVmConfigAnswer.java | 0 .../cloud/agent/api/GetVmConfigCommand.java | 0 .../cloud/agent/api/GetVmDiskStatsAnswer.java | 0 .../agent/api/GetVmDiskStatsCommand.java | 0 .../agent/api/GetVmIpAddressCommand.java | 0 .../agent/api/GetVmNetworkStatsAnswer.java | 0 .../agent/api/GetVmNetworkStatsCommand.java | 0 .../com/cloud/agent/api/GetVmStatsAnswer.java | 0 .../cloud/agent/api/GetVmStatsCommand.java | 0 .../com/cloud/agent/api/GetVncPortAnswer.java | 0 .../cloud/agent/api/GetVncPortCommand.java | 0 .../cloud/agent/api/GetVolumeStatsAnswer.java | 0 .../agent/api/GetVolumeStatsCommand.java | 0 .../api/HandleConfigDriveIsoCommand.java | 0 .../com/cloud/agent/api/HostStatsEntry.java | 0 .../com/cloud/agent/api/MaintainAnswer.java | 0 .../com/cloud/agent/api/MaintainCommand.java | 0 .../cloud/agent/api/ManageSnapshotAnswer.java | 0 .../agent/api/ManageSnapshotCommand.java | 0 .../com/cloud/agent/api/MigrateAnswer.java | 0 .../com/cloud/agent/api/MigrateCommand.java | 0 .../agent/api/MigrateWithStorageAnswer.java | 0 .../agent/api/MigrateWithStorageCommand.java | 0 .../api/MigrateWithStorageCompleteAnswer.java | 0 .../MigrateWithStorageCompleteCommand.java | 0 .../api/MigrateWithStorageReceiveAnswer.java | 0 .../api/MigrateWithStorageReceiveCommand.java | 0 .../api/MigrateWithStorageSendAnswer.java | 0 .../api/MigrateWithStorageSendCommand.java | 0 .../cloud/agent/api/ModifySshKeysCommand.java | 0 .../agent/api/ModifyStoragePoolAnswer.java | 0 .../agent/api/ModifyStoragePoolCommand.java | 0 .../cloud/agent/api/ModifyTargetsAnswer.java | 0 .../cloud/agent/api/ModifyTargetsCommand.java | 0 .../agent/api/ModifyVmNicConfigAnswer.java | 0 .../agent/api/ModifyVmNicConfigCommand.java | 0 .../api/NetScalerImplementNetworkCommand.java | 0 .../api/NetworkRulesSystemVmCommand.java | 0 .../api/NetworkRulesVmSecondaryIpCommand.java | 0 .../cloud/agent/api/NetworkUsageAnswer.java | 0 .../cloud/agent/api/NetworkUsageCommand.java | 0 .../agent/api/PerformanceMonitorAnswer.java | 0 .../agent/api/PerformanceMonitorCommand.java | 0 .../java}/com/cloud/agent/api/PingAnswer.java | 0 .../com/cloud/agent/api/PingCommand.java | 0 .../cloud/agent/api/PingRoutingCommand.java | 0 .../api/PingRoutingWithNwGroupsCommand.java | 0 .../agent/api/PingRoutingWithOvsCommand.java | 0 .../cloud/agent/api/PingStorageCommand.java | 0 .../com/cloud/agent/api/PingTestCommand.java | 0 .../com/cloud/agent/api/PlugNicAnswer.java | 0 .../com/cloud/agent/api/PlugNicCommand.java | 0 .../agent/api/PrepareForMigrationAnswer.java | 0 .../agent/api/PrepareForMigrationCommand.java | 0 .../agent/api/PrepareOCFS2NodesCommand.java | 0 .../api/PropagateResourceEventCommand.java | 0 .../com/cloud/agent/api/ReadyAnswer.java | 0 .../com/cloud/agent/api/ReadyCommand.java | 0 .../com/cloud/agent/api/RebootAnswer.java | 0 .../com/cloud/agent/api/RebootCommand.java | 0 .../cloud/agent/api/RebootRouterCommand.java | 0 .../api/RecurringNetworkUsageAnswer.java | 0 .../api/RecurringNetworkUsageCommand.java | 0 .../agent/api/RestoreVMSnapshotAnswer.java | 0 .../agent/api/RestoreVMSnapshotCommand.java | 0 .../agent/api/RevertToVMSnapshotAnswer.java | 0 .../agent/api/RevertToVMSnapshotCommand.java | 0 .../com/cloud/agent/api/ScaleVmAnswer.java | 0 .../com/cloud/agent/api/ScaleVmCommand.java | 0 .../api/ScheduleHostScanTaskCommand.java | 0 .../api/SecStorageFirewallCfgCommand.java | 0 .../agent/api/SecStorageSetupAnswer.java | 0 .../agent/api/SecStorageSetupCommand.java | 0 .../agent/api/SecStorageVMSetupCommand.java | 0 .../agent/api/SecurityGroupRuleAnswer.java | 0 .../agent/api/SecurityGroupRulesCmd.java | 0 .../cloud/agent/api/SetHostParamsCommand.java | 0 .../com/cloud/agent/api/SetupAnswer.java | 0 .../com/cloud/agent/api/SetupCommand.java | 0 .../agent/api/SetupGuestNetworkCommand.java | 0 .../com/cloud/agent/api/ShutdownCommand.java | 0 .../com/cloud/agent/api/SnapshotCommand.java | 0 .../com/cloud/agent/api/StartAnswer.java | 0 .../com/cloud/agent/api/StartCommand.java | 0 .../com/cloud/agent/api/StartupAnswer.java | 0 .../com/cloud/agent/api/StartupCommand.java | 0 .../agent/api/StartupExternalDhcpCommand.java | 0 .../api/StartupExternalFirewallCommand.java | 0 .../StartupExternalLoadBalancerCommand.java | 0 .../cloud/agent/api/StartupProxyCommand.java | 0 .../agent/api/StartupPxeServerCommand.java | 0 .../agent/api/StartupRoutingCommand.java | 0 .../api/StartupSecondaryStorageCommand.java | 0 .../agent/api/StartupStorageCommand.java | 0 .../api/StartupTrafficMonitorCommand.java | 0 .../agent/api/StartupVMMAgentCommand.java | 0 .../java}/com/cloud/agent/api/StopAnswer.java | 0 .../com/cloud/agent/api/StopCommand.java | 0 .../cloud/agent/api/TransferAgentCommand.java | 0 .../com/cloud/agent/api/UnPlugNicAnswer.java | 0 .../com/cloud/agent/api/UnPlugNicCommand.java | 0 .../cloud/agent/api/UnregisterNicCommand.java | 0 .../cloud/agent/api/UnregisterVMCommand.java | 0 .../agent/api/UpdateHostPasswordCommand.java | 0 .../agent/api/UpgradeSnapshotCommand.java | 0 .../agent/api/VMSnapshotBaseCommand.java | 0 .../com/cloud/agent/api/VMSnapshotTO.java | 0 .../agent/api/ValidateSnapshotAnswer.java | 0 .../agent/api/ValidateSnapshotCommand.java | 0 .../com/cloud/agent/api/VmDiskStatsEntry.java | 0 .../cloud/agent/api/VmNetworkStatsEntry.java | 0 .../com/cloud/agent/api/VmStatsEntry.java | 0 .../com/cloud/agent/api/VolumeStatsEntry.java | 0 .../cloud/agent/api}/api/ReplugNicAnswer.java | 0 .../agent/api}/api/ReplugNicCommand.java | 0 .../storage/CreateDatadiskTemplateAnswer.java | 0 .../CreateDatadiskTemplateCommand.java | 0 .../api}/api/storage/GetDatadisksAnswer.java | 0 .../api}/api/storage/GetDatadisksCommand.java | 0 .../api/baremetal/IpmISetBootDevCommand.java | 0 .../api/baremetal/IpmiBootorResetCommand.java | 0 .../PrepareCreateTemplateCommand.java | 0 .../api/baremetal/PreparePxeServerAnswer.java | 0 .../baremetal/PreparePxeServerCommand.java | 0 .../cloud/agent/api/check/CheckSshAnswer.java | 0 .../agent/api/check/CheckSshCommand.java | 0 .../proxy/CheckConsoleProxyLoadCommand.java | 0 .../api/proxy/ConsoleProxyLoadAnswer.java | 0 .../cloud/agent/api/proxy/ProxyCommand.java | 0 ...rtConsoleProxyAgentHttpHandlerCommand.java | 0 .../proxy/WatchConsoleProxyLoadCommand.java | 0 .../routing/AggregationControlCommand.java | 0 .../api/routing/CreateIpAliasCommand.java | 0 .../CreateLoadBalancerApplianceCommand.java | 0 .../api/routing/DeleteIpAliasCommand.java | 0 .../DestroyLoadBalancerApplianceCommand.java | 0 .../agent/api/routing/DhcpEntryCommand.java | 0 .../api/routing/DnsMasqConfigCommand.java | 0 .../api/routing/GetRouterAlertsCommand.java | 0 .../GlobalLoadBalancerConfigAnswer.java | 0 .../GlobalLoadBalancerConfigCommand.java | 0 .../cloud/agent/api/routing/GroupAnswer.java | 0 .../routing/HealthCheckLBConfigAnswer.java | 0 .../routing/HealthCheckLBConfigCommand.java | 0 .../cloud/agent/api/routing/IpAliasTO.java | 0 .../agent/api/routing/IpAssocAnswer.java | 0 .../agent/api/routing/IpAssocCommand.java | 0 .../agent/api/routing/IpAssocVpcCommand.java | 0 .../routing/LoadBalancerConfigCommand.java | 0 .../api/routing/NetworkElementCommand.java | 0 .../routing/RemoteAccessVpnCfgCommand.java | 0 .../api/routing/SavePasswordCommand.java | 0 .../api/routing/SetFirewallRulesAnswer.java | 0 .../api/routing/SetFirewallRulesCommand.java | 0 .../api/routing/SetMonitorServiceCommand.java | 0 .../api/routing/SetNetworkACLAnswer.java | 0 .../api/routing/SetNetworkACLCommand.java | 0 .../routing/SetPortForwardingRulesAnswer.java | 0 .../SetPortForwardingRulesCommand.java | 0 .../SetPortForwardingRulesVpcCommand.java | 0 .../agent/api/routing/SetSourceNatAnswer.java | 0 .../api/routing/SetSourceNatCommand.java | 0 .../api/routing/SetStaticNatRulesAnswer.java | 0 .../api/routing/SetStaticNatRulesCommand.java | 0 .../api/routing/SetStaticRouteAnswer.java | 0 .../api/routing/SetStaticRouteCommand.java | 0 .../api/routing/Site2SiteVpnCfgCommand.java | 0 .../api/routing/SiteLoadBalancerConfig.java | 0 .../agent/api/routing/UserDataCommand.java | 0 .../agent/api/routing/VmDataCommand.java | 0 .../agent/api/routing/VpnUsersCfgCommand.java | 0 .../api/storage/AbstractDownloadCommand.java | 0 .../api/storage/AbstractUploadCommand.java | 0 .../agent/api/storage/CopyVolumeAnswer.java | 0 .../agent/api/storage/CopyVolumeCommand.java | 0 .../cloud/agent/api/storage/CreateAnswer.java | 0 .../agent/api/storage/CreateCommand.java | 0 .../CreateEntityDownloadURLAnswer.java | 0 .../CreateEntityDownloadURLCommand.java | 0 .../storage/CreatePrivateTemplateAnswer.java | 0 .../storage/CreatePrivateTemplateCommand.java | 0 .../DeleteEntityDownloadURLCommand.java | 0 .../agent/api/storage/DestroyAnswer.java | 0 .../agent/api/storage/DestroyCommand.java | 0 .../agent/api/storage/DownloadAnswer.java | 0 .../agent/api/storage/ListTemplateAnswer.java | 0 .../api/storage/ListTemplateCommand.java | 0 .../agent/api/storage/ListVolumeAnswer.java | 0 .../agent/api/storage/ListVolumeCommand.java | 0 .../ManageVolumeAvailabilityAnswer.java | 0 .../ManageVolumeAvailabilityCommand.java | 0 .../api/storage/MigrateVolumeAnswer.java | 0 .../api/storage/MigrateVolumeCommand.java | 0 .../storage/PrimaryStorageDownloadAnswer.java | 0 .../PrimaryStorageDownloadCommand.java | 0 .../agent/api/storage/ResizeVolumeAnswer.java | 0 .../api/storage/ResizeVolumeCommand.java | 0 .../cloud/agent/api/storage/SsCommand.java | 0 .../agent/api/storage/StorageCommand.java | 0 .../api/storage/StorageNfsVersionCommand.java | 0 .../agent/api/storage/UpgradeDiskAnswer.java | 0 .../agent/api/storage/UpgradeDiskCommand.java | 0 .../cloud/agent/api/storage/UploadAnswer.java | 0 .../agent/api/storage/UploadCommand.java | 0 .../api/storage/UploadProgressCommand.java | 0 .../resource/virtualnetwork/ConfigItem.java | 0 .../virtualnetwork/FileConfigItem.java | 0 .../virtualnetwork/ScriptConfigItem.java | 0 .../resource/virtualnetwork/VRScripts.java | 0 .../virtualnetwork/VirtualRouterDeployer.java | 0 .../VirtualRoutingResource.java | 0 .../facade/AbstractConfigItemFacade.java | 0 .../facade/BumpUpPriorityConfigItem.java | 0 .../facade/CreateIpAliasConfigItem.java | 0 .../facade/DeleteIpAliasConfigItem.java | 0 .../facade/DhcpEntryConfigItem.java | 0 .../facade/DnsMasqConfigItem.java | 0 .../facade/IpAssociationConfigItem.java | 0 .../facade/LoadBalancerConfigItem.java | 0 .../facade/RemoteAccessVpnConfigItem.java | 0 .../facade/SavePasswordConfigItem.java | 0 .../facade/SetFirewallRulesConfigItem.java | 0 .../facade/SetGuestNetworkConfigItem.java | 0 .../facade/SetMonitorServiceConfigItem.java | 0 .../facade/SetNetworkAclConfigItem.java | 0 .../SetPortForwardingRulesConfigItem.java | 0 .../SetPortForwardingRulesVpcConfigItem.java | 0 .../facade/SetSourceNatConfigItem.java | 0 .../facade/SetStaticNatRulesConfigItem.java | 0 .../facade/SetStaticRouteConfigItem.java | 0 .../facade/Site2SiteVpnConfigItem.java | 0 .../facade/VmDataConfigItem.java | 0 .../facade/VpnUsersConfigItem.java | 0 .../virtualnetwork/model/AclRule.java | 0 .../virtualnetwork/model/AllAclRule.java | 0 .../virtualnetwork/model/ConfigBase.java | 0 .../virtualnetwork/model/DhcpConfig.java | 0 .../virtualnetwork/model/DhcpConfigEntry.java | 0 .../virtualnetwork/model/FirewallRule.java | 0 .../virtualnetwork/model/FirewallRules.java | 0 .../virtualnetwork/model/ForwardingRule.java | 0 .../virtualnetwork/model/ForwardingRules.java | 0 .../virtualnetwork/model/GuestNetwork.java | 0 .../virtualnetwork/model/IcmpAclRule.java | 0 .../virtualnetwork/model/IpAddress.java | 0 .../virtualnetwork/model/IpAddressAlias.java | 0 .../virtualnetwork/model/IpAliases.java | 0 .../virtualnetwork/model/IpAssociation.java | 0 .../model/LoadBalancerRule.java | 0 .../model/LoadBalancerRules.java | 0 .../virtualnetwork/model/MonitorService.java | 0 .../virtualnetwork/model/NetworkACL.java | 0 .../virtualnetwork/model/ProtocolAclRule.java | 0 .../virtualnetwork/model/RemoteAccessVpn.java | 0 .../virtualnetwork/model/Site2SiteVpn.java | 0 .../virtualnetwork/model/StaticNatRule.java | 0 .../virtualnetwork/model/StaticNatRules.java | 0 .../virtualnetwork/model/StaticRoute.java | 0 .../virtualnetwork/model/StaticRoutes.java | 0 .../virtualnetwork/model/TcpAclRule.java | 0 .../virtualnetwork/model/UdpAclRule.java | 0 .../resource/virtualnetwork/model/VmData.java | 0 .../virtualnetwork/model/VmDhcpConfig.java | 0 .../virtualnetwork/model/VmPassword.java | 0 .../virtualnetwork/model/VpnUser.java | 0 .../virtualnetwork/model/VpnUserList.java | 0 .../agent/transport/ArrayTypeAdaptor.java | 0 .../agent/transport/InterfaceTypeAdaptor.java | 0 .../transport/LoggingExclusionStrategy.java | 0 .../com/cloud/agent/transport/Request.java | 0 .../com/cloud/agent/transport/Response.java | 0 .../template/MetalinkTemplateDownloader.java | 0 .../UnsupportedVersionException.java | 0 .../cloud/exception/UsageServerException.java | 0 .../java}/com/cloud/host/HostInfo.java | 0 .../info/ConsoleProxyConnectionInfo.java | 0 .../com/cloud/info/ConsoleProxyInfo.java | 0 .../com/cloud/info/ConsoleProxyStatus.java | 0 .../cloud/info/RunningHostInfoAgregator.java | 0 .../com/cloud/info/SecStorageVmLoadInfo.java | 0 .../cloud/network/HAProxyConfigurator.java | 0 .../network/LoadBalancerConfigurator.java | 0 .../cloud/network/LoadBalancerValidator.java | 0 .../CreateLoadBalancerApplianceAnswer.java | 0 .../DestroyLoadBalancerApplianceAnswer.java | 0 .../resource/TrafficSentinelResource.java | 0 .../com/cloud/resource/CommandWrapper.java | 0 .../com/cloud/resource/RequestWrapper.java | 0 .../com/cloud/resource/ResourceListener.java | 0 .../com/cloud/resource/ResourceWrapper.java | 0 .../com/cloud/resource/ServerResource.java | 0 .../cloud/resource/ServerResourceBase.java | 0 .../hypervisor/HypervisorResource.java | 0 .../com/cloud/serializer/GsonHelper.java | 0 .../cloud/serializer/SerializerHelper.java | 0 .../com/cloud/storage/JavaStorageLayer.java | 0 .../java}/com/cloud/storage/StorageLayer.java | 0 .../storage/resource/StoragePoolResource.java | 0 .../storage/resource/StorageProcessor.java | 0 .../StorageSubsystemCommandHandler.java | 0 .../StorageSubsystemCommandHandlerBase.java | 0 .../storage/template/FtpTemplateUploader.java | 0 .../template/HttpTemplateDownloader.java | 0 .../cloud/storage/template/IsoProcessor.java | 0 .../template/LocalTemplateDownloader.java | 0 .../cloud/storage/template/OVAProcessor.java | 0 .../com/cloud/storage/template/Processor.java | 0 .../storage/template/QCOW2Processor.java | 0 .../storage/template/RawImageProcessor.java | 0 .../template/S3TemplateDownloader.java | 0 .../template/ScpTemplateDownloader.java | 0 .../cloud/storage/template/TARProcessor.java | 0 .../storage/template/TemplateConstants.java | 0 .../storage/template/TemplateDownloader.java | 0 .../template/TemplateDownloaderBase.java | 0 .../storage/template/TemplateLocation.java | 0 .../storage/template/TemplateUploader.java | 0 .../cloud/storage/template/VhdProcessor.java | 0 .../cloud/storage/template/VmdkProcessor.java | 0 .../agent/directdownload/CheckUrlAnswer.java | 0 .../agent/directdownload/CheckUrlCommand.java | 0 .../directdownload/DirectDownloadAnswer.java | 0 .../directdownload/DirectDownloadCommand.java | 0 .../HttpDirectDownloadCommand.java | 0 .../HttpsDirectDownloadCommand.java | 0 .../MetalinkDirectDownloadCommand.java | 0 .../NfsDirectDownloadCommand.java | 0 .../SetupDirectDownloadCertificate.java | 0 .../cloudstack/ca/SetupCertificateAnswer.java | 0 .../ca/SetupCertificateCommand.java | 0 .../cloudstack/ca/SetupKeyStoreCommand.java | 0 .../cloudstack/ca/SetupKeystoreAnswer.java | 0 .../storage/command/AttachAnswer.java | 0 .../storage/command/AttachCommand.java | 0 .../command/AttachPrimaryDataStoreAnswer.java | 0 .../command/AttachPrimaryDataStoreCmd.java | 0 .../storage/command/CopyCmdAnswer.java | 0 .../storage/command/CopyCommand.java | 0 .../storage/command/CreateObjectAnswer.java | 0 .../storage/command/CreateObjectCommand.java | 0 .../command/CreatePrimaryDataStoreCmd.java | 0 .../storage/command/DeleteCommand.java | 0 .../storage/command/DettachAnswer.java | 0 .../storage/command/DettachCommand.java | 0 .../storage/command/DownloadCommand.java | 0 .../command/DownloadProgressCommand.java | 0 .../storage/command/ForgetObjectCmd.java | 0 .../command/IntroduceObjectAnswer.java | 0 .../storage/command/IntroduceObjectCmd.java | 0 .../storage/command/ResignatureAnswer.java | 0 .../storage/command/ResignatureCommand.java | 0 .../command/RevertSnapshotCommand.java | 0 .../command/SnapshotAndCopyAnswer.java | 0 .../command/SnapshotAndCopyCommand.java | 0 .../command/StorageSubSystemCommand.java | 0 .../TemplateOrVolumePostUploadCommand.java | 0 .../storage/command/UploadStatusAnswer.java | 0 .../storage/command/UploadStatusCommand.java | 0 .../cloudstack/storage/to/ImageStoreTO.java | 0 .../storage/to/PrimaryDataStoreTO.java | 0 .../storage/to/SnapshotObjectTO.java | 0 .../storage/to/TemplateObjectTO.java | 0 .../cloudstack/storage/to/VolumeObjectTO.java | 0 .../cloudstack/allocator/module.properties | 0 .../spring-core-allocator-context.xml | 0 ...ifecycle-allocator-context-inheritable.xml | 0 .../META-INF/cloudstack/api/module.properties | 0 ...core-lifecycle-api-context-inheritable.xml | 0 .../cloudstack/backend/module.properties | 0 .../cloudstack/bootstrap/module.properties | 0 .../spring-bootstrap-context-inheritable.xml | 0 .../bootstrap/spring-bootstrap-context.xml | 0 .../META-INF/cloudstack/ca/module.properties | 0 ...-core-lifecycle-ca-context-inheritable.xml | 0 .../direct-download/module.properties | 0 ...le-direct-download-context-inheritable.xml | 0 .../cloudstack/compute/module.properties | 0 ...-lifecycle-compute-context-inheritable.xml | 0 .../cloudstack/core/module.properties | 0 .../cloudstack/core/spring-core-context.xml | 0 ...ore-lifecycle-core-context-inheritable.xml | 0 .../spring-core-registry-core-context.xml | 0 .../cloudstack/discoverer/module.properties | 0 ...fecycle-discoverer-context-inheritable.xml | 0 .../cloudstack/network/module.properties | 0 ...-lifecycle-network-context-inheritable.xml | 0 .../outofbandmanagement/module.properties | 0 ...utofbandmanagement-context-inheritable.xml | 0 .../cloudstack/planner/module.properties | 0 ...-lifecycle-planner-context-inheritable.xml | 0 .../cloudstack/storage/module.properties | 0 ...-lifecycle-storage-context-inheritable.xml | 0 .../cloudstack/system/module.properties | 0 ...spring-core-system-context-inheritable.xml | 0 .../system/spring-core-system-context.xml | 0 .../agent/api/SecurityGroupRulesCmdTest.java | 0 .../api/routing/SetNetworkACLCommandTest.java | 0 .../virtualnetwork/ConfigHelperTest.java | 0 .../VirtualRoutingResourceTest.java | 0 .../cloud/agent/transport/RequestTest.java | 0 .../network/HAProxyConfiguratorTest.java | 0 .../template/LocalTemplateDownloaderTest.java | 0 .../storage/template/OVAProcessorTest.java | 0 .../storage/template/QCOW2ProcessorTest.java | 0 .../storage/template/VhdProcessorTest.java | 0 .../agent/test/AgentControlAnswerTest.java | 0 .../agent/test/AgentControlCommandTest.java | 0 .../cloudstack/api/agent/test/AnswerTest.java | 0 .../api/agent/test/AttachIsoCommandTest.java | 0 .../agent/test/BackupSnapshotAnswerTest.java | 0 .../agent/test/BackupSnapshotCommandTest.java | 0 .../agent/test/BumpUpPriorityCommandTest.java | 0 .../api/agent/test/CancelCommandTest.java | 0 .../api/agent/test/ChangeAgentAnswerTest.java | 0 .../agent/test/ChangeAgentCommandTest.java | 0 .../api/agent/test/CheckHealthAnswerTest.java | 0 .../agent/test/CheckHealthCommandTest.java | 0 .../agent/test/CheckNetworkAnswerTest.java | 0 .../agent/test/CheckNetworkCommandTest.java | 0 .../agent/test/CheckOnHostCommandTest.java | 0 .../api/agent/test/SnapshotCommandTest.java | 0 core/{ => src}/test/resources/vhds/test.vhd | Bin .../test/resources/vhds/test.vhd.bz2 | Bin .../{ => src}/test/resources/vhds/test.vhd.gz | Bin .../test/resources/vhds/test.vhd.zip | Bin .../com/cloud/vm/VirtualMachineGuru.java | 0 .../com/cloud/vm/VirtualMachineManager.java | 0 .../engine/cloud/entity/api/BackupEntity.java | 0 .../engine/cloud/entity/api/EdgeService.java | 0 .../cloud/entity/api/NetworkEntity.java | 0 .../engine/cloud/entity/api/NicEntity.java | 0 .../cloud/entity/api/SnapshotEntity.java | 0 .../cloud/entity/api/TemplateEntity.java | 0 .../entity/api/VirtualMachineEntity.java | 0 .../engine/cloud/entity/api/VolumeEntity.java | 0 .../datacenter/entity/api/ClusterEntity.java | 0 .../entity/api/DataCenterResourceEntity.java | 0 .../datacenter/entity/api/HostEntity.java | 0 .../entity/api/OrganizationScope.java | 0 .../datacenter/entity/api/PodEntity.java | 0 .../datacenter/entity/api/StorageEntity.java | 0 .../datacenter/entity/api/ZoneEntity.java | 0 .../engine/entity/api/CloudStackEntity.java | 0 .../InsufficientCapacityException.java | 0 .../service/NetworkOrchestrationService.java | 0 .../service/VolumeOrchestrationService.java | 0 .../rest/service/api/ClusterRestService.java | 0 .../rest/service/api/NetworkRestService.java | 0 .../rest/service/api/PodRestService.java | 0 .../api/VirtualMachineRestService.java | 0 .../rest/service/api/VolumeRestService.java | 0 .../rest/service/api/ZoneRestService.java | 0 .../engine/service/api/DirectoryService.java | 0 .../engine/service/api/EntityService.java | 0 .../service/api/OperationsServices.java | 0 .../service/api/OrchestrationService.java | 0 .../service/api/ProvisioningService.java | 0 .../api/hypervisor/ComputeSubsystem.java | 0 .../api/network/NetworkServiceProvider.java | 0 .../api/network/NetworkSubsystem.java | 0 .../subsystem/api/storage/AbstractScope.java | 0 .../subsystem/api/storage/ChapInfo.java | 0 .../subsystem/api/storage/ClusterScope.java | 0 .../api/storage/CopyCommandResult.java | 0 .../api/storage/CreateCmdResult.java | 0 .../api/storage/DataMotionService.java | 0 .../api/storage/DataMotionStrategy.java | 0 .../subsystem/api/storage/DataObject.java | 0 .../api/storage/DataObjectInStore.java | 0 .../subsystem/api/storage/DataStore.java | 0 .../api/storage/DataStoreCapabilities.java | 0 .../api/storage/DataStoreDriver.java | 0 .../api/storage/DataStoreLifeCycle.java | 0 .../api/storage/DataStoreManager.java | 0 .../api/storage/DataStoreProvider.java | 0 .../api/storage/DataStoreProviderManager.java | 0 .../subsystem/api/storage/EndPoint.java | 0 .../api/storage/EndPointSelector.java | 0 .../subsystem/api/storage/HostScope.java | 0 .../api/storage/HypervisorHostListener.java | 0 .../api/storage/ImageStoreProvider.java | 0 .../ObjectInDataStoreStateMachine.java | 0 .../api/storage/PrimaryDataStore.java | 0 .../api/storage/PrimaryDataStoreDriver.java | 0 .../api/storage/PrimaryDataStoreInfo.java | 0 .../storage/PrimaryDataStoreLifeCycle.java | 0 .../storage/PrimaryDataStoreParameters.java | 0 .../api/storage/PrimaryDataStoreProvider.java | 0 .../engine/subsystem/api/storage/Scope.java | 0 .../api/storage/SnapshotDataFactory.java | 0 .../subsystem/api/storage/SnapshotInfo.java | 0 .../api/storage/SnapshotProfile.java | 0 .../subsystem/api/storage/SnapshotResult.java | 0 .../api/storage/SnapshotService.java | 0 .../api/storage/SnapshotStrategy.java | 0 .../subsystem/api/storage/StorageAction.java | 0 .../api/storage/StorageCacheManager.java | 0 .../subsystem/api/storage/StorageEvent.java | 0 .../api/storage/StoragePoolAllocator.java | 0 .../api/storage/StorageStrategyFactory.java | 0 .../api/storage/StrategyPriority.java | 0 .../api/storage/TemplateDataFactory.java | 0 .../subsystem/api/storage/TemplateEvent.java | 0 .../subsystem/api/storage/TemplateInfo.java | 0 .../api/storage/TemplateService.java | 0 .../subsystem/api/storage/TemplateState.java | 0 .../api/storage/VMSnapshotOptions.java | 0 .../api/storage/VMSnapshotStrategy.java | 0 .../api/storage/VolumeDataFactory.java | 0 .../subsystem/api/storage/VolumeInfo.java | 0 .../subsystem/api/storage/VolumeService.java | 0 .../subsystem/api/storage/ZoneScope.java | 0 .../api/storage/disktype/DiskFormat.java | 0 .../subsystem/api/storage/disktype/QCOW2.java | 0 .../api/storage/disktype/Unknown.java | 0 .../subsystem/api/storage/disktype/VHD.java | 0 .../subsystem/api/storage/disktype/VHDX.java | 0 .../subsystem/api/storage/disktype/VMDK.java | 0 .../api/storage/disktype/VolumeDiskType.java | 0 .../storage/disktype/VolumeDiskTypeBase.java | 0 .../disktype/VolumeDiskTypeHelper.java | 0 .../subsystem/api/storage/type/BaseImage.java | 0 .../subsystem/api/storage/type/DataDisk.java | 0 .../subsystem/api/storage/type/Iso.java | 0 .../subsystem/api/storage/type/RootDisk.java | 0 .../subsystem/api/storage/type/Unknown.java | 0 .../api/storage/type/VolumeType.java | 0 .../api/storage/type/VolumeTypeBase.java | 0 .../api/storage/type/VolumeTypeHelper.java | 0 .../storage/command/CommandResult.java | 0 .../image/datastore/ImageStoreEntity.java | 0 .../image/datastore/ImageStoreInfo.java | 0 .../core/spring-engine-api-core-context.xml | 0 .../subsystem/api/storage/ScopeTest.java | 0 .../storage/type/VolumeTypeHelperTest.java | 0 .../java}/com/cloud/agent/AgentManager.java | 0 .../java}/com/cloud/agent/Listener.java | 0 .../java}/com/cloud/alert/AlertManager.java | 0 .../com/cloud/capacity/CapacityManager.java | 0 .../configuration/ConfigurationManager.java | 0 .../deploy/DeploymentPlanningManager.java | 0 .../com/cloud/event/UsageEventUtils.java | 0 .../com/cloud/ha/HighAvailabilityManager.java | 0 .../hypervisor/HypervisorGuruManager.java | 0 .../com/cloud/network/IpAddressManager.java | 0 .../cloud/network/NetworkStateListener.java | 0 .../com/cloud/network/addr/PublicIp.java | 0 .../network/lb/LoadBalancingRulesManager.java | 0 .../cloud/network/rules/FirewallManager.java | 0 .../com/cloud/network/rules/RulesManager.java | 0 .../network/rules/StaticNatRuleImpl.java | 0 .../cloud/network/vpc/NetworkACLManager.java | 0 .../com/cloud/network/vpc/VpcManager.java | 0 .../java}/com/cloud/resource/Discoverer.java | 0 .../com/cloud/resource/ResourceManager.java | 0 .../cloud/resource/ResourceStateAdapter.java | 0 .../com/cloud/storage/StorageManager.java | 0 .../com/cloud/template/TemplateManager.java | 0 .../com/cloud/vm/ReservationContextImpl.java | 0 .../cloud/vm/VirtualMachineProfileImpl.java | 0 .../{ => main/java}/com/cloud/vm/VmWork.java | 0 .../com/cloud/vm/VmWorkAttachVolume.java | 0 .../java}/com/cloud/vm/VmWorkConstants.java | 0 .../com/cloud/vm/VmWorkDetachVolume.java | 0 .../com/cloud/vm/VmWorkExtractVolume.java | 0 .../java}/com/cloud/vm/VmWorkJobHandler.java | 0 .../com/cloud/vm/VmWorkJobHandlerProxy.java | 0 .../com/cloud/vm/VmWorkMigrateVolume.java | 0 .../com/cloud/vm/VmWorkResizeVolume.java | 0 .../java}/com/cloud/vm/VmWorkSerializer.java | 0 .../cloud/vm/VmWorkTakeVolumeSnapshot.java | 0 .../cloud/vm/snapshot/VMSnapshotManager.java | 0 .../cloudstack/compute/ComputeGuru.java | 0 ...ing-engine-components-api-core-context.xml | 0 engine/network/pom.xml | 2 - .../network/NetworkOrchestrator.java | 0 .../com/cloud/agent/manager/AgentAttache.java | 0 .../cloud/agent/manager/AgentManagerImpl.java | 0 .../agent/manager/ClusteredAgentAttache.java | 0 .../manager/ClusteredAgentManagerImpl.java | 0 .../manager/ClusteredDirectAgentAttache.java | 0 .../agent/manager/ConnectedAgentAttache.java | 0 .../agent/manager/DirectAgentAttache.java | 0 .../com/cloud/agent/manager/DummyAttache.java | 0 .../com/cloud/agent/manager/Routable.java | 0 .../agent/manager/SynchronousListener.java | 0 .../ClusteredAgentRebalanceService.java | 0 .../agentlb/AgentLoadBalancerPlanner.java | 0 .../ClusterBasedAgentLoadBalancerPlanner.java | 0 .../ClusteredVirtualMachineManagerImpl.java | 0 .../cloud/vm/VirtualMachineManagerImpl.java | 0 .../vm/VirtualMachinePowerStateSync.java | 0 .../vm/VirtualMachinePowerStateSyncImpl.java | 0 .../com/cloud/vm/VmWorkAddVmToNetwork.java | 0 .../com/cloud/vm/VmWorkJobDispatcher.java | 0 .../cloud/vm/VmWorkJobWakeupDispatcher.java | 0 .../java}/com/cloud/vm/VmWorkMigrate.java | 0 .../java}/com/cloud/vm/VmWorkMigrateAway.java | 0 .../com/cloud/vm/VmWorkMigrateForScale.java | 0 .../cloud/vm/VmWorkMigrateWithStorage.java | 0 .../java}/com/cloud/vm/VmWorkReboot.java | 0 .../java}/com/cloud/vm/VmWorkReconfigure.java | 0 .../com/cloud/vm/VmWorkRemoveNicFromVm.java | 0 .../cloud/vm/VmWorkRemoveVmFromNetwork.java | 0 .../java}/com/cloud/vm/VmWorkStart.java | 0 .../java}/com/cloud/vm/VmWorkStop.java | 0 .../com/cloud/vm/VmWorkStorageMigration.java | 0 .../cloud/entity/api/VMEntityManager.java | 0 .../cloud/entity/api/VMEntityManagerImpl.java | 0 .../entity/api/VirtualMachineEntityImpl.java | 0 .../entity/api/ClusterEntityImpl.java | 0 .../entity/api/DataCenterResourceManager.java | 0 .../api/DataCenterResourceManagerImpl.java | 0 .../datacenter/entity/api/HostEntityImpl.java | 0 .../datacenter/entity/api/PodEntityImpl.java | 0 .../datacenter/entity/api/ZoneEntityImpl.java | 0 .../entity/api/db/ClusterDetailsVO.java | 0 .../datacenter/entity/api/db/DcDetailVO.java | 0 .../entity/api/db/EngineCluster.java | 0 .../entity/api/db/EngineClusterVO.java | 0 .../entity/api/db/EngineDataCenter.java | 0 .../entity/api/db/EngineDataCenterVO.java | 0 .../datacenter/entity/api/db/EngineHost.java | 0 .../entity/api/db/EngineHostPodVO.java | 0 .../entity/api/db/EngineHostVO.java | 0 .../datacenter/entity/api/db/EnginePod.java | 0 .../entity/api/db/dao/DcDetailsDao.java | 0 .../entity/api/db/dao/DcDetailsDaoImpl.java | 0 .../entity/api/db/dao/EngineClusterDao.java | 0 .../api/db/dao/EngineClusterDaoImpl.java | 0 .../api/db/dao/EngineDataCenterDao.java | 0 .../api/db/dao/EngineDataCenterDaoImpl.java | 0 .../entity/api/db/dao/EngineHostDao.java | 0 .../entity/api/db/dao/EngineHostDaoImpl.java | 0 .../entity/api/db/dao/EngineHostPodDao.java | 0 .../api/db/dao/EngineHostPodDaoImpl.java | 0 .../entity/api/db/dao/HostDetailsDao.java | 0 .../entity/api/db/dao/HostDetailsDaoImpl.java | 0 .../entity/api/db/dao/HostTagsDao.java | 0 .../entity/api/db/dao/HostTagsDaoImpl.java | 0 .../orchestration/CloudOrchestrator.java | 0 .../orchestration/NetworkOrchestrator.java | 0 .../orchestration/VolumeOrchestrator.java | 0 .../service/api/ProvisioningServiceImpl.java | 0 ...ring-engine-orchestration-core-context.xml | 0 .../agent/manager/AgentManagerImplTest.java | 0 .../manager/ConnectedAgentAttacheTest.java | 0 .../agent/manager/DirectAgentAttacheTest.java | 0 .../vm/VirtualMachineManagerImplTest.java | 0 .../NetworkOrchestratorTest.java | 0 .../test/ChildTestConfiguration.java | 0 .../provisioning/test/ProvisioningTest.java | 0 .../test/resources}/provisioningContext.xml | 0 .../java}/com/cloud/alert/AlertVO.java | 0 .../java}/com/cloud/alert/dao/AlertDao.java | 0 .../com/cloud/alert/dao/AlertDaoImpl.java | 0 .../java}/com/cloud/capacity/CapacityVO.java | 0 .../com/cloud/capacity/dao/CapacityDao.java | 0 .../cloud/capacity/dao/CapacityDaoImpl.java | 0 .../com/cloud/certificate/CertificateVO.java | 0 .../java}/com/cloud/certificate/CrlVO.java | 0 .../cloud/certificate/dao/CertificateDao.java | 0 .../certificate/dao/CertificateDaoImpl.java | 0 .../com/cloud/certificate/dao/CrlDao.java | 0 .../com/cloud/certificate/dao/CrlDaoImpl.java | 0 .../ManagementServiceConfiguration.java | 0 .../ManagementServiceConfigurationImpl.java | 0 .../cloud/usage/UsageSnapshotOnPrimaryVO.java | 0 .../dao/UsageVMSnapshotOnPrimaryDao.java | 0 .../dao/UsageVMSnapshotOnPrimaryDaoImpl.java | 0 .../cluster/agentlb/HostTransferMapVO.java | 0 .../agentlb/dao/HostTransferMapDao.java | 0 .../agentlb/dao/HostTransferMapDaoImpl.java | 0 .../cloud/configuration/ResourceCountVO.java | 0 .../cloud/configuration/ResourceLimitVO.java | 0 .../configuration/dao/ResourceCountDao.java | 0 .../dao/ResourceCountDaoImpl.java | 0 .../configuration/dao/ResourceLimitDao.java | 0 .../dao/ResourceLimitDaoImpl.java | 0 .../java}/com/cloud/dc/AccountVlanMapVO.java | 0 .../java}/com/cloud/dc/ClusterDetailsDao.java | 0 .../com/cloud/dc/ClusterDetailsDaoImpl.java | 0 .../java}/com/cloud/dc/ClusterDetailsVO.java | 0 .../java}/com/cloud/dc/ClusterVO.java | 0 .../java}/com/cloud/dc/ClusterVSMMapVO.java | 0 .../com/cloud/dc/DataCenterDetailVO.java | 0 .../com/cloud/dc/DataCenterIpAddressVO.java | 0 .../dc/DataCenterLinkLocalIpAddressVO.java | 0 .../java}/com/cloud/dc/DataCenterVO.java | 0 .../java}/com/cloud/dc/DataCenterVnetVO.java | 0 .../java}/com/cloud/dc/DomainVlanMapVO.java | 0 .../java}/com/cloud/dc/HostPodVO.java | 0 .../java}/com/cloud/dc/PodCluster.java | 0 .../java}/com/cloud/dc/PodVlanMapVO.java | 0 .../java}/com/cloud/dc/PodVlanVO.java | 0 .../cloud/dc/StorageNetworkIpAddressVO.java | 0 .../com/cloud/dc/StorageNetworkIpRangeVO.java | 0 .../java}/com/cloud/dc/VlanDetailsVO.java | 0 .../{ => main/java}/com/cloud/dc/VlanVO.java | 0 .../com/cloud/dc/dao/AccountVlanMapDao.java | 0 .../cloud/dc/dao/AccountVlanMapDaoImpl.java | 0 .../java}/com/cloud/dc/dao/ClusterDao.java | 0 .../com/cloud/dc/dao/ClusterDaoImpl.java | 0 .../com/cloud/dc/dao/ClusterVSMMapDao.java | 0 .../cloud/dc/dao/ClusterVSMMapDaoImpl.java | 0 .../java}/com/cloud/dc/dao/DataCenterDao.java | 0 .../com/cloud/dc/dao/DataCenterDaoImpl.java | 0 .../cloud/dc/dao/DataCenterDetailsDao.java | 0 .../dc/dao/DataCenterDetailsDaoImpl.java | 0 .../cloud/dc/dao/DataCenterIpAddressDao.java | 0 .../dc/dao/DataCenterIpAddressDaoImpl.java | 0 .../dao/DataCenterLinkLocalIpAddressDao.java | 0 .../DataCenterLinkLocalIpAddressDaoImpl.java | 0 .../com/cloud/dc/dao/DataCenterVnetDao.java | 0 .../cloud/dc/dao/DataCenterVnetDaoImpl.java | 0 .../com/cloud/dc/dao/DomainVlanMapDao.java | 0 .../cloud/dc/dao/DomainVlanMapDaoImpl.java | 0 .../java}/com/cloud/dc/dao/HostPodDao.java | 0 .../com/cloud/dc/dao/HostPodDaoImpl.java | 0 .../java}/com/cloud/dc/dao/PodVlanDao.java | 0 .../com/cloud/dc/dao/PodVlanDaoImpl.java | 0 .../java}/com/cloud/dc/dao/PodVlanMapDao.java | 0 .../com/cloud/dc/dao/PodVlanMapDaoImpl.java | 0 .../dc/dao/StorageNetworkIpAddressDao.java | 0 .../dao/StorageNetworkIpAddressDaoImpl.java | 0 .../dc/dao/StorageNetworkIpRangeDao.java | 0 .../dc/dao/StorageNetworkIpRangeDaoImpl.java | 0 .../java}/com/cloud/dc/dao/VlanDao.java | 0 .../java}/com/cloud/dc/dao/VlanDaoImpl.java | 0 .../com/cloud/dc/dao/VlanDetailsDao.java | 0 .../com/cloud/dc/dao/VlanDetailsDaoImpl.java | 0 .../java}/com/cloud/domain/DomainVO.java | 0 .../java}/com/cloud/domain/dao/DomainDao.java | 0 .../com/cloud/domain/dao/DomainDaoImpl.java | 0 .../cloud/domain}/domain/DomainDetailVO.java | 0 .../domain}/domain/dao/DomainDetailsDao.java | 0 .../domain/dao/DomainDetailsDaoImpl.java | 0 .../java}/com/cloud/event/EventVO.java | 0 .../com/cloud/event/UsageEventDetailsVO.java | 0 .../java}/com/cloud/event/UsageEventVO.java | 0 .../java}/com/cloud/event/dao/EventDao.java | 0 .../com/cloud/event/dao/EventDaoImpl.java | 0 .../com/cloud/event/dao/UsageEventDao.java | 0 .../cloud/event/dao/UsageEventDaoImpl.java | 0 .../cloud/event/dao/UsageEventDetailsDao.java | 0 .../event/dao/UsageEventDetailsDaoImpl.java | 0 .../java}/com/cloud/gpu/HostGpuGroupsVO.java | 0 .../java}/com/cloud/gpu/VGPUTypesVO.java | 0 .../com/cloud/gpu/dao/HostGpuGroupsDao.java | 0 .../cloud/gpu/dao/HostGpuGroupsDaoImpl.java | 0 .../java}/com/cloud/gpu/dao/VGPUTypesDao.java | 0 .../com/cloud/gpu/dao/VGPUTypesDaoImpl.java | 0 .../java}/com/cloud/host/DetailVO.java | 0 .../java}/com/cloud/host/HostTagVO.java | 0 .../java}/com/cloud/host/HostVO.java | 0 .../java}/com/cloud/host/dao/HostDao.java | 0 .../java}/com/cloud/host/dao/HostDaoImpl.java | 0 .../com/cloud/host/dao/HostDetailsDao.java | 0 .../cloud/host/dao/HostDetailsDaoImpl.java | 0 .../java}/com/cloud/host/dao/HostTagsDao.java | 0 .../com/cloud/host/dao/HostTagsDaoImpl.java | 0 .../hypervisor/HypervisorCapabilitiesVO.java | 0 .../dao/HypervisorCapabilitiesDao.java | 0 .../dao/HypervisorCapabilitiesDaoImpl.java | 0 .../cloud/network/LBHealthCheckPolicyVO.java | 0 .../com/cloud/network/UserIpv6AddressVO.java | 0 .../java}/com/cloud/network/VpnUserVO.java | 0 .../as/AutoScalePolicyConditionMapVO.java | 0 .../cloud/network/as/AutoScalePolicyVO.java | 0 .../as/AutoScaleVmGroupPolicyMapVO.java | 0 .../cloud/network/as/AutoScaleVmGroupVO.java | 0 .../network/as/AutoScaleVmGroupVmMapVO.java | 0 .../network/as/AutoScaleVmProfileVO.java | 0 .../com/cloud/network/as/ConditionVO.java | 0 .../java}/com/cloud/network/as/CounterVO.java | 0 .../dao/AutoScalePolicyConditionMapDao.java | 0 .../AutoScalePolicyConditionMapDaoImpl.java | 0 .../network/as/dao/AutoScalePolicyDao.java | 0 .../as/dao/AutoScalePolicyDaoImpl.java | 0 .../network/as/dao/AutoScaleVmGroupDao.java | 0 .../as/dao/AutoScaleVmGroupDaoImpl.java | 0 .../as/dao/AutoScaleVmGroupPolicyMapDao.java | 0 .../dao/AutoScaleVmGroupPolicyMapDaoImpl.java | 0 .../as/dao/AutoScaleVmGroupVmMapDao.java | 0 .../as/dao/AutoScaleVmGroupVmMapDaoImpl.java | 0 .../network/as/dao/AutoScaleVmProfileDao.java | 0 .../as/dao/AutoScaleVmProfileDaoImpl.java | 0 .../cloud/network/as/dao/ConditionDao.java | 0 .../network/as/dao/ConditionDaoImpl.java | 0 .../com/cloud/network/as/dao/CounterDao.java | 0 .../cloud/network/as/dao/CounterDaoImpl.java | 0 .../network/dao/AccountGuestVlanMapDao.java | 0 .../dao/AccountGuestVlanMapDaoImpl.java | 0 .../network/dao/AccountGuestVlanMapVO.java | 0 .../dao/ExternalFirewallDeviceDao.java | 0 .../dao/ExternalFirewallDeviceDaoImpl.java | 0 .../network/dao/ExternalFirewallDeviceVO.java | 0 .../dao/ExternalLoadBalancerDeviceDao.java | 0 .../ExternalLoadBalancerDeviceDaoImpl.java | 0 .../dao/ExternalLoadBalancerDeviceVO.java | 0 .../network/dao/FirewallRulesCidrsDao.java | 0 .../dao/FirewallRulesCidrsDaoImpl.java | 0 .../network/dao/FirewallRulesCidrsVO.java | 0 .../cloud/network/dao/FirewallRulesDao.java | 0 .../network/dao/FirewallRulesDaoImpl.java | 0 .../network/dao/FirewallRulesDcidrsDao.java | 0 .../dao/FirewallRulesDcidrsDaoImpl.java | 0 .../network/dao/FirewallRulesDestCidrsVO.java | 0 .../com/cloud/network/dao/IPAddressDao.java | 0 .../cloud/network/dao/IPAddressDaoImpl.java | 0 .../com/cloud/network/dao/IPAddressVO.java | 0 .../dao/InlineLoadBalancerNicMapDao.java | 0 .../dao/InlineLoadBalancerNicMapDaoImpl.java | 0 .../dao/InlineLoadBalancerNicMapVO.java | 0 .../network/dao/LBHealthCheckPolicyDao.java | 0 .../dao/LBHealthCheckPolicyDaoImpl.java | 0 .../network/dao/LBStickinessPolicyDao.java | 0 .../dao/LBStickinessPolicyDaoImpl.java | 0 .../network/dao/LBStickinessPolicyVO.java | 0 .../network/dao/LoadBalancerCertMapDao.java | 0 .../dao/LoadBalancerCertMapDaoImpl.java | 0 .../network/dao/LoadBalancerCertMapVO.java | 0 .../cloud/network/dao/LoadBalancerDao.java | 0 .../network/dao/LoadBalancerDaoImpl.java | 0 .../network/dao/LoadBalancerVMMapDao.java | 0 .../network/dao/LoadBalancerVMMapDaoImpl.java | 0 .../network/dao/LoadBalancerVMMapVO.java | 0 .../com/cloud/network/dao/LoadBalancerVO.java | 0 .../network/dao/MonitoringServiceDao.java | 0 .../network/dao/MonitoringServiceDaoImpl.java | 0 .../network/dao/MonitoringServiceVO.java | 0 .../cloud/network/dao/NetworkAccountDao.java | 0 .../network/dao/NetworkAccountDaoImpl.java | 0 .../cloud/network/dao/NetworkAccountVO.java | 0 .../com/cloud/network/dao/NetworkDao.java | 0 .../com/cloud/network/dao/NetworkDaoImpl.java | 0 .../cloud/network/dao/NetworkDetailVO.java | 0 .../cloud/network/dao/NetworkDetailsDao.java | 0 .../network/dao/NetworkDetailsDaoImpl.java | 0 .../cloud/network/dao/NetworkDomainDao.java | 0 .../network/dao/NetworkDomainDaoImpl.java | 0 .../cloud/network/dao/NetworkDomainVO.java | 0 .../dao/NetworkExternalFirewallDao.java | 0 .../dao/NetworkExternalFirewallDaoImpl.java | 0 .../dao/NetworkExternalFirewallVO.java | 0 .../dao/NetworkExternalLoadBalancerDao.java | 0 .../NetworkExternalLoadBalancerDaoImpl.java | 0 .../dao/NetworkExternalLoadBalancerVO.java | 0 .../com/cloud/network/dao/NetworkOpDao.java | 0 .../cloud/network/dao/NetworkOpDaoImpl.java | 0 .../com/cloud/network/dao/NetworkOpVO.java | 0 .../network/dao/NetworkRuleConfigDao.java | 0 .../network/dao/NetworkRuleConfigDaoImpl.java | 0 .../network/dao/NetworkRuleConfigVO.java | 0 .../network/dao/NetworkServiceMapDao.java | 0 .../network/dao/NetworkServiceMapDaoImpl.java | 0 .../network/dao/NetworkServiceMapVO.java | 0 .../com/cloud/network/dao/NetworkVO.java | 0 .../dao/OpRouterMonitorServiceDao.java | 0 .../dao/OpRouterMonitorServiceDaoImpl.java | 0 .../network/dao/OpRouterMonitorServiceVO.java | 0 .../com/cloud/network/dao/OvsProviderDao.java | 0 .../cloud/network/dao/OvsProviderDaoImpl.java | 0 .../cloud/network/dao/PhysicalNetworkDao.java | 0 .../network/dao/PhysicalNetworkDaoImpl.java | 0 ...PhysicalNetworkIsolationMethodDaoImpl.java | 0 .../dao/PhysicalNetworkIsolationMethodVO.java | 0 .../PhysicalNetworkServiceProviderDao.java | 0 ...PhysicalNetworkServiceProviderDaoImpl.java | 0 .../dao/PhysicalNetworkServiceProviderVO.java | 0 .../dao/PhysicalNetworkTagDaoImpl.java | 0 .../network/dao/PhysicalNetworkTagVO.java | 0 .../dao/PhysicalNetworkTrafficTypeDao.java | 0 .../PhysicalNetworkTrafficTypeDaoImpl.java | 0 .../dao/PhysicalNetworkTrafficTypeVO.java | 0 .../cloud/network/dao/PhysicalNetworkVO.java | 0 .../com/cloud/network/dao/PortProfileDao.java | 0 .../cloud/network/dao/PortProfileDaoImpl.java | 0 .../com/cloud/network/dao/PortProfileVO.java | 0 .../cloud/network/dao/RemoteAccessVpnDao.java | 0 .../network/dao/RemoteAccessVpnDaoImpl.java | 0 .../cloud/network/dao/RemoteAccessVpnVO.java | 0 .../cloud/network/dao/RouterNetworkDao.java | 0 .../network/dao/RouterNetworkDaoImpl.java | 0 .../cloud/network/dao/RouterNetworkVO.java | 0 .../dao/Site2SiteCustomerGatewayDao.java | 0 .../dao/Site2SiteCustomerGatewayDaoImpl.java | 0 .../dao/Site2SiteCustomerGatewayVO.java | 0 .../dao/Site2SiteVpnConnectionDao.java | 0 .../dao/Site2SiteVpnConnectionDaoImpl.java | 0 .../network/dao/Site2SiteVpnConnectionVO.java | 0 .../network/dao/Site2SiteVpnGatewayDao.java | 0 .../dao/Site2SiteVpnGatewayDaoImpl.java | 0 .../network/dao/Site2SiteVpnGatewayVO.java | 0 .../com/cloud/network/dao/SslCertDao.java | 0 .../com/cloud/network/dao/SslCertDaoImpl.java | 0 .../com/cloud/network/dao/SslCertVO.java | 0 .../cloud/network/dao/UserIpv6AddressDao.java | 0 .../network/dao/UserIpv6AddressDaoImpl.java | 0 .../network/dao/VirtualRouterProviderDao.java | 0 .../dao/VirtualRouterProviderDaoImpl.java | 0 .../com/cloud/network/dao/VpnUserDao.java | 0 .../com/cloud/network/dao/VpnUserDaoImpl.java | 0 .../cloud/network/element/OvsProviderVO.java | 0 .../element/VirtualRouterProviderVO.java | 0 .../cloud/network/rules/FirewallRuleVO.java | 0 .../network/rules/PortForwardingRuleVO.java | 0 .../rules/dao/PortForwardingRulesDao.java | 0 .../rules/dao/PortForwardingRulesDaoImpl.java | 0 .../network/security/SecurityGroupRuleVO.java | 0 .../security/SecurityGroupRulesVO.java | 0 .../security/SecurityGroupVMMapVO.java | 0 .../network/security/SecurityGroupVO.java | 0 .../network/security/SecurityGroupWork.java | 0 .../network/security/SecurityGroupWorkVO.java | 0 .../network/security/VmRulesetLogVO.java | 0 .../security/dao/SecurityGroupDao.java | 0 .../security/dao/SecurityGroupDaoImpl.java | 0 .../security/dao/SecurityGroupRuleDao.java | 0 .../dao/SecurityGroupRuleDaoImpl.java | 0 .../security/dao/SecurityGroupRulesDao.java | 0 .../dao/SecurityGroupRulesDaoImpl.java | 0 .../security/dao/SecurityGroupVMMapDao.java | 0 .../dao/SecurityGroupVMMapDaoImpl.java | 0 .../security/dao/SecurityGroupWorkDao.java | 0 .../dao/SecurityGroupWorkDaoImpl.java | 0 .../network/security/dao/VmRulesetLogDao.java | 0 .../security/dao/VmRulesetLogDaoImpl.java | 0 .../network/vpc/NetworkACLItemCidrsDao.java | 0 .../network/vpc/NetworkACLItemCidrsVO.java | 0 .../cloud/network/vpc/NetworkACLItemDao.java | 0 .../cloud/network/vpc/NetworkACLItemVO.java | 0 .../com/cloud/network/vpc/NetworkACLVO.java | 0 .../com/cloud/network/vpc/PrivateIpVO.java | 0 .../com/cloud/network/vpc/StaticRouteVO.java | 0 .../com/cloud/network/vpc/VpcGatewayVO.java | 0 .../network/vpc/VpcOfferingServiceMapVO.java | 0 .../com/cloud/network/vpc/VpcOfferingVO.java | 0 .../cloud/network/vpc/VpcServiceMapVO.java | 0 .../java}/com/cloud/network/vpc/VpcVO.java | 0 .../cloud/network/vpc/dao/NetworkACLDao.java | 0 .../network/vpc/dao/NetworkACLDaoImpl.java | 0 .../vpc/dao/NetworkACLItemCidrsDaoImpl.java | 0 .../vpc/dao/NetworkACLItemDaoImpl.java | 0 .../cloud/network/vpc/dao/PrivateIpDao.java | 0 .../network/vpc/dao/PrivateIpDaoImpl.java | 0 .../cloud/network/vpc/dao/StaticRouteDao.java | 0 .../network/vpc/dao/StaticRouteDaoImpl.java | 0 .../com/cloud/network/vpc/dao/VpcDao.java | 0 .../com/cloud/network/vpc/dao/VpcDaoImpl.java | 0 .../cloud/network/vpc/dao/VpcGatewayDao.java | 0 .../network/vpc/dao/VpcGatewayDaoImpl.java | 0 .../cloud/network/vpc/dao/VpcOfferingDao.java | 0 .../network/vpc/dao/VpcOfferingDaoImpl.java | 0 .../vpc/dao/VpcOfferingServiceMapDao.java | 0 .../vpc/dao/VpcOfferingServiceMapDaoImpl.java | 0 .../network/vpc/dao/VpcServiceMapDao.java | 0 .../network/vpc/dao/VpcServiceMapDaoImpl.java | 0 .../offerings/NetworkOfferingDetailsVO.java | 0 .../NetworkOfferingServiceMapVO.java | 0 .../cloud/offerings/NetworkOfferingVO.java | 0 .../offerings/dao/NetworkOfferingDao.java | 0 .../offerings/dao/NetworkOfferingDaoImpl.java | 0 .../dao/NetworkOfferingDetailsDao.java | 0 .../dao/NetworkOfferingDetailsDaoImpl.java | 0 .../dao/NetworkOfferingServiceMapDao.java | 0 .../dao/NetworkOfferingServiceMapDaoImpl.java | 0 .../com/cloud/projects/ProjectAccountVO.java | 0 .../cloud/projects/ProjectInvitationVO.java | 0 .../java}/com/cloud/projects/ProjectVO.java | 0 .../cloud/projects/dao/ProjectAccountDao.java | 0 .../projects/dao/ProjectAccountDaoImpl.java | 0 .../com/cloud/projects/dao/ProjectDao.java | 0 .../cloud/projects/dao/ProjectDaoImpl.java | 0 .../projects/dao/ProjectInvitationDao.java | 0 .../dao/ProjectInvitationDaoImpl.java | 0 .../cloud/secstorage/CommandExecLogDao.java | 0 .../secstorage/CommandExecLogDaoImpl.java | 0 .../cloud/secstorage/CommandExecLogVO.java | 0 .../service/ServiceOfferingDetailsVO.java | 0 .../com/cloud/service/ServiceOfferingVO.java | 0 .../cloud/service/dao/ServiceOfferingDao.java | 0 .../service/dao/ServiceOfferingDaoImpl.java | 0 .../dao/ServiceOfferingDetailsDao.java | 0 .../dao/ServiceOfferingDetailsDaoImpl.java | 0 .../com/cloud/storage/DiskOfferingVO.java | 0 .../com/cloud/storage/GuestOSCategoryVO.java | 0 .../cloud/storage/GuestOSHypervisorVO.java | 0 .../java}/com/cloud/storage/GuestOSVO.java | 0 .../com/cloud/storage/LaunchPermissionVO.java | 0 .../com/cloud/storage/SnapshotPolicyVO.java | 0 .../com/cloud/storage/SnapshotScheduleVO.java | 0 .../java}/com/cloud/storage/SnapshotVO.java | 0 .../cloud/storage/StoragePoolHostAssoc.java | 0 .../com/cloud/storage/StoragePoolHostVO.java | 0 .../com/cloud/storage/StoragePoolTagVO.java | 0 .../com/cloud/storage/StoragePoolWorkVO.java | 0 .../java}/com/cloud/storage/UploadVO.java | 0 .../com/cloud/storage/VMTemplateDetailVO.java | 0 .../com/cloud/storage/VMTemplateHostVO.java | 0 .../storage/VMTemplateStoragePoolVO.java | 0 .../java}/com/cloud/storage/VMTemplateVO.java | 0 .../com/cloud/storage/VMTemplateZoneVO.java | 0 .../com/cloud/storage/VolumeDetailVO.java | 0 .../java}/com/cloud/storage/VolumeHostVO.java | 0 .../java}/com/cloud/storage/VolumeVO.java | 0 .../cloud/storage/dao/DiskOfferingDao.java | 0 .../storage/dao/DiskOfferingDaoImpl.java | 0 .../cloud/storage/dao/GuestOSCategoryDao.java | 0 .../storage/dao/GuestOSCategoryDaoImpl.java | 0 .../com/cloud/storage/dao/GuestOSDao.java | 0 .../com/cloud/storage/dao/GuestOSDaoImpl.java | 0 .../storage/dao/GuestOSHypervisorDao.java | 0 .../storage/dao/GuestOSHypervisorDaoImpl.java | 0 .../storage/dao/LaunchPermissionDao.java | 0 .../storage/dao/LaunchPermissionDaoImpl.java | 0 .../com/cloud/storage/dao/SnapshotDao.java | 0 .../cloud/storage/dao/SnapshotDaoImpl.java | 0 .../cloud/storage/dao/SnapshotDetailsDao.java | 0 .../storage/dao/SnapshotDetailsDaoImpl.java | 0 .../cloud/storage/dao/SnapshotDetailsVO.java | 0 .../cloud/storage/dao/SnapshotPolicyDao.java | 0 .../storage/dao/SnapshotPolicyDaoImpl.java | 0 .../storage/dao/SnapshotScheduleDao.java | 0 .../storage/dao/SnapshotScheduleDaoImpl.java | 0 .../dao/StoragePoolDetailsDaoImpl.java | 0 .../cloud/storage/dao/StoragePoolHostDao.java | 0 .../storage/dao/StoragePoolHostDaoImpl.java | 0 .../cloud/storage/dao/StoragePoolTagsDao.java | 0 .../storage/dao/StoragePoolTagsDaoImpl.java | 0 .../cloud/storage/dao/StoragePoolWorkDao.java | 0 .../storage/dao/StoragePoolWorkDaoImpl.java | 0 .../com/cloud/storage/dao/UploadDao.java | 0 .../com/cloud/storage/dao/UploadDaoImpl.java | 0 .../com/cloud/storage/dao/VMTemplateDao.java | 0 .../cloud/storage/dao/VMTemplateDaoImpl.java | 0 .../storage/dao/VMTemplateDetailsDao.java | 0 .../storage/dao/VMTemplateDetailsDaoImpl.java | 0 .../cloud/storage/dao/VMTemplateHostDao.java | 0 .../storage/dao/VMTemplateHostDaoImpl.java | 0 .../cloud/storage/dao/VMTemplatePoolDao.java | 0 .../storage/dao/VMTemplatePoolDaoImpl.java | 0 .../cloud/storage/dao/VMTemplateZoneDao.java | 0 .../storage/dao/VMTemplateZoneDaoImpl.java | 0 .../com/cloud/storage/dao/VolumeDao.java | 0 .../com/cloud/storage/dao/VolumeDaoImpl.java | 0 .../cloud/storage/dao/VolumeDetailsDao.java | 0 .../storage/dao/VolumeDetailsDaoImpl.java | 0 .../com/cloud/storage/dao/VolumeHostDao.java | 0 .../cloud/storage/dao/VolumeHostDaoImpl.java | 0 .../java}/com/cloud/tags/ResourceTagVO.java | 0 .../com/cloud/tags/dao/ResourceTagDao.java | 0 .../cloud/tags/dao/ResourceTagsDaoImpl.java | 0 .../com/cloud/upgrade/DatabaseCreator.java | 0 .../upgrade/DatabaseIntegrityChecker.java | 0 .../cloud/upgrade/DatabaseUpgradeChecker.java | 0 .../upgrade/dao/DatabaseAccessObject.java | 0 .../com/cloud/upgrade/dao/DbUpgrade.java | 0 .../com/cloud/upgrade/dao/DbUpgradeUtils.java | 0 .../cloud/upgrade/dao/LegacyDbUpgrade.java | 0 .../cloud/upgrade/dao/Upgrade217to218.java | 0 .../com/cloud/upgrade/dao/Upgrade218to22.java | 0 .../dao/Upgrade218to224DomainVlans.java | 0 .../upgrade/dao/Upgrade218to22Premium.java | 0 .../cloud/upgrade/dao/Upgrade2210to2211.java | 0 .../cloud/upgrade/dao/Upgrade2211to2212.java | 0 .../upgrade/dao/Upgrade2211to2212Premium.java | 0 .../cloud/upgrade/dao/Upgrade2212to2213.java | 0 .../cloud/upgrade/dao/Upgrade2213to2214.java | 0 .../cloud/upgrade/dao/Upgrade2214to30.java | 0 .../cloud/upgrade/dao/Upgrade221to222.java | 0 .../upgrade/dao/Upgrade221to222Premium.java | 0 .../cloud/upgrade/dao/Upgrade222to224.java | 0 .../upgrade/dao/Upgrade222to224Premium.java | 0 .../cloud/upgrade/dao/Upgrade224to225.java | 0 .../cloud/upgrade/dao/Upgrade225to226.java | 0 .../cloud/upgrade/dao/Upgrade227to228.java | 0 .../upgrade/dao/Upgrade227to228Premium.java | 0 .../cloud/upgrade/dao/Upgrade228to229.java | 0 .../cloud/upgrade/dao/Upgrade229to2210.java | 0 .../cloud/upgrade/dao/Upgrade301to302.java | 0 .../cloud/upgrade/dao/Upgrade302to303.java | 0 .../com/cloud/upgrade/dao/Upgrade302to40.java | 0 .../cloud/upgrade/dao/Upgrade303to304.java | 0 .../cloud/upgrade/dao/Upgrade304to305.java | 0 .../cloud/upgrade/dao/Upgrade305to306.java | 0 .../cloud/upgrade/dao/Upgrade306to307.java | 0 .../cloud/upgrade/dao/Upgrade307to410.java | 0 .../com/cloud/upgrade/dao/Upgrade30to301.java | 0 .../com/cloud/upgrade/dao/Upgrade30xBase.java | 0 .../com/cloud/upgrade/dao/Upgrade40to41.java | 0 .../upgrade/dao/Upgrade41000to41100.java | 0 .../cloud/upgrade/dao/Upgrade410to420.java | 0 .../cloud/upgrade/dao/Upgrade420to421.java | 0 .../cloud/upgrade/dao/Upgrade421to430.java | 0 .../cloud/upgrade/dao/Upgrade430to440.java | 0 .../cloud/upgrade/dao/Upgrade431to440.java | 0 .../cloud/upgrade/dao/Upgrade432to440.java | 0 .../cloud/upgrade/dao/Upgrade440to441.java | 0 .../cloud/upgrade/dao/Upgrade441to442.java | 0 .../cloud/upgrade/dao/Upgrade442to450.java | 0 .../cloud/upgrade/dao/Upgrade443to444.java | 0 .../cloud/upgrade/dao/Upgrade443to450.java | 0 .../cloud/upgrade/dao/Upgrade444to450.java | 0 .../cloud/upgrade/dao/Upgrade450to451.java | 0 .../cloud/upgrade/dao/Upgrade451to452.java | 0 .../cloud/upgrade/dao/Upgrade452to453.java | 0 .../cloud/upgrade/dao/Upgrade452to460.java | 0 .../cloud/upgrade/dao/Upgrade453to460.java | 0 .../cloud/upgrade/dao/Upgrade460to461.java | 0 .../cloud/upgrade/dao/Upgrade461to470.java | 0 .../cloud/upgrade/dao/Upgrade470to471.java | 0 .../cloud/upgrade/dao/Upgrade471to480.java | 0 .../cloud/upgrade/dao/Upgrade480to481.java | 0 .../cloud/upgrade/dao/Upgrade481to490.java | 0 .../cloud/upgrade/dao/Upgrade490to4910.java | 0 .../cloud/upgrade/dao/Upgrade4910to4920.java | 0 .../cloud/upgrade/dao/Upgrade4920to4930.java | 0 .../cloud/upgrade/dao/Upgrade4930to41000.java | 0 .../upgrade/dao/UpgradeSnapshot217to224.java | 0 .../upgrade/dao/UpgradeSnapshot223to224.java | 0 .../com/cloud/upgrade/dao/VersionDao.java | 0 .../com/cloud/upgrade/dao/VersionDaoImpl.java | 0 .../com/cloud/upgrade/dao/VersionVO.java | 0 .../usage/ExternalPublicIpStatisticsVO.java | 0 .../com/cloud/usage/UsageIPAddressVO.java | 0 .../java}/com/cloud/usage/UsageJobVO.java | 0 .../usage/UsageLoadBalancerPolicyVO.java | 0 .../cloud/usage/UsageNetworkOfferingVO.java | 0 .../java}/com/cloud/usage/UsageNetworkVO.java | 0 .../usage/UsagePortForwardingRuleVO.java | 0 .../com/cloud/usage/UsageSecurityGroupVO.java | 0 .../java}/com/cloud/usage/UsageStorageVO.java | 0 .../com/cloud/usage/UsageVMInstanceVO.java | 0 .../com/cloud/usage/UsageVMSnapshotVO.java | 0 .../java}/com/cloud/usage/UsageVO.java | 0 .../java}/com/cloud/usage/UsageVPNUserVO.java | 0 .../java}/com/cloud/usage/UsageVmDiskVO.java | 0 .../java}/com/cloud/usage/UsageVolumeVO.java | 0 .../dao/ExternalPublicIpStatisticsDao.java | 0 .../ExternalPublicIpStatisticsDaoImpl.java | 0 .../java}/com/cloud/usage/dao/UsageDao.java | 0 .../com/cloud/usage/dao/UsageDaoImpl.java | 0 .../cloud/usage/dao/UsageIPAddressDao.java | 0 .../usage/dao/UsageIPAddressDaoImpl.java | 0 .../com/cloud/usage/dao/UsageJobDao.java | 0 .../com/cloud/usage/dao/UsageJobDaoImpl.java | 0 .../usage/dao/UsageLoadBalancerPolicyDao.java | 0 .../dao/UsageLoadBalancerPolicyDaoImpl.java | 0 .../com/cloud/usage/dao/UsageNetworkDao.java | 0 .../cloud/usage/dao/UsageNetworkDaoImpl.java | 0 .../usage/dao/UsageNetworkOfferingDao.java | 0 .../dao/UsageNetworkOfferingDaoImpl.java | 0 .../usage/dao/UsagePortForwardingRuleDao.java | 0 .../dao/UsagePortForwardingRuleDaoImpl.java | 0 .../usage/dao/UsageSecurityGroupDao.java | 0 .../usage/dao/UsageSecurityGroupDaoImpl.java | 0 .../com/cloud/usage/dao/UsageStorageDao.java | 0 .../cloud/usage/dao/UsageStorageDaoImpl.java | 0 .../cloud/usage/dao/UsageVMInstanceDao.java | 0 .../usage/dao/UsageVMInstanceDaoImpl.java | 0 .../cloud/usage/dao/UsageVMSnapshotDao.java | 0 .../usage/dao/UsageVMSnapshotDaoImpl.java | 0 .../com/cloud/usage/dao/UsageVPNUserDao.java | 0 .../cloud/usage/dao/UsageVPNUserDaoImpl.java | 0 .../com/cloud/usage/dao/UsageVmDiskDao.java | 0 .../cloud/usage/dao/UsageVmDiskDaoImpl.java | 0 .../com/cloud/usage/dao/UsageVolumeDao.java | 0 .../cloud/usage/dao/UsageVolumeDaoImpl.java | 0 .../java}/com/cloud/user/AccountDetailVO.java | 0 .../com/cloud/user/AccountDetailsDao.java | 0 .../com/cloud/user/AccountDetailsDaoImpl.java | 0 .../java}/com/cloud/user/AccountVO.java | 0 .../java}/com/cloud/user/SSHKeyPairVO.java | 0 .../java}/com/cloud/user/UserAccountVO.java | 0 .../com/cloud/user/UserStatisticsVO.java | 0 .../java}/com/cloud/user/UserStatsLogVO.java | 0 .../java}/com/cloud/user/UserVO.java | 0 .../com/cloud/user/VmDiskStatisticsVO.java | 0 .../java}/com/cloud/user/dao/AccountDao.java | 0 .../com/cloud/user/dao/AccountDaoImpl.java | 0 .../com/cloud/user/dao/SSHKeyPairDao.java | 0 .../com/cloud/user/dao/SSHKeyPairDaoImpl.java | 0 .../com/cloud/user/dao/UserAccountDao.java | 0 .../cloud/user/dao/UserAccountDaoImpl.java | 0 .../java}/com/cloud/user/dao/UserDao.java | 0 .../java}/com/cloud/user/dao/UserDaoImpl.java | 0 .../com/cloud/user/dao/UserStatisticsDao.java | 0 .../cloud/user/dao/UserStatisticsDaoImpl.java | 0 .../com/cloud/user/dao/UserStatsLogDao.java | 0 .../cloud/user/dao/UserStatsLogDaoImpl.java | 0 .../cloud/user/dao/VmDiskStatisticsDao.java | 0 .../user/dao/VmDiskStatisticsDaoImpl.java | 0 .../java}/com/cloud/vm/ConsoleProxyVO.java | 0 .../java}/com/cloud/vm/DomainRouterVO.java | 0 .../com/cloud/vm/InstanceGroupVMMapVO.java | 0 .../java}/com/cloud/vm/InstanceGroupVO.java | 0 .../java}/com/cloud/vm/ItWorkDao.java | 0 .../java}/com/cloud/vm/ItWorkDaoImpl.java | 0 .../java}/com/cloud/vm/ItWorkVO.java | 0 .../java}/com/cloud/vm/NicDetailVO.java | 0 .../com/cloud/vm/NicExtraDhcpOptionVO.java | 0 .../{ => main/java}/com/cloud/vm/NicVO.java | 0 .../com/cloud/vm/SecondaryStorageVmVO.java | 0 .../com/cloud/vm/UserVmCloneSettingVO.java | 0 .../java}/com/cloud/vm/UserVmDetailVO.java | 0 .../java}/com/cloud/vm/UserVmVO.java | 0 .../java}/com/cloud/vm/VMInstanceVO.java | 0 .../com/cloud/vm/dao/ConsoleProxyDao.java | 0 .../com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 0 .../com/cloud/vm/dao/DomainRouterDao.java | 0 .../com/cloud/vm/dao/DomainRouterDaoImpl.java | 0 .../com/cloud/vm/dao/InstanceGroupDao.java | 0 .../cloud/vm/dao/InstanceGroupDaoImpl.java | 0 .../cloud/vm/dao/InstanceGroupVMMapDao.java | 0 .../vm/dao/InstanceGroupVMMapDaoImpl.java | 0 .../java}/com/cloud/vm/dao/NicDao.java | 0 .../java}/com/cloud/vm/dao/NicDaoImpl.java | 0 .../java}/com/cloud/vm/dao/NicDetailsDao.java | 0 .../com/cloud/vm/dao/NicDetailsDaoImpl.java | 0 .../cloud/vm/dao/NicExtraDhcpOptionDao.java | 0 .../vm/dao/NicExtraDhcpOptionDaoImpl.java | 0 .../java}/com/cloud/vm/dao/NicIpAliasDao.java | 0 .../com/cloud/vm/dao/NicIpAliasDaoImpl.java | 0 .../java}/com/cloud/vm/dao/NicIpAliasVO.java | 0 .../com/cloud/vm/dao/NicSecondaryIpDao.java | 0 .../cloud/vm/dao/NicSecondaryIpDaoImpl.java | 0 .../com/cloud/vm/dao/NicSecondaryIpVO.java | 0 .../cloud/vm/dao/SecondaryStorageVmDao.java | 0 .../vm/dao/SecondaryStorageVmDaoImpl.java | 0 .../cloud/vm/dao/UserVmCloneSettingDao.java | 0 .../vm/dao/UserVmCloneSettingDaoImpl.java | 0 .../java}/com/cloud/vm/dao/UserVmDao.java | 0 .../java}/com/cloud/vm/dao/UserVmDaoImpl.java | 0 .../java}/com/cloud/vm/dao/UserVmData.java | 0 .../com/cloud/vm/dao/UserVmDetailsDao.java | 0 .../cloud/vm/dao/UserVmDetailsDaoImpl.java | 0 .../java}/com/cloud/vm/dao/VMInstanceDao.java | 0 .../com/cloud/vm/dao/VMInstanceDaoImpl.java | 0 .../vm/snapshot/VMSnapshotDetailsVO.java | 0 .../com/cloud/vm/snapshot/VMSnapshotVO.java | 0 .../cloud/vm/snapshot/dao/VMSnapshotDao.java | 0 .../vm/snapshot/dao/VMSnapshotDaoImpl.java | 0 .../vm/snapshot/dao/VMSnapshotDetailsDao.java | 0 .../dao/VMSnapshotDetailsDaoImpl.java | 0 .../cloudstack/acl/RolePermissionVO.java | 0 .../org/apache/cloudstack/acl/RoleVO.java | 0 .../apache/cloudstack/acl/dao/RoleDao.java | 0 .../cloudstack/acl/dao/RoleDaoImpl.java | 0 .../acl/dao/RolePermissionsDao.java | 0 .../acl/dao/RolePermissionsDaoImpl.java | 0 .../affinity/AffinityGroupDomainMapVO.java | 0 .../affinity/AffinityGroupVMMapVO.java | 0 .../cloudstack/affinity/AffinityGroupVO.java | 0 .../affinity/dao/AffinityGroupDao.java | 0 .../affinity/dao/AffinityGroupDaoImpl.java | 0 .../dao/AffinityGroupDomainMapDao.java | 0 .../dao/AffinityGroupDomainMapDaoImpl.java | 0 .../affinity/dao/AffinityGroupVMMapDao.java | 0 .../dao/AffinityGroupVMMapDaoImpl.java | 0 .../cloudstack/annotation/AnnotationVO.java | 0 .../annotation/dao/AnnotationDao.java | 0 .../annotation/dao/AnnotationDaoImpl.java | 0 .../cloud/entity/api/db/VMComputeTagVO.java | 0 .../cloud/entity/api/db/VMEntityVO.java | 0 .../cloud/entity/api/db/VMNetworkMapVO.java | 0 .../cloud/entity/api/db/VMReservationVO.java | 0 .../cloud/entity/api/db/VMRootDiskTagVO.java | 0 .../entity/api/db/VolumeReservationVO.java | 0 .../entity/api/db/dao/VMComputeTagDao.java | 0 .../api/db/dao/VMComputeTagDaoImpl.java | 0 .../cloud/entity/api/db/dao/VMEntityDao.java | 0 .../entity/api/db/dao/VMEntityDaoImpl.java | 0 .../entity/api/db/dao/VMNetworkMapDao.java | 0 .../api/db/dao/VMNetworkMapDaoImpl.java | 0 .../entity/api/db/dao/VMReservationDao.java | 0 .../api/db/dao/VMReservationDaoImpl.java | 0 .../entity/api/db/dao/VMRootDiskTagDao.java | 0 .../api/db/dao/VMRootDiskTagDaoImpl.java | 0 .../api/db/dao/VolumeReservationDao.java | 0 .../api/db/dao/VolumeReservationDaoImpl.java | 0 .../org/apache/cloudstack/ha/HAConfigVO.java | 0 .../apache/cloudstack/ha/dao/HAConfigDao.java | 0 .../cloudstack/ha/dao/HAConfigDaoImpl.java | 0 .../lb/ApplicationLoadBalancerRuleVO.java | 0 .../dao/ApplicationLoadBalancerRuleDao.java | 0 .../ApplicationLoadBalancerRuleDaoImpl.java | 0 .../OutOfBandManagementVO.java | 0 .../dao/OutOfBandManagementDao.java | 0 .../dao/OutOfBandManagementDaoImpl.java | 0 .../cloudstack/region/PortableIpDao.java | 0 .../cloudstack/region/PortableIpDaoImpl.java | 0 .../cloudstack/region/PortableIpRangeDao.java | 0 .../region/PortableIpRangeDaoImpl.java | 0 .../cloudstack/region/PortableIpRangeVO.java | 0 .../cloudstack/region/PortableIpVO.java | 0 .../cloudstack/region/RegionSyncVO.java | 0 .../apache/cloudstack/region/RegionVO.java | 0 .../cloudstack/region/dao/RegionDao.java | 0 .../cloudstack/region/dao/RegionDaoImpl.java | 0 .../gslb/GlobalLoadBalancerDaoImpl.java | 0 .../gslb/GlobalLoadBalancerLbRuleMapDao.java | 0 .../GlobalLoadBalancerLbRuleMapDaoImpl.java | 0 .../gslb/GlobalLoadBalancerLbRuleMapVO.java | 0 .../gslb/GlobalLoadBalancerRuleDao.java | 0 .../region/gslb/GlobalLoadBalancerRuleVO.java | 0 .../AutoScaleVmGroupDetailVO.java | 0 .../AutoScaleVmProfileDetailVO.java | 0 .../resourcedetail/DiskOfferingDetailVO.java | 0 .../resourcedetail/FirewallRuleDetailVO.java | 0 .../resourcedetail/GuestOsDetailVO.java | 0 .../LBHealthCheckPolicyDetailVO.java | 0 .../LBStickinessPolicyDetailVO.java | 0 .../NetworkACLItemDetailVO.java | 0 .../NetworkACLListDetailVO.java | 0 .../RemoteAccessVpnDetailVO.java | 0 .../resourcedetail/ResourceDetailsDao.java | 0 .../ResourceDetailsDaoBase.java | 0 .../Site2SiteCustomerGatewayDetailVO.java | 0 .../Site2SiteVpnConnectionDetailVO.java | 0 .../Site2SiteVpnGatewayDetailVO.java | 0 .../SnapshotPolicyDetailVO.java | 0 .../resourcedetail/UserDetailVO.java | 0 .../resourcedetail/UserIpAddressDetailVO.java | 0 .../resourcedetail/VpcDetailVO.java | 0 .../resourcedetail/VpcGatewayDetailVO.java | 0 .../dao/AutoScaleVmGroupDetailsDao.java | 0 .../dao/AutoScaleVmGroupDetailsDaoImpl.java | 0 .../dao/AutoScaleVmProfileDetailsDao.java | 0 .../dao/AutoScaleVmProfileDetailsDaoImpl.java | 0 .../dao/DiskOfferingDetailsDao.java | 0 .../dao/DiskOfferingDetailsDaoImpl.java | 0 .../dao/FirewallRuleDetailsDao.java | 0 .../dao/FirewallRuleDetailsDaoImpl.java | 0 .../resourcedetail/dao/GuestOsDetailsDao.java | 0 .../dao/GuestOsDetailsDaoImpl.java | 0 .../dao/LBHealthCheckPolicyDetailsDao.java | 0 .../LBHealthCheckPolicyDetailsDaoImpl.java | 0 .../dao/LBStickinessPolicyDetailsDao.java | 0 .../dao/LBStickinessPolicyDetailsDaoImpl.java | 0 .../dao/NetworkACLItemDetailsDao.java | 0 .../dao/NetworkACLItemDetailsDaoImpl.java | 0 .../dao/NetworkACLListDetailsDao.java | 0 .../dao/NetworkACLListDetailsDaoImpl.java | 0 .../dao/RemoteAccessVpnDetailsDao.java | 0 .../dao/RemoteAccessVpnDetailsDaoImpl.java | 0 .../Site2SiteCustomerGatewayDetailsDao.java | 0 ...ite2SiteCustomerGatewayDetailsDaoImpl.java | 0 .../dao/Site2SiteVpnConnectionDetailsDao.java | 0 .../Site2SiteVpnConnectionDetailsDaoImpl.java | 0 .../dao/Site2SiteVpnGatewayDetailsDao.java | 0 .../Site2SiteVpnGatewayDetailsDaoImpl.java | 0 .../dao/SnapshotPolicyDetailsDao.java | 0 .../dao/SnapshotPolicyDetailsDaoImpl.java | 0 .../resourcedetail/dao/UserDetailsDao.java | 0 .../dao/UserDetailsDaoImpl.java | 0 .../dao/UserIpAddressDetailsDao.java | 0 .../dao/UserIpAddressDetailsDaoImpl.java | 0 .../resourcedetail/dao/VpcDetailsDao.java | 0 .../resourcedetail/dao/VpcDetailsDaoImpl.java | 0 .../dao/VpcGatewayDetailsDao.java | 0 .../dao/VpcGatewayDetailsDaoImpl.java | 0 .../storage/datastore/db/ImageStoreDao.java | 0 .../datastore/db/ImageStoreDaoImpl.java | 0 .../datastore/db/ImageStoreDetailVO.java | 0 .../datastore/db/ImageStoreDetailsDao.java | 0 .../db/ImageStoreDetailsDaoImpl.java | 0 .../storage/datastore/db/ImageStoreVO.java | 0 .../datastore/db/PrimaryDataStoreDao.java | 0 .../datastore/db/PrimaryDataStoreDaoImpl.java | 0 .../db/PrimaryDataStoreDetailVO.java | 0 .../db/PrimaryDataStoreDetailsDao.java | 0 .../datastore/db/SnapshotDataStoreDao.java | 0 .../datastore/db/SnapshotDataStoreVO.java | 0 .../datastore/db/StoragePoolDetailVO.java | 0 .../datastore/db/StoragePoolDetailsDao.java | 0 .../storage/datastore/db/StoragePoolVO.java | 0 .../datastore/db/TemplateDataStoreDao.java | 0 .../datastore/db/TemplateDataStoreVO.java | 0 .../datastore/db/VolumeDataStoreDao.java | 0 .../datastore/db/VolumeDataStoreVO.java | 0 ...spring-engine-schema-core-daos-context.xml | 0 ...-engine-schema-system-checkers-context.xml | 0 .../db/create-default-role-api-mappings.sql | 0 .../resources/META-INF/db/data-217to218.sql | 0 .../resources/META-INF/db/schema-20to21.sql | 0 .../resources/META-INF/db/schema-217to218.sql | 0 .../META-INF/db/schema-21to22-cleanup.sql | 0 .../META-INF/db/schema-21to22-premium.sql | 0 .../resources/META-INF/db/schema-21to22.sql | 0 .../META-INF/db/schema-2210to2211.sql | 0 .../META-INF/db/schema-2211to2212-premium.sql | 0 .../META-INF/db/schema-2211to2212.sql | 0 .../META-INF/db/schema-2212to2213.sql | 0 .../META-INF/db/schema-2213to2214.sql | 0 .../META-INF/db/schema-2214to30-cleanup.sql | 0 .../resources/META-INF/db/schema-2214to30.sql | 0 .../META-INF/db/schema-221to222-cleanup.sql | 0 .../META-INF/db/schema-221to222-premium.sql | 0 .../resources/META-INF/db/schema-221to222.sql | 0 .../META-INF/db/schema-222to224-cleanup.sql | 0 .../META-INF/db/schema-222to224-premium.sql | 0 .../resources/META-INF/db/schema-222to224.sql | 0 .../META-INF/db/schema-224to225-cleanup.sql | 0 .../resources/META-INF/db/schema-224to225.sql | 0 .../resources/META-INF/db/schema-225to226.sql | 0 .../META-INF/db/schema-227to228-premium.sql | 0 .../resources/META-INF/db/schema-227to228.sql | 0 .../resources/META-INF/db/schema-228to229.sql | 0 .../META-INF/db/schema-229to2210.sql | 0 .../META-INF/db/schema-22beta1to22beta2.sql | 0 .../META-INF/db/schema-22beta3to22beta4.sql | 0 .../META-INF/db/schema-301to302-cleanup.sql | 0 .../resources/META-INF/db/schema-301to302.sql | 0 .../resources/META-INF/db/schema-302to303.sql | 0 .../META-INF/db/schema-302to40-cleanup.sql | 0 .../resources/META-INF/db/schema-302to40.sql | 0 .../META-INF/db/schema-304to305-cleanup.sql | 0 .../resources/META-INF/db/schema-304to305.sql | 0 .../META-INF/db/schema-305to306-cleanup.sql | 0 .../resources/META-INF/db/schema-305to306.sql | 0 .../resources/META-INF/db/schema-306to307.sql | 0 .../META-INF/db/schema-307to410-cleanup.sql | 0 .../resources/META-INF/db/schema-307to410.sql | 0 .../resources/META-INF/db/schema-30to301.sql | 0 .../META-INF/db/schema-40to410-cleanup.sql | 0 .../resources/META-INF/db/schema-40to410.sql | 0 .../db/schema-41000to41100-cleanup.sql | 0 .../META-INF/db/schema-41000to41100.sql | 0 .../META-INF/db/schema-410to420-cleanup.sql | 0 .../resources/META-INF/db/schema-410to420.sql | 0 .../resources/META-INF/db/schema-420to421.sql | 0 .../META-INF/db/schema-421to430-cleanup.sql | 0 .../resources/META-INF/db/schema-421to430.sql | 0 .../META-INF/db/schema-430to440-cleanup.sql | 0 .../resources/META-INF/db/schema-430to440.sql | 0 .../META-INF/db/schema-440to441-cleanup.sql | 0 .../resources/META-INF/db/schema-440to441.sql | 0 .../resources/META-INF/db/schema-441to442.sql | 0 .../META-INF/db/schema-442to450-cleanup.sql | 0 .../resources/META-INF/db/schema-442to450.sql | 0 .../resources/META-INF/db/schema-443to444.sql | 0 .../META-INF/db/schema-450to451-cleanup.sql | 0 .../resources/META-INF/db/schema-450to451.sql | 0 .../META-INF/db/schema-451to452-cleanup.sql | 0 .../resources/META-INF/db/schema-451to452.sql | 0 .../META-INF/db/schema-452to453-cleanup.sql | 0 .../resources/META-INF/db/schema-452to453.sql | 0 .../META-INF/db/schema-452to460-cleanup.sql | 0 .../resources/META-INF/db/schema-452to460.sql | 0 .../META-INF/db/schema-460to461-cleanup.sql | 0 .../resources/META-INF/db/schema-460to461.sql | 0 .../META-INF/db/schema-461to470-cleanup.sql | 0 .../resources/META-INF/db/schema-461to470.sql | 0 .../META-INF/db/schema-470to471-cleanup.sql | 0 .../resources/META-INF/db/schema-470to471.sql | 0 .../META-INF/db/schema-471to480-cleanup.sql | 0 .../resources/META-INF/db/schema-471to480.sql | 0 .../META-INF/db/schema-480to481-cleanup.sql | 0 .../resources/META-INF/db/schema-480to481.sql | 0 .../META-INF/db/schema-481to490-cleanup.sql | 0 .../resources/META-INF/db/schema-481to490.sql | 0 .../META-INF/db/schema-490to4910-cleanup.sql | 0 .../META-INF/db/schema-490to4910.sql | 0 .../META-INF/db/schema-4910to4920-cleanup.sql | 0 .../META-INF/db/schema-4910to4920.sql | 0 .../META-INF/db/schema-4920to4930-cleanup.sql | 0 .../META-INF/db/schema-4920to4930.sql | 0 .../db/schema-4930to41000-cleanup.sql | 0 .../META-INF/db/schema-4930to41000.sql | 0 .../resources/META-INF/db/schema-level.sql | 0 .../META-INF/db/schema-snapshot-217to224.sql | 0 .../META-INF/db/schema-snapshot-223to224.sql | 0 .../dao/StoragePoolTagsDaoImplTest.java | 0 .../upgrade/DatabaseUpgradeCheckerTest.java | 0 .../upgrade/dao/DatabaseAccessObjectTest.java | 0 .../cloud/upgrade/dao/DbUpgradeUtilsTest.java | 0 .../usage/dao/UsageStorageDaoImplTest.java | 0 .../cloud/vm/dao/VMInstanceDaoImplTest.java | 0 .../db/PrimaryDataStoreDaoImplTest.java | 0 .../{ => src}/test/resources/db.properties | 0 .../allocator/StorageCacheAllocator.java | 0 .../StorageCacheRandomAllocator.java | 0 .../manager/StorageCacheManagerImpl.java | 0 .../StorageCacheReplacementAlgorithm.java | 0 .../StorageCacheReplacementAlgorithmLRU.java | 0 ...ring-engine-storage-cache-core-context.xml | 0 .../motion/AncientDataMotionStrategy.java | 0 .../storage/motion/DataMotionServiceImpl.java | 0 .../StorageSystemDataMotionStrategy.java | 0 ...engine-storage-datamotion-core-context.xml | 0 ...ine-storage-datamotion-storage-context.xml | 0 .../motion/AncientDataMotionStrategyTest.java | 0 .../image/TemplateDataFactoryImpl.java | 0 .../storage/image/TemplateServiceImpl.java | 0 .../ImageStoreProviderManagerImpl.java | 0 .../storage/image/store/ImageStoreImpl.java | 0 .../storage/image/store/TemplateObject.java | 0 .../store/lifecycle/ImageStoreLifeCycle.java | 0 ...ring-engine-storage-image-core-context.xml | 0 .../vm/snapshot/dao/VmSnapshotDaoTest.java | 0 .../MockLocalNfsSecondaryStorageResource.java | 0 .../allocator/StorageAllocatorTest.java | 0 .../StorageAllocatorTestConfiguration.java | 0 ...orageCacheReplacementAlgorithmLRUTest.java | 0 .../cloudstack/storage/test/AllTests.java | 0 .../cloudstack/storage/test/AopTest.java | 0 .../storage/test/AopTestAdvice.java | 0 .../storage/test/ChildTestConfiguration.java | 0 .../storage/test/CloudStackTestNGBase.java | 0 .../test/DirectAgentManagerSimpleImpl.java | 0 .../storage/test/DirectAgentTest.java | 0 .../storage/test/EndpointSelectorTest.java | 0 .../test/FakeDriverTestConfiguration.java | 0 .../test/FakePrimaryDataStoreDriver.java | 0 .../storage/test/MockLocalHostEndPoint.java | 0 .../storage/test/MockRpcCallBack.java | 0 .../test/MockStorageMotionStrategy.java | 0 .../storage/test/S3TemplateTest.java | 0 .../cloudstack/storage/test/SnapshotTest.java | 0 .../test/SnapshotTestWithFakeData.java | 0 .../storage/test/StorageFactoryBean.java | 0 .../cloudstack/storage/test/StorageTest.java | 0 .../cloudstack/storage/test/TemplateTest.java | 0 .../storage/test/TestConfiguration.java | 0 .../cloudstack/storage/test/TestHttp.java | 0 .../cloudstack/storage/test/TestNG.java | 0 .../cloudstack/storage/test/TestNGAop.java | 0 .../storage/test/VolumeServiceTest.java | 0 .../cloudstack/storage/test/VolumeTest.java | 0 .../storage/test/VolumeTestVmware.java | 0 .../cloudstack/storage/test/XenEndpoint.java | 0 .../resources/StorageAllocatorTestContext.xml | 0 .../{ => src}/test/resources/component.xml | 0 .../test/resources}/fakeDriverTestContext.xml | 0 .../{ => src}/test/resources/s3_testng.xml | 0 .../test/resources/storageContext.xml | 0 .../{ => src}/test/resources/testng.xml | 0 .../snapshot/SnapshotBackupException.java | 0 .../snapshot/SnapshotDataFactoryImpl.java | 0 .../storage/snapshot/SnapshotObject.java | 0 .../storage/snapshot/SnapshotServiceImpl.java | 0 .../snapshot/SnapshotStateMachineManager.java | 0 .../SnapshotStateMachineManagerImpl.java | 0 .../snapshot/SnapshotStrategyBase.java | 0 .../StorageSystemSnapshotStrategy.java | 0 .../snapshot/XenserverSnapshotStrategy.java | 0 .../vmsnapshot/DefaultVMSnapshotStrategy.java | 0 ...g-engine-storage-snapshot-core-context.xml | 0 ...ngine-storage-snapshot-storage-context.xml | 0 .../java}/src/SnapshotDataFactoryTest.java | 0 .../java}/src/VMSnapshotStrategyTest.java | 0 .../resources/SnapshotManagerTestContext.xml | 0 .../{ => src}/test/resources/db.properties | 0 .../apache/cloudstack/storage/BaseType.java | 0 .../apache/cloudstack/storage/EndPoint.java | 0 .../cloudstack/storage/LocalHostEndpoint.java | 0 .../storage/RemoteHostEndPoint.java | 0 .../AbstractStoragePoolAllocator.java | 0 .../ClusterScopeStoragePoolAllocator.java | 0 ...GarbageCollectingStoragePoolAllocator.java | 0 .../allocator/LocalStoragePoolAllocator.java | 0 .../allocator/UseLocalForRootAllocator.java | 0 .../ZoneWideStoragePoolAllocator.java | 0 .../backup/SnapshotOnBackupStoreInfo.java | 0 .../backup/datastore/BackupStoreInfo.java | 0 .../storage/datastore/DataObjectManager.java | 0 .../datastore/DataObjectManagerImpl.java | 0 .../storage/datastore/DataStore.java | 0 .../datastore/DataStoreManagerImpl.java | 0 .../datastore/ObjectInDataStoreManager.java | 0 .../ObjectInDataStoreManagerImpl.java | 0 .../PrimaryDataStoreProviderManager.java | 0 .../datastore/TemplateInDataStore.java | 0 .../datastore/protocol/DataStoreProtocol.java | 0 .../DataStoreProviderManagerImpl.java | 0 .../storage/db/ObjectInDataStoreDao.java | 0 .../storage/db/ObjectInDataStoreDaoImpl.java | 0 .../storage/db/ObjectInDataStoreVO.java | 0 .../endpoint/DefaultEndPointSelector.java | 0 .../storage/helper/HypervisorHelper.java | 0 .../storage/helper/HypervisorHelperImpl.java | 0 .../helper/StorageStrategyFactoryImpl.java | 0 .../storage/helper/VMSnapshotHelperImpl.java | 0 .../image/BaseImageStoreDriverImpl.java | 0 .../storage/image/ImageStoreDriver.java | 0 .../image/NfsImageStoreDriverImpl.java | 0 .../storage/image/TemplateEntityImpl.java | 0 .../image/datastore/ImageStoreHelper.java | 0 .../datastore/ImageStoreProviderManager.java | 0 .../image/db/SnapshotDataStoreDaoImpl.java | 0 .../image/db/TemplateDataStoreDaoImpl.java | 0 .../image/db/VolumeDataStoreDaoImpl.java | 0 .../storage/image/format/BAREMETAL.java | 0 .../cloudstack/storage/image/format/ISO.java | 0 .../storage/image/format/ImageFormat.java | 0 .../image/format/ImageFormatHelper.java | 0 .../cloudstack/storage/image/format/OVA.java | 0 .../storage/image/format/QCOW2.java | 0 .../cloudstack/storage/image/format/RAW.java | 0 .../storage/image/format/Unknown.java | 0 .../cloudstack/storage/image/format/VHD.java | 0 .../cloudstack/storage/image/format/VHDX.java | 0 .../image/motion/ImageMotionService.java | 0 .../storage/snapshot/SnapshotEntityImpl.java | 0 .../storage/vmsnapshot/VMSnapshotHelper.java | 0 .../TemplateOnPrimaryDataStoreInfo.java | 0 .../storage/volume/VolumeEvent.java | 0 .../datastore/PrimaryDataStoreHelper.java | 0 .../db/PrimaryDataStoreDetailsDaoImpl.java | 0 .../spring-engine-storage-core-context.xml | 0 .../storage-allocator/module.properties | 0 ...gine-storage-storage-allocator-context.xml | 0 .../api/storage/StrategyPriorityTest.java | 0 .../cloudstack/storage/BaseTypeTest.java | 0 engine/storage/storage.ucls | 38 ++++---- .../datastore/PrimaryDataStoreImpl.java | 0 .../PrimaryDataStoreProviderManagerImpl.java | 0 .../storage/datastore/manager/data model.ucls | 8 +- .../provider/DefaultHostListener.java | 0 .../storage/datastore/type/DataStoreType.java | 0 .../storage/datastore/type/ISCSI.java | 0 .../datastore/type/NetworkFileSystem.java | 0 .../storage/datastore/type/SharedMount.java | 0 .../storage/volume/VolumeDataFactoryImpl.java | 0 .../storage/volume/VolumeObject.java | 0 .../storage/volume/VolumeServiceImpl.java | 0 ...ing-engine-storage-volume-core-context.xml | 0 .../storage/volume/VolumeObjectTest.java | 0 .../storage/volume/test/ConfiguratorTest.java | 0 .../storage/volume/test/Server.java | 0 .../storage/volume/test/Server1.java | 0 .../volume/test/TestConfiguration.java | 0 .../volume/test/TestInProcessAsync.java | 0 .../{ => src}/test/resource/testContext.xml | 0 .../cloudstack/framework/ca/CAProvider.java | 0 .../cloudstack/framework/ca/CAService.java | 0 .../cloudstack/framework/ca/Certificate.java | 0 .../cloud/cluster/ActiveFencingException.java | 0 .../cloud/cluster/ClusterFenceManager.java | 0 .../cluster/ClusterFenceManagerImpl.java | 0 .../ClusterInvalidSessionException.java | 0 .../com/cloud/cluster/ClusterManager.java | 0 .../com/cloud/cluster/ClusterManagerImpl.java | 0 .../cloud/cluster/ClusterManagerListener.java | 0 .../cloud/cluster/ClusterManagerMBean.java | 0 .../cluster/ClusterManagerMBeanImpl.java | 0 .../cloud/cluster/ClusterManagerMessage.java | 0 .../cluster/ClusterNodeJoinEventArgs.java | 0 .../cluster/ClusterNodeLeftEventArgs.java | 0 .../com/cloud/cluster/ClusterService.java | 0 .../cloud/cluster/ClusterServiceAdapter.java | 0 .../com/cloud/cluster/ClusterServicePdu.java | 0 .../cluster/ClusterServiceRequestPdu.java | 0 .../cluster/ClusterServiceServletAdapter.java | 0 .../ClusterServiceServletContainer.java | 0 .../ClusterServiceServletHttpHandler.java | 0 .../cluster/ClusterServiceServletImpl.java | 0 .../cloud/cluster/ManagementServerHost.java | 0 .../cluster/ManagementServerHostPeerVO.java | 0 .../cloud/cluster/ManagementServerHostVO.java | 0 .../cloud/cluster/RemoteMethodConstants.java | 0 .../cluster/dao/ManagementServerHostDao.java | 0 .../dao/ManagementServerHostDaoImpl.java | 0 .../dao/ManagementServerHostPeerDao.java | 0 .../dao/ManagementServerHostPeerDaoImpl.java | 0 .../spring-framework-cluster-core-context.xml | 0 .../ClusterServiceServletAdapterTest.java | 0 .../cloudstack/config/Configuration.java | 0 .../framework/config/ConfigDepot.java | 0 .../framework/config/ConfigDepotAdmin.java | 0 .../framework/config/ConfigKey.java | 0 .../framework/config/Configurable.java | 0 .../framework/config/ScopedConfigStorage.java | 0 .../config/dao/ConfigurationDao.java | 0 .../config/dao/ConfigurationDaoImpl.java | 0 .../config/impl/ConfigDepotImpl.java | 0 .../config/impl/ConfigurationVO.java | 0 ...work-config-system-context-inheritable.xml | 0 ...spring-framework-config-system-context.xml | 0 .../framework/config/ConfigKeyTest.java | 0 .../config/impl/ConfigDepotAdminTest.java | 0 .../com/cloud/dao/EntityManagerImpl.java | 0 .../crypt/EncryptionSecretKeyChanger.java | 0 .../java}/com/cloud/utils/db/Attribute.java | 0 .../cloud/utils/db/ConnectionConcierge.java | 0 .../utils/db/ConnectionConciergeMBean.java | 0 .../java}/com/cloud/utils/db/DB.java | 0 .../java}/com/cloud/utils/db/DbUtil.java | 0 .../com/cloud/utils/db/DriverLoader.java | 0 .../java}/com/cloud/utils/db/EcInfo.java | 0 .../java}/com/cloud/utils/db/Encrypt.java | 0 .../java}/com/cloud/utils/db/Filter.java | 0 .../java}/com/cloud/utils/db/GenericDao.java | 0 .../com/cloud/utils/db/GenericDaoBase.java | 0 .../cloud/utils/db/GenericQueryBuilder.java | 0 .../cloud/utils/db/GenericSearchBuilder.java | 0 .../java}/com/cloud/utils/db/GlobalLock.java | 0 .../java}/com/cloud/utils/db/GroupBy.java | 0 .../java}/com/cloud/utils/db/JoinBuilder.java | 0 .../java}/com/cloud/utils/db/JoinType.java | 0 .../com/cloud/utils/db/Merovingian2.java | 0 .../com/cloud/utils/db/MerovingianMBean.java | 0 .../com/cloud/utils/db/QueryBuilder.java | 0 .../com/cloud/utils/db/ScriptRunner.java | 0 .../java}/com/cloud/utils/db/SearchBase.java | 0 .../com/cloud/utils/db/SearchBuilder.java | 0 .../com/cloud/utils/db/SearchCriteria.java | 0 .../com/cloud/utils/db/SequenceFetcher.java | 0 .../com/cloud/utils/db/SqlGenerator.java | 0 .../com/cloud/utils/db/StateMachine.java | 0 .../java}/com/cloud/utils/db/Transaction.java | 0 .../cloud/utils/db/TransactionAttachment.java | 0 .../cloud/utils/db/TransactionCallback.java | 0 .../utils/db/TransactionCallbackNoReturn.java | 0 .../db/TransactionCallbackWithException.java | 0 ...nsactionCallbackWithExceptionNoReturn.java | 0 .../utils/db/TransactionContextBuilder.java | 0 .../db/TransactionContextInterceptor.java | 0 .../utils/db/TransactionContextListener.java | 0 .../com/cloud/utils/db/TransactionLegacy.java | 0 .../com/cloud/utils/db/TransactionMBean.java | 0 .../cloud/utils/db/TransactionMBeanImpl.java | 0 .../com/cloud/utils/db/TransactionStatus.java | 0 .../com/cloud/utils/db/UpdateBuilder.java | 0 .../com/cloud/utils/db/UpdateFilter.java | 0 .../spring-framework-db-system-context.xml | 0 framework/db/{ => src}/test/db.properties | 0 .../java}/com/cloud/utils/DbUtilTest.java | 0 .../com/cloud/utils/db/DbAnnotatedBase.java | 0 .../utils/db/DbAnnotatedBaseDerived.java | 0 .../java}/com/cloud/utils/db/DbTestDao.java | 0 .../java}/com/cloud/utils/db/DbTestUtils.java | 0 .../java}/com/cloud/utils/db/DbTestVO.java | 0 .../com/cloud/utils/db/DummyComponent.java | 0 .../cloud/utils/db/ElementCollectionTest.java | 0 .../java}/com/cloud/utils/db/FilterTest.java | 0 .../cloud/utils/db/GenericDaoBaseTest.java | 0 .../com/cloud/utils/db/GlobalLockTest.java | 0 .../java}/com/cloud/utils/db/GroupByTest.java | 0 .../com/cloud/utils/db/Merovingian2Test.java | 0 .../com/cloud/utils/db/TestTransaction.java | 0 .../db/TransactionContextBuilderTest.java | 0 .../db/{ => src}/test/resources/db.properties | 0 .../download/DirectDownloadService.java | 0 .../cloudstack/framework/events/Event.java | 0 .../cloudstack/framework/events/EventBus.java | 0 .../framework/events/EventBusException.java | 0 .../framework/events/EventSubscriber.java | 0 .../framework/events/EventTopic.java | 0 .../com/cloud/agent/manager/Commands.java | 0 .../framework/async/AsyncCallFuture.java | 0 .../async/AsyncCallbackDispatcher.java | 0 .../framework/async/AsyncCallbackDriver.java | 0 .../async/AsyncCompletionCallback.java | 0 .../framework/async/AsyncRpcContext.java | 0 .../async/InplaceAsyncCallbackDriver.java | 0 .../framework/client/ClientMessageBus.java | 0 .../client/ClientTransportConnection.java | 0 .../client/ClientTransportEndpoint.java | 0 .../client/ClientTransportEndpointSite.java | 0 .../client/ClientTransportProvider.java | 0 .../framework/messagebus/MessageBus.java | 0 .../framework/messagebus/MessageBusBase.java | 0 .../messagebus/MessageBusEndpoint.java | 0 .../framework/messagebus/MessageDetector.java | 0 .../messagebus/MessageDispatcher.java | 0 .../framework/messagebus/MessageHandler.java | 0 .../messagebus/MessageSubscriber.java | 0 .../framework/messagebus/PublishScope.java | 0 .../framework/rpc/RpcCallRequestPdu.java | 0 .../framework/rpc/RpcCallResponsePdu.java | 0 .../framework/rpc/RpcCallbackDispatcher.java | 0 .../framework/rpc/RpcCallbackListener.java | 0 .../framework/rpc/RpcClientCall.java | 0 .../framework/rpc/RpcClientCallImpl.java | 0 .../framework/rpc/RpcException.java | 0 .../framework/rpc/RpcIOException.java | 0 .../cloudstack/framework/rpc/RpcProvider.java | 0 .../framework/rpc/RpcProviderImpl.java | 0 .../framework/rpc/RpcServerCall.java | 0 .../framework/rpc/RpcServerCallImpl.java | 0 .../framework/rpc/RpcServiceDispatcher.java | 0 .../framework/rpc/RpcServiceEndpoint.java | 0 .../framework/rpc/RpcServiceHandler.java | 0 .../framework/rpc/RpcTimeoutException.java | 0 .../serializer/JsonMessageSerializer.java | 0 .../serializer/MessageSerializer.java | 0 .../serializer/OnwireClassRegistry.java | 0 .../framework/serializer/OnwireName.java | 0 .../framework/server/ServerMessageBus.java | 0 .../server/ServerTransportProvider.java | 0 .../framework/transport/TransportAddress.java | 0 .../transport/TransportAddressMapper.java | 0 .../transport/TransportAttachRequestPdu.java | 0 .../transport/TransportAttachResponsePdu.java | 0 .../transport/TransportConnectRequestPdu.java | 0 .../TransportConnectResponsePdu.java | 0 .../framework/transport/TransportDataPdu.java | 0 .../transport/TransportEndpoint.java | 0 .../transport/TransportEndpointSite.java | 0 .../transport/TransportMultiplexier.java | 0 .../framework/transport/TransportPdu.java | 0 .../transport/TransportProvider.java | 0 .../spring-framework-ipc-core-context.xml | 0 .../codestyle/AsyncSampleCallee.java | 0 .../AsyncSampleEventDrivenStyleCaller.java | 0 .../AsyncSampleListenerStyleCaller.java | 0 .../sampleserver/SampleManagementServer.java | 0 .../SampleManagementServerApp.java | 0 .../sampleserver/SampleManagerComponent.java | 0 .../sampleserver/SampleManagerComponent2.java | 0 .../SampleStoragePrepareAnswer.java | 0 .../SampleStoragePrepareCommand.java | 0 .../cloudstack/messagebus/TestMessageBus.java | 0 .../test/resources/MessageBusTestContext.xml | 0 .../SampleManagementServerAppContext.xml | 0 .../{ => src}/test/resources/log4j-cloud.xml | 0 .../cloudstack/framework/jobs/AsyncJob.java | 0 .../framework/jobs/AsyncJobDispatcher.java | 0 .../jobs/AsyncJobExecutionContext.java | 0 .../framework/jobs/AsyncJobMBean.java | 0 .../framework/jobs/AsyncJobManager.java | 0 .../cloudstack/framework/jobs/Outcome.java | 0 .../framework/jobs/dao/AsyncJobDao.java | 0 .../framework/jobs/dao/AsyncJobDaoImpl.java | 0 .../jobs/dao/AsyncJobJoinMapDao.java | 0 .../jobs/dao/AsyncJobJoinMapDaoImpl.java | 0 .../jobs/dao/AsyncJobJournalDao.java | 0 .../jobs/dao/AsyncJobJournalDaoImpl.java | 0 .../framework/jobs/dao/SyncQueueDao.java | 0 .../framework/jobs/dao/SyncQueueDaoImpl.java | 0 .../framework/jobs/dao/SyncQueueItemDao.java | 0 .../jobs/dao/SyncQueueItemDaoImpl.java | 0 .../framework/jobs/dao/VmWorkJobDao.java | 0 .../framework/jobs/dao/VmWorkJobDaoImpl.java | 0 .../jobs/impl/AsyncJobJoinMapVO.java | 0 .../jobs/impl/AsyncJobJournalVO.java | 0 .../jobs/impl/AsyncJobMBeanImpl.java | 0 .../jobs/impl/AsyncJobManagerImpl.java | 0 .../framework/jobs/impl/AsyncJobMonitor.java | 0 .../framework/jobs/impl/AsyncJobVO.java | 0 .../jobs/impl/JobSerializerHelper.java | 0 .../framework/jobs/impl/OutcomeImpl.java | 0 .../framework/jobs/impl/SyncQueueItem.java | 0 .../framework/jobs/impl/SyncQueueItemVO.java | 0 .../framework/jobs/impl/SyncQueueManager.java | 0 .../jobs/impl/SyncQueueManagerImpl.java | 0 .../framework/jobs/impl/SyncQueueVO.java | 0 .../framework/jobs/impl/VmWorkJobVO.java | 0 .../spring-framework-jobs-core-context.xml | 0 .../framework/jobs/AsyncJobManagerTest.java | 0 .../AsyncJobManagerTestConfiguration.java | 0 .../framework/jobs/AsyncJobTestDashboard.java | 0 .../jobs/AsyncJobTestDispatcher.java | 0 .../resources/AsyncJobManagerTestContext.xml | 0 .../test/resources/commonContext.xml | 0 .../{ => src}/test/resources/db.properties | 0 .../{ => src}/test/resources/log4j.properties | 0 framework/managed-context/pom.xml | 4 +- .../cloudstack/quota/QuotaAlertManager.java | 0 .../quota/QuotaAlertManagerImpl.java | 0 .../apache/cloudstack/quota/QuotaManager.java | 0 .../cloudstack/quota/QuotaManagerImpl.java | 0 .../cloudstack/quota/QuotaStatement.java | 0 .../cloudstack/quota/QuotaStatementImpl.java | 0 .../quota/constant/QuotaConfig.java | 0 .../cloudstack/quota/constant/QuotaTypes.java | 0 .../cloudstack/quota/dao/QuotaAccountDao.java | 0 .../quota/dao/QuotaAccountDaoImpl.java | 0 .../cloudstack/quota/dao/QuotaBalanceDao.java | 0 .../quota/dao/QuotaBalanceDaoImpl.java | 0 .../cloudstack/quota/dao/QuotaCreditsDao.java | 0 .../quota/dao/QuotaCreditsDaoImpl.java | 0 .../quota/dao/QuotaEmailTemplatesDao.java | 0 .../quota/dao/QuotaEmailTemplatesDaoImpl.java | 0 .../cloudstack/quota/dao/QuotaTariffDao.java | 0 .../quota/dao/QuotaTariffDaoImpl.java | 0 .../cloudstack/quota/dao/QuotaUsageDao.java | 0 .../quota/dao/QuotaUsageDaoImpl.java | 0 .../quota/dao/ServiceOfferingDao.java | 0 .../quota/dao/ServiceOfferingDaoImpl.java | 0 .../quota/dao/UserVmDetailsDao.java | 0 .../quota/dao/UserVmDetailsDaoImpl.java | 0 .../cloudstack/quota/vo/QuotaAccountVO.java | 0 .../cloudstack/quota/vo/QuotaBalanceVO.java | 0 .../cloudstack/quota/vo/QuotaCreditsVO.java | 0 .../quota/vo/QuotaEmailTemplatesVO.java | 0 .../cloudstack/quota/vo/QuotaTariffVO.java | 0 .../cloudstack/quota/vo/QuotaUsageVO.java | 0 .../quota/vo/ServiceOfferingVO.java | 0 .../cloudstack/quota/vo/UserVmDetailVO.java | 0 .../quota/spring-framework-quota-context.xml | 0 .../quota/QuotaAlertManagerImplTest.java | 0 .../quota/QuotaManagerImplTest.java | 0 .../cloudstack/quota/QuotaStatementTest.java | 0 .../quota/constant/QuotaTypesTest.java | 0 .../CSJacksonAnnotationIntrospector.java | 0 .../ws/jackson/CSJacksonAnnotationModule.java | 0 .../framework/ws/jackson/UriSerializer.java | 0 .../framework/ws/jackson/UrisSerializer.java | 0 .../cloudstack/framework/ws/jackson/Url.java | 0 .../ws/jackson/CSJacksonAnnotationTest.java | 0 .../framework/security/keys/KeysManager.java | 0 .../security/keys/KeysManagerImpl.java | 0 .../security/keystore/KeystoreDao.java | 0 .../security/keystore/KeystoreDaoImpl.java | 0 .../security/keystore/KeystoreManager.java | 0 .../keystore/KeystoreManagerImpl.java | 0 .../security/keystore/KeystoreVO.java | 0 ...spring-framework-security-core-context.xml | 0 framework/spring/lifecycle/pom.xml | 4 +- framework/spring/module/pom.xml | 4 +- maven-standard/pom.xml | 48 --------- packaging/centos63/cloud.spec | 2 +- packaging/centos7/cloud.spec | 2 +- .../acl/DynamicRoleBasedAPIAccessChecker.java | 0 .../acl-dynamic-role-based/module.properties | 0 .../spring-acl-dynamic-role-based-context.xml | 0 .../DynamicRoleBasedAPIAccessCheckerTest.java | 0 .../acl/StaticRoleBasedAPIAccessChecker.java | 0 .../acl-static-role-based/module.properties | 0 .../spring-acl-static-role-based-context.xml | 0 .../explicit-dedication/pom.xml | 1 - .../affinity/ExplicitDedicationProcessor.java | 0 .../explicit-dedication/module.properties | 0 .../spring-explicit-dedication-context.xml | 0 .../host-anti-affinity/pom.xml | 1 - .../affinity/HostAntiAffinityProcessor.java | 0 .../host-anti-affinity/module.properties | 0 .../spring-host-anti-affinity-context.xml | 0 .../alert/snmp/CsSnmpConstants.java | 0 .../alert/snmp/SnmpEnhancedPatternLayout.java | 0 .../cloudstack/alert/snmp/SnmpHelper.java | 0 .../alert/snmp/SnmpTrapAppender.java | 0 .../cloudstack/alert/snmp/SnmpTrapInfo.java | 0 .../snmp/SnmpEnhancedPatternLayoutTest.java | 0 .../alert/snmp/SnmpTrapAppenderTest.java | 0 .../syslog/AlertsSyslogAppender.java | 0 .../syslog/AlertsSyslogAppenderTest.java | 0 .../command/user/discovery/ListApisCmd.java | 0 .../api/response/ApiDiscoveryResponse.java | 0 .../api/response/ApiParameterResponse.java | 0 .../api/response/ApiResponseResponse.java | 0 .../discovery/ApiDiscoveryService.java | 0 .../discovery/ApiDiscoveryServiceImpl.java | 0 .../discovery/ApiDiscoveryTest.java | 0 .../admin/ratelimit/ResetApiLimitCmd.java | 0 .../user/ratelimit/GetApiLimitCmd.java | 0 .../api/response/ApiLimitResponse.java | 0 .../ratelimit/ApiRateLimitService.java | 0 .../ratelimit/ApiRateLimitServiceImpl.java | 0 .../ratelimit/EhcacheLimitStore.java | 0 .../cloudstack/ratelimit/LimitStore.java | 0 .../cloudstack/ratelimit/StoreEntry.java | 0 .../cloudstack/ratelimit/StoreEntryImpl.java | 0 .../cloudstack/rate-limit/module.properties | 0 .../rate-limit/spring-rate-limit-context.xml | 0 .../ratelimit/ApiRateLimitTest.java | 0 .../ratelimit/integration/APITest.java | 0 .../ratelimit/integration/LoginResponse.java | 0 .../integration/RateLimitIntegrationTest.java | 0 .../admin/solidfire/GetPathForVolumeCmd.java | 0 .../solidfire/GetSolidFireAccountIdCmd.java | 0 .../GetSolidFireVolumeAccessGroupIdCmd.java | 0 .../solidfire/GetSolidFireVolumeSizeCmd.java | 0 .../GetVolumeSnapshotDetailsCmd.java | 0 .../solidfire/GetVolumeiScsiNameCmd.java | 0 .../solidfire/ApiPathForVolumeResponse.java | 0 .../ApiSolidFireAccountIdResponse.java | 0 ...iSolidFireVolumeAccessGroupIdResponse.java | 0 .../ApiSolidFireVolumeSizeResponse.java | 0 .../ApiVolumeSnapshotDetailsResponse.java | 0 .../solidfire/ApiVolumeiScsiNameResponse.java | 0 .../ApiSolidFireIntegrationTestService.java | 0 ...piSolidFireIntegrationTestServiceImpl.java | 0 .../SolidFireIntegrationTestManager.java | 0 .../SolidFireIntegrationTestManagerImpl.java | 0 .../SolidFireIntegrationTestUtil.java | 0 .../solidfire-intg-test/module.properties | 0 .../spring-solidfire-intg-test-context.xml | 0 .../command/admin/sioc/UpdateSiocInfoCmd.java | 0 .../sioc/ApiUpdateSiocInfoResponse.java | 0 .../cloudstack/api/sioc/ApiSiocService.java | 0 .../api/sioc/ApiSiocServiceImpl.java | 0 .../apache/cloudstack/sioc/SiocManager.java | 0 .../cloudstack/sioc/SiocManagerImpl.java | 0 .../org/apache/cloudstack/util/LoginInfo.java | 0 .../cloudstack/util/vmware/VMwareUtil.java | 0 .../cloudstack/vmware-sioc/module.properties | 0 .../vmware-sioc/spring-sioc-context.xml | 0 .../ca/provider/RootCACustomTrustManager.java | 0 .../ca/provider/RootCAProvider.java | 0 .../cloudstack/root-ca/module.properties | 0 .../root-ca/spring-root-ca-context.xml | 0 .../RootCACustomTrustManagerTest.java | 0 .../ca/provider/RootCAProviderTest.java | 0 .../com/cloud/utils/db/StaticStrategy.java | 0 .../api/command/QuotaBalanceCmd.java | 0 .../api/command/QuotaCreditsCmd.java | 0 .../command/QuotaEmailTemplateListCmd.java | 0 .../command/QuotaEmailTemplateUpdateCmd.java | 0 .../api/command/QuotaEnabledCmd.java | 0 .../api/command/QuotaStatementCmd.java | 0 .../api/command/QuotaSummaryCmd.java | 0 .../api/command/QuotaTariffListCmd.java | 0 .../api/command/QuotaTariffUpdateCmd.java | 0 .../api/command/QuotaUpdateCmd.java | 0 .../api/response/QuotaBalanceResponse.java | 0 .../api/response/QuotaCreditsResponse.java | 0 .../response/QuotaEmailTemplateResponse.java | 0 .../api/response/QuotaEnabledResponse.java | 0 .../api/response/QuotaResponseBuilder.java | 0 .../response/QuotaResponseBuilderImpl.java | 0 .../response/QuotaStatementItemResponse.java | 0 .../api/response/QuotaStatementResponse.java | 0 .../api/response/QuotaSummaryResponse.java | 0 .../api/response/QuotaTariffResponse.java | 0 .../api/response/QuotaTypeResponse.java | 0 .../api/response/QuotaUpdateResponse.java | 0 .../apache/cloudstack/quota/QuotaService.java | 0 .../cloudstack/quota/QuotaServiceImpl.java | 0 .../cloudstack/quota/module.properties | 0 .../cloudstack/quota/spring-quota-context.xml | 0 .../api/command/QuotaBalanceCmdTest.java | 0 .../api/command/QuotaCreditsCmdTest.java | 0 .../QuotaEmailTemplateListCmdTest.java | 0 .../QuotaEmailTemplateUpdateCmdTest.java | 0 .../api/command/QuotaStatementCmdTest.java | 0 .../api/command/QuotaTariffListCmdTest.java | 0 .../api/command/QuotaTariffUpdateCmdTest.java | 0 .../QuotaResponseBuilderImplTest.java | 0 .../quota/QuotaServiceImplTest.java | 0 .../api/commands/DedicateClusterCmd.java | 0 .../api/commands/DedicateHostCmd.java | 0 .../api/commands/DedicatePodCmd.java | 0 .../api/commands/DedicateZoneCmd.java | 0 .../commands/ListDedicatedClustersCmd.java | 0 .../api/commands/ListDedicatedHostsCmd.java | 0 .../api/commands/ListDedicatedPodsCmd.java | 0 .../api/commands/ListDedicatedZonesCmd.java | 0 .../commands/ReleaseDedicatedClusterCmd.java | 0 .../api/commands/ReleaseDedicatedHostCmd.java | 0 .../api/commands/ReleaseDedicatedPodCmd.java | 0 .../api/commands/ReleaseDedicatedZoneCmd.java | 0 .../api/response/DedicateClusterResponse.java | 0 .../api/response/DedicateHostResponse.java | 0 .../api/response/DedicatePodResponse.java | 0 .../api/response/DedicateZoneResponse.java | 0 .../DedicatedResourceManagerImpl.java | 0 .../dedicated/DedicatedService.java | 0 ...pring-dedicated-resources-core-context.xml | 0 .../manager/DedicatedApiUnitTest.java | 0 .../test/resources}/dedicatedContext.xml | 0 .../deploy/ImplicitDedicationPlanner.java | 0 .../implicit-dedication/module.properties | 0 .../spring-implicit-dedication-context.xml | 0 .../implicitplanner/ImplicitPlannerTest.java | 0 .../deploy/UserConcentratedPodPlanner.java | 0 .../user-concentrated-pod/module.properties | 0 .../spring-user-concentrated-pod-context.xml | 0 .../cloud/deploy/UserDispersingPlanner.java | 0 .../mom/inmemory/InMemoryEventBus.java | 0 .../mom/inmemory/InMemoryEventBusTest.java | 0 .../cloudstack/mom/kafka/KafkaEventBus.java | 0 .../mom/rabbitmq/RabbitMQEventBus.java | 0 .../api/commands/netapp/AssociateLunCmd.java | 0 .../api/commands/netapp/CreateLunCmd.java | 0 .../netapp/CreateVolumeOnFilerCmd.java | 0 .../commands/netapp/CreateVolumePoolCmd.java | 0 .../commands/netapp/DeleteVolumePoolCmd.java | 0 .../api/commands/netapp/DestroyLunCmd.java | 0 .../netapp/DestroyVolumeOnFilerCmd.java | 0 .../api/commands/netapp/DissociateLunCmd.java | 0 .../api/commands/netapp/ListLunsCmd.java | 0 .../commands/netapp/ListVolumePoolsCmd.java | 0 .../netapp/ListVolumesOnFilerCmd.java | 0 .../commands/netapp/ModifyVolumePoolCmd.java | 0 .../java}/com/cloud/netapp/LunVO.java | 0 .../com/cloud/netapp/NetappAllocator.java | 0 .../netapp/NetappDefaultAllocatorImpl.java | 0 .../java}/com/cloud/netapp/NetappManager.java | 0 .../com/cloud/netapp/NetappManagerImpl.java | 0 .../com/cloud/netapp/NetappVolumeVO.java | 0 .../java}/com/cloud/netapp/PoolVO.java | 0 .../java}/com/cloud/netapp/dao/LunDao.java | 0 .../com/cloud/netapp/dao/LunDaoImpl.java | 0 .../java}/com/cloud/netapp/dao/PoolDao.java | 0 .../com/cloud/netapp/dao/PoolDaoImpl.java | 0 .../java}/com/cloud/netapp/dao/VolumeDao.java | 0 .../com/cloud/netapp/dao/VolumeDaoImpl.java | 0 .../cloud/deploy/SkipHeuresticsPlanner.java | 0 .../skip-heurestics/module.properties | 0 .../spring-skip-heurestics-context.xml | 0 .../allocator/impl/RandomAllocator.java | 0 .../host-allocator-random/module.properties | 0 .../spring-host-allocator-random-context.xml | 0 .../baremetal/database/BaremetalDhcpDao.java | 0 .../database/BaremetalDhcpDaoImpl.java | 0 .../baremetal/database/BaremetalDhcpVO.java | 0 .../baremetal/database/BaremetalPxeDao.java | 0 .../database/BaremetalPxeDaoImpl.java | 0 .../baremetal/database/BaremetalPxeVO.java | 0 .../baremetal/database/BaremetalRctDao.java | 0 .../database/BaremetalRctDaoImpl.java | 0 .../baremetal/database/BaremetalRctVO.java | 0 .../manager/BareMetalDiscoverer.java | 0 .../baremetal/manager/BareMetalGuru.java | 0 .../baremetal/manager/BareMetalPlanner.java | 0 .../manager/BareMetalTemplateAdapter.java | 0 .../baremetal/manager/BaremetalManager.java | 0 .../manager/BaremetalManagerImpl.java | 0 .../cloud/baremetal/manager/BaremetalRct.java | 0 .../manager/BaremetalVlanManager.java | 0 .../manager/BaremetalVlanManagerImpl.java | 0 .../BareMetalPingServiceImpl.java | 0 .../BareMetalPxeServiceBase.java | 0 .../networkservice/BareMetalResourceBase.java | 0 .../networkservice/BaremetaNetworkGuru.java | 0 .../networkservice/BaremetalDhcpElement.java | 0 .../networkservice/BaremetalDhcpManager.java | 0 .../BaremetalDhcpManagerImpl.java | 0 .../BaremetalDhcpResourceBase.java | 0 .../networkservice/BaremetalDhcpResponse.java | 0 .../BaremetalDhcpdResource.java | 0 .../BaremetalDnsmasqResource.java | 0 .../BaremetalKickStartPxeResource.java | 0 .../BaremetalKickStartServiceImpl.java | 0 .../BaremetalPingPxeResource.java | 0 .../networkservice/BaremetalPxeElement.java | 0 .../BaremetalPxeKickStartResponse.java | 0 .../networkservice/BaremetalPxeManager.java | 0 .../BaremetalPxeManagerImpl.java | 0 .../BaremetalPxePingResponse.java | 0 .../BaremetalPxeResourceBase.java | 0 .../networkservice/BaremetalPxeResponse.java | 0 .../networkservice/BaremetalPxeService.java | 0 .../networkservice/BaremetalRctResponse.java | 0 .../BaremetalSwitchBackend.java | 0 .../BaremetalUserdataElement.java | 0 .../BaremetalVirtualRouterCommands.java | 0 .../networkservice/BaremetalVlanStruct.java | 0 .../Force10BaremetalSwitchBackend.java | 0 .../PrepareKickstartPxeServerCommand.java | 0 .../SecurityGroupHttpClient.java | 0 .../networkservice/schema/ObjectFactory.java | 0 .../schema/SecurityGroupRule.java | 0 .../schema/SecurityGroupVmRuleSet.java | 0 .../cloudstack/api/AddBaremetalDhcpCmd.java | 0 .../cloudstack/api/AddBaremetalHostCmd.java | 0 .../api/AddBaremetalKickStartPxeCmd.java | 0 .../cloudstack/api/AddBaremetalPxeCmd.java | 0 .../api/AddBaremetalPxePingServerCmd.java | 0 .../cloudstack/api/AddBaremetalRctCmd.java | 0 ...BaremetalProvisionDoneNotificationCmd.java | 0 .../cloudstack/api/DeleteBaremetalRctCmd.java | 0 .../cloudstack/api/ListBaremetalDhcpCmd.java | 0 .../api/ListBaremetalPxeServersCmd.java | 0 .../cloudstack/api/ListBaremetalRctCmd.java | 0 .../baremetal-compute/module.properties | 0 .../spring-baremetal-compute-context.xml | 0 .../baremetal-discoverer/module.properties | 0 .../spring-baremetal-discoverer-context.xml | 0 .../baremetal-network/module.properties | 0 .../spring-baremetal-network-context.xml | 0 .../baremetal-planner/module.properties | 0 .../spring-baremetal-planner-context.xml | 0 .../baremetal-storage/module.properties | 0 .../spring-baremetal-storage-context.xml | 0 .../core/spring-baremetal-core-context.xml | 0 .../resources/security_group_agent/cs-sgagent | 0 .../security_group_agent/__init__.py | 0 .../security_group_agent/cs_sg_agent.py | 0 .../security_group_agent/sglib.py | 0 .../security_group_agent/xmlobject.py | 0 .../resources/security_group_agent/setup.py | 0 plugins/hypervisors/hyperv/pom.xml | 11 --- .../com/cloud/ha/HypervInvestigator.java | 0 .../discoverer/HypervServerDiscoverer.java | 0 .../hypervisor/hyperv/guru/HypervGuru.java | 0 .../hyperv/manager/HypervManager.java | 0 .../hyperv/manager/HypervManagerImpl.java | 0 .../resource/HypervDirectConnectResource.java | 0 .../motion/HypervStorageMotionStrategy.java | 0 .../core/spring-hyperv-core-context.xml | 0 .../hyperv-compute/module.properties | 0 .../spring-hyperv-compute-context.xml | 0 .../hyperv-discoverer/module.properties | 0 .../spring-hyperv-discoverer-context.xml | 0 .../main/resources}/agent.properties | 0 .../test/HypervDirectConnectResourceTest.java | 0 plugins/hypervisors/kvm/pom.xml | 3 - .../LibvirtReplugNicCommandWrapper.java | 0 .../java}/com/cloud/ha/KVMInvestigator.java | 0 .../kvm/resource/BridgeVifDriver.java | 0 .../kvm/resource/DirectVifDriver.java | 0 .../hypervisor/kvm/resource/IvsVifDriver.java | 0 .../kvm/resource/KVMGuestOsMapper.java | 0 .../hypervisor/kvm/resource/KVMHABase.java | 0 .../hypervisor/kvm/resource/KVMHAChecker.java | 0 .../hypervisor/kvm/resource/KVMHAMonitor.java | 0 .../kvm/resource/KVMHAVMActivityChecker.java | 0 .../kvm/resource/LibvirtCapXMLParser.java | 0 .../resource/LibvirtComputingResource.java | 0 .../kvm/resource/LibvirtConnection.java | 0 .../kvm/resource/LibvirtDomainXMLParser.java | 0 .../kvm/resource/LibvirtNetworkDef.java | 0 .../kvm/resource/LibvirtSecretDef.java | 0 .../kvm/resource/LibvirtStoragePoolDef.java | 0 .../resource/LibvirtStoragePoolXMLParser.java | 0 .../kvm/resource/LibvirtStorageVolumeDef.java | 0 .../LibvirtStorageVolumeXMLParser.java | 0 .../hypervisor/kvm/resource/LibvirtVMDef.java | 0 .../kvm/resource/LibvirtXMLParser.java | 0 .../kvm/resource/MigrateKVMAsync.java | 0 .../hypervisor/kvm/resource/OvsVifDriver.java | 0 .../hypervisor/kvm/resource/VifDriver.java | 0 .../kvm/resource/VifDriverBase.java | 0 .../LibvirtAttachIsoCommandWrapper.java | 0 .../LibvirtBackupSnapshotCommandWrapper.java | 0 ...rtCheckConsoleProxyLoadCommandWrapper.java | 0 .../LibvirtCheckHealthCommandWrapper.java | 0 .../LibvirtCheckNetworkCommandWrapper.java | 0 .../LibvirtCheckOnHostCommandWrapper.java | 0 .../LibvirtCheckSshCommandWrapper.java | 0 .../wrapper/LibvirtCheckUrlCommand.java | 0 ...VMActivityOnStoragePoolCommandWrapper.java | 0 ...virtCheckVirtualMachineCommandWrapper.java | 0 ...virtCleanupNetworkRulesCommandWrapper.java | 0 ...LibvirtConsoleProxyLoadCommandWrapper.java | 0 .../LibvirtCopyVolumeCommandWrapper.java | 0 .../wrapper/LibvirtCreateCommandWrapper.java | 0 ...ateTemplateFromSnapshotCommandWrapper.java | 0 ...ivateTemplateFromVolumeCommandWrapper.java | 0 ...ibvirtCreateStoragePoolCommandWrapper.java | 0 ...LibvirtCreateVMSnapshotCommandWrapper.java | 0 ...reateVolumeFromSnapshotCommandWrapper.java | 0 ...ibvirtDeleteStoragePoolCommandWrapper.java | 0 ...LibvirtDeleteVMSnapshotCommandWrapper.java | 0 .../wrapper/LibvirtDestroyCommandWrapper.java | 0 .../wrapper/LibvirtFenceCommandWrapper.java | 0 .../LibvirtGetHostStatsCommandWrapper.java | 0 .../LibvirtGetStorageStatsCommandWrapper.java | 0 .../LibvirtGetVmDiskStatsCommandWrapper.java | 0 .../LibvirtGetVmIpAddressCommandWrapper.java | 0 ...ibvirtGetVmNetworkStatsCommandWrapper.java | 0 .../LibvirtGetVmStatsCommandWrapper.java | 0 .../LibvirtGetVncPortCommandWrapper.java | 0 .../LibvirtGetVolumeStatsCommandWrapper.java | 0 .../LibvirtMaintainCommandWrapper.java | 0 .../LibvirtManageSnapshotCommandWrapper.java | 0 .../wrapper/LibvirtMigrateCommandWrapper.java | 0 .../LibvirtMigrateVolumeCommandWrapper.java | 0 .../LibvirtModifySshKeysCommandWrapper.java | 0 ...ibvirtModifyStoragePoolCommandWrapper.java | 0 .../LibvirtModifyTargetsCommandWrapper.java | 0 .../LibvirtNetworkElementCommandWrapper.java | 0 ...irtNetworkRulesSystemVmCommandWrapper.java | 0 ...tworkRulesVmSecondaryIpCommandWrapper.java | 0 .../LibvirtNetworkUsageCommandWrapper.java | 0 .../LibvirtOvsCreateTunnelCommandWrapper.java | 0 ...LibvirtOvsDestroyBridgeCommandWrapper.java | 0 ...LibvirtOvsDestroyTunnelCommandWrapper.java | 0 ...ibvirtOvsFetchInterfaceCommandWrapper.java | 0 .../LibvirtOvsSetupBridgeCommandWrapper.java | 0 ...cPhysicalTopologyConfigCommandWrapper.java | 0 ...sVpcRoutingPolicyConfigCommandWrapper.java | 0 .../LibvirtPingTestCommandWrapper.java | 0 .../wrapper/LibvirtPlugNicCommandWrapper.java | 0 ...virtPrepareForMigrationCommandWrapper.java | 0 ...tPrimaryStorageDownloadCommandWrapper.java | 0 .../LibvirtPvlanSetupCommandWrapper.java | 0 .../wrapper/LibvirtReadyCommandWrapper.java | 0 .../wrapper/LibvirtRebootCommandWrapper.java | 0 .../LibvirtRebootRouterCommandWrapper.java | 0 .../wrapper/LibvirtRequestWrapper.java | 0 .../LibvirtResizeVolumeCommandWrapper.java | 0 ...ibvirtRestoreVMSnapshotCommandWrapper.java | 0 .../LibvirtRevertSnapshotCommandWrapper.java | 0 ...bvirtRevertToVMSnapshotCommandWrapper.java | 0 ...bvirtSecurityGroupRulesCommandWrapper.java | 0 .../LibvirtSetHostParamsCommandWrapper.java | 0 .../wrapper/LibvirtStartCommandWrapper.java | 0 .../wrapper/LibvirtStopCommandWrapper.java | 0 ...LibvirtStorageSubSystemCommandWrapper.java | 0 .../LibvirtUnPlugNicCommandWrapper.java | 0 ...bvirtUpdateHostPasswordCommandWrapper.java | 0 .../LibvirtUpgradeSnapshotCommandWrapper.java | 0 .../wrapper/LibvirtUtilitiesHelper.java | 0 ...rtWatchConsoleProxyLoadCommandWrapper.java | 0 .../kvm/storage/IscsiAdmStorageAdaptor.java | 0 .../kvm/storage/IscsiAdmStoragePool.java | 0 .../kvm/storage/KVMPhysicalDisk.java | 0 .../kvm/storage/KVMStoragePool.java | 0 .../kvm/storage/KVMStoragePoolManager.java | 0 .../kvm/storage/KVMStorageProcessor.java | 0 .../kvm/storage/KVMStorageResource.java | 0 .../kvm/storage/KVMVirtualDisk.java | 0 .../kvm/storage/LibvirtStorageAdaptor.java | 0 .../kvm/storage/LibvirtStoragePool.java | 0 .../kvm/storage/ManagedNfsStorageAdaptor.java | 0 .../kvm/storage/StorageAdaptor.java | 0 .../kvm/storage/StorageAdaptorInfo.java | 0 .../apache/cloudstack/kvm/ha/KVMHAConfig.java | 0 .../cloudstack/kvm/ha/KVMHAProvider.java | 0 .../kvm/ha/KVMHostActivityChecker.java | 0 .../cloudstack/utils/linux/CPUStat.java | 0 .../cloudstack/utils/linux/MemStat.java | 0 .../apache/cloudstack/utils/qemu/QemuImg.java | 0 .../utils/qemu/QemuImgException.java | 0 .../cloudstack/utils/qemu/QemuImgFile.java | 0 .../cloudstack/kvm-compute/module.properties | 0 .../spring-kvm-compute-context.xml | 0 .../LibvirtComputingResourceTest.java | 0 .../resource/LibvirtDomainXMLParserTest.java | 0 .../kvm/resource/LibvirtSecretDefTest.java | 0 .../resource/LibvirtStoragePoolDefTest.java | 0 .../kvm/resource/LibvirtVMDefTest.java | 0 .../kvm/resource/LibvirtVifDriverTest.java | 0 .../LibvirtMigrateCommandWrapperTest.java | 0 ...bvirtNetworkElementCommandWrapperTest.java | 0 .../LibvirtReplugNicCommandWrapperTest.java | 0 .../wrapper/LibvirtUtilitiesHelperTest.java | 0 .../kvm/storage/KVMPhysicalDiskTest.java | 0 .../kvm/storage/KVMStorageProcessorTest.java | 0 .../kvm/storage/LibvirtStoragePoolTest.java | 0 .../cloudstack/kvm/ha/KVMHostHATest.java | 0 .../cloudstack/utils/linux/MemStatTest.java | 0 .../utils/qemu/QemuImgFileTest.java | 0 .../cloudstack/utils/qemu/QemuImgTest.java | 0 .../cloud/ovm/hypervisor/OvmDiscoverer.java | 0 .../com/cloud/ovm/hypervisor/OvmFencer.java | 0 .../com/cloud/ovm/hypervisor/OvmGuru.java | 0 .../com/cloud/ovm/hypervisor/OvmHelper.java | 0 .../cloud/ovm/hypervisor/OvmResourceBase.java | 0 .../java}/com/cloud/ovm/object/Coder.java | 0 .../com/cloud/ovm/object/Connection.java | 0 .../java}/com/cloud/ovm/object/OvmBridge.java | 0 .../java}/com/cloud/ovm/object/OvmDisk.java | 0 .../java}/com/cloud/ovm/object/OvmHost.java | 0 .../java}/com/cloud/ovm/object/OvmObject.java | 0 .../cloud/ovm/object/OvmSecurityGroup.java | 0 .../com/cloud/ovm/object/OvmStoragePool.java | 0 .../java}/com/cloud/ovm/object/OvmVif.java | 0 .../java}/com/cloud/ovm/object/OvmVlan.java | 0 .../java}/com/cloud/ovm/object/OvmVm.java | 0 .../java}/com/cloud/ovm/object/OvmVolume.java | 0 .../java}/com/cloud/ovm/object/Test.java | 0 .../cloudstack/ovm-compute/module.properties | 0 .../spring-ovm-compute-context.xml | 0 .../ovm-discoverer/module.properties | 0 .../spring-ovm-discoverer-context.xml | 0 .../vm/hypervisor/ovm/ConfigFileOps.py | 0 .../vm/hypervisor/ovm/OvmCommonModule.py | 0 .../vm/hypervisor/ovm/OvmDiskModule.py | 0 .../vm/hypervisor/ovm/OvmDispatcher.py | 0 .../vm/hypervisor/ovm/OvmFaultConstants.py | 0 .../vm/hypervisor/ovm/OvmHaHeartBeatModule.py | 0 .../vm/hypervisor/ovm/OvmHostModule.py | 0 .../vm/hypervisor/ovm/OvmLoggerModule.py | 0 .../vm/hypervisor/ovm/OvmNetworkModule.py | 0 .../vm/hypervisor/ovm/OvmOCFS2Module.py | 0 .../vm/hypervisor/ovm/OvmObjectModule.py | 0 .../hypervisor/ovm/OvmSecurityGroupModule.py | 0 .../vm/hypervisor/ovm/OvmStoragePoolModule.py | 0 .../scripts/vm/hypervisor/ovm/OvmVifModule.py | 0 .../scripts/vm/hypervisor/ovm/OvmVmModule.py | 0 .../vm/hypervisor/ovm/OvmVolumeModule.py | 0 .../scripts/vm/hypervisor/ovm/configureOvm.sh | 0 plugins/hypervisors/ovm3/pom.xml | 17 ---- .../resources/Ovm3HypervisorResourceTest.java | 3 - plugins/hypervisors/simulator/pom.xml | 1 - .../cloud/agent/manager/MockAgentManager.java | 0 .../agent/manager/MockAgentManagerImpl.java | 0 .../agent/manager/MockNetworkManager.java | 0 .../agent/manager/MockNetworkManagerImpl.java | 0 .../agent/manager/MockStorageManager.java | 0 .../agent/manager/MockStorageManagerImpl.java | 0 .../cloud/agent/manager/MockVmManager.java | 0 .../agent/manager/MockVmManagerImpl.java | 0 .../cloud/agent/manager/SimulatorInfo.java | 0 .../cloud/agent/manager/SimulatorManager.java | 0 .../agent/manager/SimulatorManagerImpl.java | 0 .../api/commands/CleanupSimulatorMockCmd.java | 0 .../api/commands/ConfigureSimulatorCmd.java | 0 .../ConfigureSimulatorHAProviderState.java | 0 .../ListSimulatorHAStateTransitions.java | 0 .../api/commands/QuerySimulatorMockCmd.java | 0 .../commands/SimulatorAddSecondaryAgent.java | 0 .../com/cloud/api/response/MockResponse.java | 0 .../response/SimulatorHAStateResponse.java | 0 .../java}/com/cloud/ha/SimulatorFencer.java | 0 .../com/cloud/ha/SimulatorInvestigator.java | 0 .../com/cloud/resource/AgentResourceBase.java | 0 .../cloud/resource/AgentRoutingResource.java | 0 .../cloud/resource/AgentStorageResource.java | 0 .../cloud/resource/SimulatorDiscoverer.java | 0 .../SimulatorSecondaryDiscoverer.java | 0 .../resource/SimulatorStorageProcessor.java | 0 .../cloud/simulator/MockConfigurationVO.java | 0 .../java}/com/cloud/simulator/MockHost.java | 0 .../java}/com/cloud/simulator/MockHostVO.java | 0 .../com/cloud/simulator/MockSecStorageVO.java | 0 .../cloud/simulator/MockSecurityRulesVO.java | 0 .../cloud/simulator/MockStoragePoolVO.java | 0 .../java}/com/cloud/simulator/MockVMVO.java | 0 .../java}/com/cloud/simulator/MockVm.java | 0 .../com/cloud/simulator/MockVolumeVO.java | 0 .../com/cloud/simulator/SimulatorGuru.java | 0 .../simulator/SimulatorRuntimeException.java | 0 .../simulator/dao/MockConfigurationDao.java | 0 .../dao/MockConfigurationDaoImpl.java | 0 .../com/cloud/simulator/dao/MockHostDao.java | 0 .../cloud/simulator/dao/MockHostDaoImpl.java | 0 .../simulator/dao/MockSecStorageDao.java | 0 .../simulator/dao/MockSecStorageDaoImpl.java | 0 .../simulator/dao/MockSecurityRulesDao.java | 0 .../dao/MockSecurityRulesDaoImpl.java | 0 .../simulator/dao/MockStoragePoolDao.java | 0 .../simulator/dao/MockStoragePoolDaoImpl.java | 0 .../com/cloud/simulator/dao/MockVMDao.java | 0 .../cloud/simulator/dao/MockVMDaoImpl.java | 0 .../cloud/simulator/dao/MockVolumeDao.java | 0 .../simulator/dao/MockVolumeDaoImpl.java | 0 .../cloudstack/ha/SimulatorHAProvider.java | 0 .../cloudstack/ha/SimulatorHAState.java | 0 .../driver/SimulatorImageStoreDriverImpl.java | 0 .../SimulatorImageStoreLifeCycleImpl.java | 0 .../SimulatorImageStoreProviderImpl.java | 0 .../motion/SimulatorDataMotionStrategy.java | 0 .../SimulatorSecondaryStorageResource.java | 0 .../core/spring-simulator-core-context.xml | 0 .../simulator-compute/module.properties | 0 .../spring-simulator-compute-context.xml | 0 .../simulator-discoverer/module.properties | 0 .../spring-simulator-discover-context.xml | 0 .../simulator-storage/module.properties | 0 .../spring-simulator-storage-context.xml | 0 plugins/hypervisors/ucs/pom.xml | 0 .../com/cloud/ucs/database/UcsBladeDao.java | 0 .../cloud/ucs/database/UcsBladeDaoImpl.java | 0 .../com/cloud/ucs/database/UcsBladeVO.java | 0 .../com/cloud/ucs/database/UcsManagerDao.java | 0 .../cloud/ucs/database/UcsManagerDaoImpl.java | 0 .../com/cloud/ucs/database/UcsManagerVO.java | 0 .../com/cloud/ucs/manager/StringTemplate.java | 0 .../com/cloud/ucs/manager/UcsCommands.java | 0 .../com/cloud/ucs/manager/UcsHttpClient.java | 0 .../com/cloud/ucs/manager/UcsManager.java | 0 .../com/cloud/ucs/manager/UcsManagerImpl.java | 0 .../com/cloud/ucs/structure/ComputeBlade.java | 0 .../com/cloud/ucs/structure/UcsCookie.java | 0 .../com/cloud/ucs/structure/UcsProfile.java | 0 .../cloudstack/api/AddUcsManagerCmd.java | 0 .../api/AssociateUcsProfileToBladeCmd.java | 0 .../cloudstack/api/DeleteUcsManagerCmd.java | 0 .../cloudstack/api/ListUcsBladeCmd.java | 0 .../cloudstack/api/ListUcsManagerCmd.java | 0 .../cloudstack/api/ListUcsProfileCmd.java | 0 .../api/response/UcsBladeResponse.java | 0 .../api/response/UcsManagerResponse.java | 0 .../api/response/UcsProfileResponse.java | 0 .../core/spring-ucs-core-context.xml | 0 .../api/commands/DeleteCiscoNexusVSMCmd.java | 0 .../api/commands/DisableCiscoNexusVSMCmd.java | 0 .../api/commands/EnableCiscoNexusVSMCmd.java | 0 .../api/commands/ListCiscoNexusVSMsCmd.java | 0 .../api/response/CiscoNexusVSMResponse.java | 0 .../java}/com/cloud/ha/VmwareFencer.java | 0 .../com/cloud/ha/VmwareInvestigator.java | 0 .../com/cloud/hypervisor/guru/VMwareGuru.java | 0 .../cloud/hypervisor/vmware/LegacyZone.java | 0 .../cloud/hypervisor/vmware/LegacyZoneVO.java | 0 .../hypervisor/vmware/VmwareCleanupMaid.java | 0 .../hypervisor/vmware/VmwareDatacenter.java | 0 .../vmware/VmwareDatacenterService.java | 0 .../hypervisor/vmware/VmwareDatacenterVO.java | 0 .../vmware/VmwareDatacenterZoneMap.java | 0 .../vmware/VmwareDatacenterZoneMapVO.java | 0 .../vmware/VmwareServerDiscoverer.java | 0 .../hypervisor/vmware/dao/LegacyZoneDao.java | 0 .../vmware/dao/LegacyZoneDaoImpl.java | 0 .../vmware/dao/VmwareDatacenterDao.java | 0 .../vmware/dao/VmwareDatacenterDaoImpl.java | 0 .../dao/VmwareDatacenterZoneMapDao.java | 0 .../dao/VmwareDatacenterZoneMapDaoImpl.java | 0 .../CleanupFullyClonedTemplatesTask.java | 0 .../vmware/manager/VmwareHostService.java | 0 .../vmware/manager/VmwareManager.java | 0 .../vmware/manager/VmwareManagerImpl.java | 0 .../vmware/manager/VmwareStorageManager.java | 0 .../manager/VmwareStorageManagerImpl.java | 0 .../vmware/manager/VmwareStorageMount.java | 0 .../vmware/resource/VmwareContextFactory.java | 0 .../vmware/resource/VmwareResource.java | 0 .../cloud/network/CiscoNexusVSMDevice.java | 0 .../CiscoNexusVSMDeviceManagerImpl.java | 0 .../cloud/network/CiscoNexusVSMDeviceVO.java | 0 .../com/cloud/network/VmwareTrafficLabel.java | 0 .../network/dao/CiscoNexusVSMDeviceDao.java | 0 .../dao/CiscoNexusVSMDeviceDaoImpl.java | 0 .../network/element/CiscoNexusVSMElement.java | 0 .../element/CiscoNexusVSMElementService.java | 0 .../PremiumSecondaryStorageResource.java | 0 .../VmwareSecondaryStorageContextFactory.java | 0 ...VmwareSecondaryStorageResourceHandler.java | 0 .../resource/VmwareStorageLayoutHelper.java | 0 .../resource/VmwareStorageLayoutType.java | 0 .../resource/VmwareStorageProcessor.java | 0 .../VmwareStorageSubsystemCommandHandler.java | 0 .../command/admin/zone/AddVmwareDcCmd.java | 0 .../command/admin/zone/ListVmwareDcsCmd.java | 0 .../command/admin/zone/RemoveVmwareDcCmd.java | 0 .../response/VmwareDatacenterResponse.java | 0 .../motion/VmwareStorageMotionStrategy.java | 0 .../core/spring-vmware-core-context.xml | 0 .../vmware-compute/module.properties | 0 .../spring-vmware-compute-context.xml | 0 .../vmware-compute/vmware-defaults.properties | 0 .../vmware-discoverer/module.properties | 0 .../spring-vmware-discoverer-context.xml | 0 .../vmware-network/module.properties | 0 .../spring-vmware-network-context.xml | 0 .../vmware-storage/module.properties | 0 .../spring-vmware-storage-context.xml | 0 .../cloud/hypervisor/guru/VMwareGuruTest.java | 0 .../vmware/VmwareDatacenterApiUnitTest.java | 0 .../vmware/resource/VmwareResourceTest.java | 0 .../VmwareStorageMotionStrategyTest.java | 0 .../java}/com/cloud/ha/XenServerFencer.java | 0 .../com/cloud/hypervisor/XenServerGuru.java | 0 .../discoverer/XcpServerDiscoverer.java | 0 .../xenserver/resource/CitrixHelper.java | 0 .../resource/CitrixResourceBase.java | 0 .../xenserver/resource/XcpOssResource.java | 0 .../xenserver/resource/XcpServerResource.java | 0 .../resource/XenServer56FP1Resource.java | 0 .../resource/XenServer56Resource.java | 0 .../resource/XenServer56SP2Resource.java | 0 .../resource/XenServer600Resource.java | 0 .../resource/XenServer610Resource.java | 0 .../resource/XenServer620Resource.java | 0 .../resource/XenServer620SP1Resource.java | 0 .../resource/XenServer650Resource.java | 0 .../resource/XenServerConnectionPool.java | 0 .../resource/XenServerStorageProcessor.java | 0 .../resource/Xenserver625Resource.java | 0 .../Xenserver625StorageProcessor.java | 0 .../hypervisor/xenserver/resource/XsHost.java | 0 .../xenserver/resource/XsLocalNetwork.java | 0 .../XcpServerNetworkUsageCommandWrapper.java | 0 .../XenServer56CheckOnHostCommandWrapper.java | 0 .../xen56/XenServer56FenceCommandWrapper.java | 0 ...XenServer56NetworkUsageCommandWrapper.java | 0 .../XenServer56FP1FenceCommandWrapper.java | 0 ...nServer610MigrateVolumeCommandWrapper.java | 0 ...er610MigrateWithStorageCommandWrapper.java | 0 ...rateWithStorageCompleteCommandWrapper.java | 0 ...grateWithStorageReceiveCommandWrapper.java | 0 ...0MigrateWithStorageSendCommandWrapper.java | 0 ...Server620SP1GetGPUStatsCommandWrapper.java | 0 .../CitrixAttachIsoCommandWrapper.java | 0 ...achOrDettachConfigDriveCommandWrapper.java | 0 ...ixCheckConsoleProxyLoadCommandWrapper.java | 0 .../CitrixCheckHealthCommandWrapper.java | 0 .../CitrixCheckNetworkCommandWrapper.java | 0 .../CitrixCheckOnHostCommandWrapper.java | 0 .../xenbase/CitrixCheckSshCommandWrapper.java | 0 ...trixCheckVirtualMachineCommandWrapper.java | 0 .../CitrixCleanupNetworkRulesCmdWrapper.java | 0 ...ixClusterVMMetaDataSyncCommandWrapper.java | 0 .../CitrixConsoleProxyLoadCommandWrapper.java | 0 .../xenbase/CitrixCreateCommandWrapper.java | 0 ...CitrixCreateStoragePoolCommandWrapper.java | 0 .../CitrixCreateVMSnapshotCommandWrapper.java | 0 ...CitrixDeleteStoragePoolCommandWrapper.java | 0 .../CitrixDeleteVMSnapshotCommandWrapper.java | 0 .../xenbase/CitrixDestroyCommandWrapper.java | 0 .../CitrixGetHostStatsCommandWrapper.java | 0 .../CitrixGetStorageStatsCommandWrapper.java | 0 .../CitrixGetVmDiskStatsCommandWrapper.java | 0 .../CitrixGetVmIpAddressCommandWrapper.java | 0 ...CitrixGetVmNetworkStatsCommandWrapper.java | 0 .../CitrixGetVmStatsCommandWrapper.java | 0 .../CitrixGetVncPortCommandWrapper.java | 0 .../CitrixGetVolumeStatsCommandWrapper.java | 0 .../xenbase/CitrixMaintainCommandWrapper.java | 0 .../xenbase/CitrixMigrateCommandWrapper.java | 0 .../CitrixModifySshKeysCommandWrapper.java | 0 ...CitrixModifyStoragePoolCommandWrapper.java | 0 .../CitrixNetworkElementCommandWrapper.java | 0 ...rixNetworkRulesSystemVmCommandWrapper.java | 0 ...tworkRulesVmSecondaryIpCommandWrapper.java | 0 ...itrixOvsCreateGreTunnelCommandWrapper.java | 0 .../CitrixOvsCreateTunnelCommandWrapper.java | 0 .../CitrixOvsDeleteFlowCommandWrapper.java | 0 .../CitrixOvsDestroyBridgeCommandWrapper.java | 0 .../CitrixOvsDestroyTunnelCommandWrapper.java | 0 ...CitrixOvsFetchInterfaceCommandWrapper.java | 0 .../CitrixOvsSetTagAndFlowCommandWrapper.java | 0 .../CitrixOvsSetupBridgeCommandWrapper.java | 0 ...cPhysicalTopologyConfigCommandWrapper.java | 0 ...sVpcRoutingPolicyConfigCommandWrapper.java | 0 ...itrixPerformanceMonitorCommandWrapper.java | 0 .../xenbase/CitrixPingTestCommandWrapper.java | 0 .../xenbase/CitrixPlugNicCommandWrapper.java | 0 ...trixPrepareForMigrationCommandWrapper.java | 0 ...xPrimaryStorageDownloadCommandWrapper.java | 0 .../CitrixPvlanSetupCommandWrapper.java | 0 .../xenbase/CitrixReadyCommandWrapper.java | 0 .../xenbase/CitrixRebootCommandWrapper.java | 0 .../CitrixRebootRouterCommandWrapper.java | 0 .../wrapper/xenbase/CitrixRequestWrapper.java | 0 .../CitrixResizeVolumeCommandWrapper.java | 0 ...itrixRevertToVMSnapshotCommandWrapper.java | 0 .../xenbase/CitrixScaleVmCommandWrapper.java | 0 ...itrixSecurityGroupRulesCommandWrapper.java | 0 .../xenbase/CitrixSetupCommandWrapper.java | 0 .../xenbase/CitrixStartCommandWrapper.java | 0 .../xenbase/CitrixStopCommandWrapper.java | 0 .../CitrixStorageSubSystemCommandWrapper.java | 0 .../CitrixUnPlugNicCommandWrapper.java | 0 ...itrixUpdateHostPasswordCommandWrapper.java | 0 .../CitrixUpgradeSnapshotCommandWrapper.java | 0 ...ixWatchConsoleProxyLoadCommandWrapper.java | 0 .../xenbase/XenServerUtilitiesHelper.java | 0 .../xenserver/XenServerResourceNewBase.java | 0 .../xenserver/XenserverConfigs.java | 0 .../XenServerStorageMotionStrategy.java | 0 .../xenserver-compute/module.properties | 0 .../spring-xenserver-compute-context.xml | 0 .../xenserver-discoverer/module.properties | 0 .../spring-xenserver-discoverer-context.xml | 0 .../cloud/hypervisor/XenServerGuruTest.java | 0 .../xenserver/resource/CitrixHelperTest.java | 0 .../resource/CitrixResourceBaseTest.java | 0 .../resource/XcpOssResourceTest.java | 0 .../resource/XcpServerResourceTest.java | 0 .../resource/XenServer56FP1ResourceTest.java | 0 .../resource/XenServer56ResourceTest.java | 0 .../resource/XenServer56SP2ResourceTest.java | 0 .../resource/XenServer600ResourceTest.java | 0 .../resource/XenServer625ResourceTest.java | 0 .../resource/XenServer650ResourceTest.java | 0 .../xenbase/CitrixRequestWrapperTest.java | 0 .../wrapper/xenbase/XcpServerWrapperTest.java | 0 .../xenbase/XenServer56FP1WrapperTest.java | 0 .../xenbase/XenServer56WrapperTest.java | 0 .../xenbase/XenServer610WrapperTest.java | 0 .../xenbase/XenServer620SP1WrapperTest.java | 0 .../xenbase/XenServer620WrapperTest.java | 0 .../cloudian/CloudianConnector.java | 0 .../cloudian/CloudianConnectorImpl.java | 0 .../cloudian/api/CloudianIsEnabledCmd.java | 0 .../cloudian/api/CloudianSsoLoginCmd.java | 0 .../cloudian/client/CloudianClient.java | 0 .../cloudian/client/CloudianGroup.java | 0 .../cloudian/client/CloudianUser.java | 0 .../cloudian/client/CloudianUtils.java | 0 .../response/CloudianEnabledResponse.java | 0 .../response/CloudianSsoLoginResponse.java | 0 .../cloudstack/cloudian/module.properties | 0 .../cloudian/spring-cloudian-context.xml | 0 .../cloudian/CloudianClientTest.java | 0 .../metrics/PrometheusExporter.java | 0 .../metrics/PrometheusExporterImpl.java | 0 .../metrics/PrometheusExporterServer.java | 0 .../metrics/PrometheusExporterServerImpl.java | 0 .../cloudstack/prometheus/module.properties | 0 .../prometheus/spring-prometheus-context.xml | 0 .../api/ListClustersMetricsCmd.java | 0 .../cloudstack/api/ListHostsMetricsCmd.java | 0 .../cloudstack/api/ListInfrastructureCmd.java | 0 .../api/ListStoragePoolsMetricsCmd.java | 0 .../cloudstack/api/ListVMsMetricsCmd.java | 0 .../cloudstack/api/ListVolumesMetricsCmd.java | 0 .../cloudstack/api/ListZonesMetricsCmd.java | 0 .../cloudstack/metrics/MetricsService.java | 0 .../metrics/MetricsServiceImpl.java | 0 .../response/ClusterMetricsResponse.java | 0 .../response/HostMetricsResponse.java | 0 .../response/InfrastructureResponse.java | 0 .../response/StoragePoolMetricsResponse.java | 0 .../response/VmMetricsResponse.java | 0 .../response/VolumeMetricsResponse.java | 0 .../response/ZoneMetricsResponse.java | 0 .../cloudstack/metrics/module.properties | 0 .../metrics/spring-metrics-context.xml | 0 .../java}/com/cloud/agent/api/BcfAnswer.java | 0 .../java}/com/cloud/agent/api/BcfCommand.java | 0 .../agent/api/CacheBcfTopologyCommand.java | 0 .../agent/api/CreateBcfAttachmentCommand.java | 0 .../agent/api/CreateBcfRouterCommand.java | 0 .../api/CreateBcfRouterInterfaceCommand.java | 0 .../agent/api/CreateBcfSegmentCommand.java | 0 .../agent/api/CreateBcfStaticNatCommand.java | 0 .../agent/api/DeleteBcfAttachmentCommand.java | 0 .../agent/api/DeleteBcfSegmentCommand.java | 0 .../agent/api/DeleteBcfStaticNatCommand.java | 0 .../agent/api/GetControllerDataAnswer.java | 0 .../agent/api/GetControllerDataCommand.java | 0 .../agent/api/GetControllerHostsAnswer.java | 0 .../agent/api/GetControllerHostsCommand.java | 0 .../agent/api/StartupBigSwitchBcfCommand.java | 0 .../agent/api/SyncBcfTopologyCommand.java | 0 .../agent/api/UpdateBcfAttachmentCommand.java | 0 .../agent/api/UpdateBcfRouterCommand.java | 0 .../commands/AddBigSwitchBcfDeviceCmd.java | 0 .../com/cloud/api/commands/BcfConstants.java | 0 .../commands/DeleteBigSwitchBcfDeviceCmd.java | 0 .../commands/ListBigSwitchBcfDevicesCmd.java | 0 .../response/BigSwitchBcfDeviceResponse.java | 0 .../cloud/network/BigSwitchBcfDeviceVO.java | 0 .../com/cloud/network/bigswitch/AclData.java | 0 .../network/bigswitch/AttachmentData.java | 0 .../network/bigswitch/BigSwitchBcfApi.java | 0 .../bigswitch/BigSwitchBcfApiException.java | 0 .../network/bigswitch/BigSwitchBcfUtils.java | 0 .../network/bigswitch/BigSwitchStatus.java | 0 .../cloud/network/bigswitch/Capabilities.java | 0 .../network/bigswitch/ControlClusterData.java | 0 .../bigswitch/ControlClusterStatus.java | 0 .../network/bigswitch/ControllerData.java | 0 .../network/bigswitch/FloatingIpData.java | 0 .../cloud/network/bigswitch/NetworkData.java | 0 .../cloud/network/bigswitch/RouterData.java | 0 .../bigswitch/RouterInterfaceData.java | 0 .../cloud/network/bigswitch/TopologyData.java | 0 .../TrustingProtocolSocketFactory.java | 0 .../cloud/network/dao/BigSwitchBcfDao.java | 0 .../network/dao/BigSwitchBcfDaoImpl.java | 0 .../network/element/BigSwitchBcfElement.java | 0 .../element/BigSwitchBcfElementService.java | 0 .../guru/BigSwitchBcfGuestNetworkGuru.java | 0 .../resource/BigSwitchBcfResource.java | 0 .../cloudstack/bigswitch/module.properties | 0 .../bigswitch/spring-bigswitch-context.xml | 0 .../network/bigswitch/BigSwitchApiTest.java | 0 .../bigswitch/BigSwitchBcfUtilsTest.java | 0 .../resource/BigSwitchBcfResourceTest.java | 0 plugins/network-elements/brocade-vcs/pom.xml | 12 +-- .../api/AssociateMacToNetworkAnswer.java | 0 .../api/AssociateMacToNetworkCommand.java | 0 .../cloud/agent/api/CreateNetworkAnswer.java | 0 .../cloud/agent/api/CreateNetworkCommand.java | 0 .../cloud/agent/api/DeleteNetworkAnswer.java | 0 .../cloud/agent/api/DeleteNetworkCommand.java | 0 .../api/DisassociateMacFromNetworkAnswer.java | 0 .../DisassociateMacFromNetworkCommand.java | 0 .../agent/api/StartupBrocadeVcsCommand.java | 0 .../api/commands/AddBrocadeVcsDeviceCmd.java | 0 .../commands/DeleteBrocadeVcsDeviceCmd.java | 0 .../ListBrocadeVcsDeviceNetworksCmd.java | 0 .../commands/ListBrocadeVcsDevicesCmd.java | 0 .../response/BrocadeVcsDeviceResponse.java | 0 .../com/cloud/network/BrocadeVcsDeviceVO.java | 0 .../BrocadeVcsNetworkVlanMappingVO.java | 0 .../cloud/network/brocade/BrocadeVcsApi.java | 0 .../brocade/BrocadeVcsApiException.java | 0 .../com/cloud/network/brocade/Constants.java | 0 .../com/cloud/network/dao/BrocadeVcsDao.java | 0 .../cloud/network/dao/BrocadeVcsDaoImpl.java | 0 .../dao/BrocadeVcsNetworkVlanMappingDao.java | 0 .../BrocadeVcsNetworkVlanMappingDaoImpl.java | 0 .../network/element/BrocadeVcsElement.java | 0 .../element/BrocadeVcsElementService.java | 0 .../guru/BrocadeVcsGuestNetworkGuru.java | 0 .../network/resource/BrocadeVcsResource.java | 0 .../resources/BrocadeInterfaceSchema.xsd | 0 .../resources/BrocadePortProfileSchema.xsd | 0 .../main}/resources/BrocadeShowVcsSchema.xsd | 0 .../META-INF/cloudstack/vcs/module.properties | 0 .../cloudstack/vcs/spring-vcs-context.xml | 0 .../network/brocade/BrocadeVcsApiTest.java | 0 .../guru/BrocadeVcsGuestNetworkGuruTest.java | 0 .../resource/BrocadeVcsResourceTest.java | 0 ...iateAsaWithLogicalEdgeFirewallCommand.java | 0 .../CleanupLogicalEdgeFirewallCommand.java | 0 .../api/ConfigureNexusVsmForAsaCommand.java | 0 .../api/CreateLogicalEdgeFirewallCommand.java | 0 .../commands/AddCiscoAsa1000vResourceCmd.java | 0 .../api/commands/AddCiscoVnmcResourceCmd.java | 0 .../DeleteCiscoAsa1000vResourceCmd.java | 0 .../commands/DeleteCiscoVnmcResourceCmd.java | 0 .../ListCiscoAsa1000vResourcesCmd.java | 0 .../commands/ListCiscoVnmcResourcesCmd.java | 0 .../CiscoAsa1000vResourceResponse.java | 0 .../response/CiscoVnmcResourceResponse.java | 0 .../network/cisco/CiscoAsa1000vDevice.java | 0 .../network/cisco/CiscoAsa1000vDeviceVO.java | 0 .../network/cisco/CiscoVnmcConnection.java | 0 .../cisco/CiscoVnmcConnectionImpl.java | 0 .../network/cisco/CiscoVnmcController.java | 0 .../network/cisco/CiscoVnmcControllerVO.java | 0 .../network/cisco/NetworkAsa1000vMap.java | 0 .../network/cisco/NetworkAsa1000vMapVO.java | 0 .../cloud/network/dao/CiscoAsa1000vDao.java | 0 .../network/dao/CiscoAsa1000vDaoImpl.java | 0 .../com/cloud/network/dao/CiscoVnmcDao.java | 0 .../cloud/network/dao/CiscoVnmcDaoImpl.java | 0 .../network/dao/NetworkAsa1000vMapDao.java | 0 .../dao/NetworkAsa1000vMapDaoImpl.java | 0 .../network/element/CiscoAsa1000vService.java | 0 .../network/element/CiscoVnmcElement.java | 0 .../element/CiscoVnmcElementService.java | 0 .../network/resource/CiscoVnmcResource.java | 0 .../cloudstack/cisco-vnmc/module.properties | 0 .../cisco-vnmc/spring-cisco-vnmc-context.xml | 0 .../scripts/network/cisco/assoc-asa1000v.xml | 0 .../cisco/associate-acl-policy-set.xml | 0 .../network/cisco/associate-dhcp-policy.xml | 0 .../network/cisco/associate-dhcp-server.xml | 0 .../cisco/associate-nat-policy-set.xml | 0 .../network/cisco/associate-route-policy.xml | 0 .../network/cisco/create-acl-policy-ref.xml | 0 .../network/cisco/create-acl-policy-set.xml | 0 .../network/cisco/create-acl-policy.xml | 0 .../cisco/create-acl-rule-for-dnat.xml | 0 .../network/cisco/create-acl-rule-for-pf.xml | 0 .../network/cisco/create-dhcp-policy.xml | 0 .../network/cisco/create-dnat-rule.xml | 0 .../cisco/create-edge-device-profile.xml | 0 .../cisco/create-edge-device-route-policy.xml | 0 .../cisco/create-edge-device-route.xml | 0 .../network/cisco/create-edge-firewall.xml | 0 .../cisco/create-edge-security-profile.xml | 0 .../network/cisco/create-egress-acl-rule.xml | 0 ...te-generic-egress-acl-no-protocol-rule.xml | 0 .../cisco/create-generic-egress-acl-rule.xml | 0 .../cisco/create-generic-ingress-acl-rule.xml | 0 .../network/cisco/create-ingress-acl-rule.xml | 0 .../scripts/network/cisco/create-ip-pool.xml | 0 .../network/cisco/create-nat-policy-ref.xml | 0 .../network/cisco/create-nat-policy-set.xml | 0 .../network/cisco/create-nat-policy.xml | 0 .../scripts/network/cisco/create-pf-rule.xml | 0 .../network/cisco/create-port-pool.xml | 0 .../network/cisco/create-source-nat-pool.xml | 0 .../network/cisco/create-source-nat-rule.xml | 0 .../scripts/network/cisco/create-tenant.xml | 0 .../scripts/network/cisco/create-vdc.xml | 0 .../network/cisco/delete-acl-policy-set.xml | 0 .../network/cisco/delete-acl-policy.xml | 0 .../network/cisco/delete-edge-firewall.xml | 0 .../cisco/delete-edge-security-profile.xml | 0 .../network/cisco/delete-nat-policy-set.xml | 0 .../network/cisco/delete-nat-policy.xml | 0 .../scripts/network/cisco/delete-rule.xml | 0 .../scripts/network/cisco/delete-tenant.xml | 0 .../scripts/network/cisco/delete-vdc.xml | 0 .../network/cisco/disassoc-asa1000v.xml | 0 .../network/cisco/list-acl-policies.xml | 0 .../scripts/network/cisco/list-children.xml | 0 .../network/cisco/list-nat-policies.xml | 0 .../cisco/list-policyrefs-in-policyset.xml | 0 .../scripts/network/cisco/list-tenants.xml | 0 .../cisco/list-unassigned-asa1000v.xml | 0 .../main}/scripts/network/cisco/login.xml | 0 .../cisco/CiscoVnmcConnectionTest.java | 0 .../network/element/CiscoVnmcElementTest.java | 0 .../resource/CiscoVnmcResourceTest.java | 0 plugins/network-elements/dns-notifier/pom.xml | 92 +++++++++--------- .../network/element/DnsNotifier.java | 0 .../main}/resources/components-example.xml | 0 .../com/cloud/network/ElasticLbVmMapVO.java | 0 .../element/ElasticLoadBalancerElement.java | 0 .../lb/ElasticLoadBalancerManager.java | 0 .../lb/ElasticLoadBalancerManagerImpl.java | 0 .../network/lb/LoadBalanceRuleHandler.java | 0 .../network/lb/dao/ElasticLbVmMapDao.java | 0 .../network/lb/dao/ElasticLbVmMapDaoImpl.java | 0 .../META-INF/cloudstack/elb/module.properties | 0 .../cloudstack/elb/spring-elb-context.xml | 0 .../ElasticLoadBalancerManagerImplTest.java | 0 .../lb/LoadBalanceRuleHandlerTest.java | 0 .../commands/AddExternalLoadBalancerCmd.java | 0 .../api/commands/AddF5LoadBalancerCmd.java | 0 .../commands/ConfigureF5LoadBalancerCmd.java | 0 .../DeleteExternalLoadBalancerCmd.java | 0 .../api/commands/DeleteF5LoadBalancerCmd.java | 0 .../ListExternalLoadBalancersCmd.java | 0 .../ListF5LoadBalancerNetworksCmd.java | 0 .../api/commands/ListF5LoadBalancersCmd.java | 0 .../api/response/F5LoadBalancerResponse.java | 0 .../F5ExternalLoadBalancerElement.java | 0 .../F5ExternalLoadBalancerElementService.java | 0 .../network/resource/F5BigIpResource.java | 0 .../META-INF/cloudstack/f5/module.properties | 0 .../cloudstack/f5/spring-f5-context.xml | 0 .../cloudstack/api/AddGloboDnsHostCmd.java | 0 .../commands/CreateOrUpdateDomainCommand.java | 0 ...CreateOrUpdateRecordAndReverseCommand.java | 0 .../commands/RemoveDomainCommand.java | 0 .../commands/RemoveRecordCommand.java | 0 .../cloudstack/commands/SignInCommand.java | 0 .../cloudstack/element/GloboDnsElement.java | 0 .../element/GloboDnsElementService.java | 0 .../cloudstack/resource/GloboDnsResource.java | 0 .../response/GloboDnsDomainListResponse.java | 0 .../response/GloboDnsDomainResponse.java | 0 .../response/GloboDnsExportResponse.java | 0 .../response/GloboDnsRecordListResponse.java | 0 .../response/GloboDnsRecordResponse.java | 0 .../cloudstack/globodns/module.properties | 0 .../globodns/spring-globodns-context.xml | 0 .../element/GloboDnsElementTest.java | 0 .../resource/GloboDnsResourceTest.java | 0 .../{ => src}/test/resources/db.properties | 0 .../{ => src}/test/resources/log4j.properties | 0 .../internal-loadbalancer/pom.xml | 21 ---- .../element/InternalLoadBalancerElement.java | 0 .../lb/InternalLoadBalancerVMManager.java | 0 .../lb/InternalLoadBalancerVMManagerImpl.java | 0 .../core/spring-internallb-core-context.xml | 0 .../ElementChildTestConfiguration.java | 0 .../InternalLbElementServiceTest.java | 0 .../InternalLbElementTest.java | 0 .../InternalLBVMManagerTest.java | 0 .../InternalLBVMServiceTest.java | 0 .../LbChildTestConfiguration.java | 0 .../{ => src}/test/resources/lb_element.xml | 0 .../{ => src}/test/resources/lb_mgr.xml | 0 .../{ => src}/test/resources/lb_svc.xml | 0 .../network-elements/juniper-contrail/pom.xml | 16 +-- .../api/command/CreateServiceInstanceCmd.java | 0 .../api/response/ServiceInstanceResponse.java | 0 .../contrail/management/ContrailElement.java | 0 .../management/ContrailElementImpl.java | 0 .../contrail/management/ContrailGuru.java | 0 .../contrail/management/ContrailManager.java | 0 .../management/ContrailManagerImpl.java | 0 .../management/ContrailVpcElementImpl.java | 0 .../contrail/management/DBSyncGeneric.java | 0 .../contrail/management/EventUtils.java | 0 .../management/ManagementNetworkGuru.java | 0 .../contrail/management/ModelDatabase.java | 0 .../contrail/management/ServerDBSync.java | 0 .../contrail/management/ServerDBSyncImpl.java | 0 .../management/ServerEventHandler.java | 0 .../management/ServerEventHandlerImpl.java | 0 .../contrail/management/ServiceManager.java | 0 .../management/ServiceManagerImpl.java | 0 .../management/ServiceVirtualMachine.java | 0 .../contrail/model/FloatingIpModel.java | 0 .../contrail/model/FloatingIpPoolModel.java | 0 .../contrail/model/InstanceIpModel.java | 0 .../contrail/model/ModelController.java | 0 .../network/contrail/model/ModelObject.java | 0 .../contrail/model/ModelObjectBase.java | 0 .../contrail/model/NetworkPolicyModel.java | 0 .../contrail/model/ServiceInstanceModel.java | 0 .../contrail/model/VMInterfaceModel.java | 0 .../contrail/model/VirtualMachineModel.java | 0 .../contrail/model/VirtualNetworkModel.java | 0 .../cloudstack/contrail/module.properties | 0 .../contrail/spring-contrail-context.xml | 0 ...ng-contrail-system-context-inheritable.xml | 0 .../management/ApiConnectorMockito.java | 0 .../IntegrationTestConfiguration.java | 0 .../management/ManagementServerMock.java | 0 .../management/MockAccountManager.java | 0 .../management/NetworkProviderTest.java | 0 .../management/ProviderTestConfiguration.java | 0 .../management/PublicNetworkTest.java | 0 .../PublicNetworkTestConfiguration.java | 0 .../contrail/management/TestDbSetup.java | 0 .../contrail/model/InstanceIpModelTest.java | 0 .../contrail/model/VMInterfaceModelTest.java | 0 .../model/VirtualMachineModelTest.java | 0 .../model/VirtualNetworkModelTest.java | 0 .../test/resources/commonContext.xml | 0 .../test/resources/contrail.properties | 0 .../{ => src}/test/resources/db.properties | 0 .../{ => src}/test/resources/log4j.properties | 0 .../test/resources/mysql_db_start.sh | 0 .../{ => src}/test/resources/mysql_db_stop.sh | 0 .../test/resources/providerContext.xml | 0 .../test/resources/publicNetworkContext.xml | 0 .../api/commands/AddExternalFirewallCmd.java | 0 .../cloud/api/commands/AddSrxFirewallCmd.java | 0 .../api/commands/ConfigureSrxFirewallCmd.java | 0 .../commands/DeleteExternalFirewallCmd.java | 0 .../api/commands/DeleteSrxFirewallCmd.java | 0 .../commands/ListExternalFirewallsCmd.java | 0 .../commands/ListSrxFirewallNetworksCmd.java | 0 .../api/commands/ListSrxFirewallsCmd.java | 0 .../api/response/SrxFirewallResponse.java | 0 .../JuniperSRXExternalFirewallElement.java | 0 .../JuniperSRXFirewallElementService.java | 0 .../network/resource/JuniperSrxResource.java | 0 .../META-INF/cloudstack/srx/module.properties | 0 .../cloudstack/srx/spring-srx-context.xml | 0 .../commands/AddNetscalerLoadBalancerCmd.java | 0 .../ConfigureNetscalerLoadBalancerCmd.java | 0 .../DeleteNetscalerControlCenterCmd.java | 0 .../DeleteNetscalerLoadBalancerCmd.java | 0 .../DeleteServicePackageOfferingCmd.java | 0 .../api/commands/DeployNetscalerVpxCmd.java | 0 .../ListNetscalerControlCenterCmd.java | 0 .../ListNetscalerLoadBalancerNetworksCmd.java | 0 .../ListNetscalerLoadBalancersCmd.java | 0 .../ListRegisteredServicePackageCmd.java | 0 .../RegisterNetscalerControlCenterCmd.java | 0 .../commands/RegisterServicePackageCmd.java | 0 .../api/commands/StopNetScalerVMCmd.java | 0 .../NetScalerServicePackageResponse.java | 0 .../NetscalerControlCenterResponse.java | 0 .../NetscalerLoadBalancerResponse.java | 0 .../network/NetScalerControlCenterVO.java | 0 .../com/cloud/network/NetScalerPodVO.java | 0 .../network/NetScalerServicePackageVO.java | 0 .../dao/NetScalerControlCenterDao.java | 0 .../dao/NetScalerControlCenterDaoImpl.java | 0 .../cloud/network/dao/NetScalerPodDao.java | 0 .../network/dao/NetScalerPodDaoImpl.java | 0 .../dao/NetScalerServicePackageDao.java | 0 .../dao/NetScalerServicePackageDaoImpl.java | 0 .../network/element/NetscalerElement.java | 0 .../NetscalerLoadBalancerElementService.java | 0 .../NetScalerControlCenterResource.java | 0 .../network/resource/NetscalerResource.java | 0 .../cloud/network/vm/NetScalerVMManager.java | 0 .../network/vm/NetScalerVMManagerImpl.java | 0 .../cloudstack/netscaler/module.properties | 0 .../netscaler/spring-netscaler-context.xml | 0 plugins/network-elements/nicira-nvp/pom.xml | 15 --- .../java}/com/cloud/agent/api/CmdBuilder.java | 0 .../cloud/agent/api/PingNuageVspCommand.java | 0 .../cloud/agent/api/StartupVspCommand.java | 0 .../api/element/ApplyAclRuleVspCommand.java | 0 .../api/element/ApplyStaticNatVspCommand.java | 0 .../element/ExtraDhcpOptionsVspCommand.java | 0 .../api/element/ImplementVspCommand.java | 0 .../api/element/ShutDownVpcVspCommand.java | 0 .../agent/api/element/ShutDownVspCommand.java | 0 .../api/guru/DeallocateVmVspCommand.java | 0 .../api/guru/ImplementNetworkVspCommand.java | 0 .../guru/ReserveVmInterfaceVspCommand.java | 0 .../api/guru/TrashNetworkVspCommand.java | 0 .../api/guru/UpdateDhcpOptionVspCommand.java | 0 .../api/manager/CleanUpDomainCommand.java | 0 .../api/manager/EntityExistsCommand.java | 0 .../api/manager/GetApiDefaultsAnswer.java | 0 .../api/manager/GetApiDefaultsCommand.java | 0 .../manager/ImplementNetworkVspAnswer.java | 0 .../manager/ListVspDomainTemplatesAnswer.java | 0 .../ListVspDomainTemplatesCommand.java | 0 .../manager/SupportedApiVersionCommand.java | 0 .../manager/UpdateNuageVspDeviceCommand.java | 0 .../agent/api/sync/SyncDomainAnswer.java | 0 .../agent/api/sync/SyncDomainCommand.java | 0 .../api/sync/SyncNuageVspCmsIdAnswer.java | 0 .../api/sync/SyncNuageVspCmsIdCommand.java | 0 .../api/commands/AddNuageVspDeviceCmd.java | 0 .../AssociateNuageVspDomainTemplateCmd.java | 0 .../api/commands/DeleteNuageVspDeviceCmd.java | 0 .../DisableNuageUnderlayVlanIpRangeCmd.java | 0 .../EnableNuageUnderlayVlanIpRangeCmd.java | 0 .../ListNuageUnderlayVlanIpRangesCmd.java | 0 .../api/commands/ListNuageVspDevicesCmd.java | 0 .../ListNuageVspDomainTemplatesCmd.java | 0 .../ListNuageVspGlobalDomainTemplateCmd.java | 0 .../api/commands/UpdateNuageVspDeviceCmd.java | 0 .../com/cloud/api/commands/VspConstants.java | 0 .../response/NuageVlanIpRangeResponse.java | 0 .../api/response/NuageVspDeviceResponse.java | 0 .../NuageVspDomainTemplateResponse.java | 0 .../response/NuageVspResourceResponse.java | 0 .../com/cloud/network/NuageVspDeviceVO.java | 0 .../com/cloud/network/dao/NuageVspDao.java | 0 .../cloud/network/dao/NuageVspDaoImpl.java | 0 .../network/element/NuageVspElement.java | 0 .../guru/NuageVspGuestNetworkGuru.java | 0 .../network/manager/AbstractListener.java | 0 .../network/manager/NuageVspManager.java | 0 .../network/manager/NuageVspManagerImpl.java | 0 .../resource/NuageVspRequestWrapper.java | 0 .../network/resource/NuageVspResource.java | 0 .../NuageVspResourceConfiguration.java | 0 .../network/resource/VspStatisticsMBean.java | 0 .../resource/VspStatisticsMBeanImpl.java | 0 .../NuageVspApiSupportCommandWrapper.java | 0 .../NuageVspApplyAclRulesCommandWrapper.java | 0 .../NuageVspApplyStaticNatCommandWrapper.java | 0 .../NuageVspCleanupDomainCommandWrapper.java | 0 .../wrapper/NuageVspCommandWrapper.java | 0 ...spDeallocateVmInterfaceCommandWrapper.java | 0 .../NuageVspEntityExistsCommandWrapper.java | 0 .../NuageVspGetApiDefaultsCommandWrapper.java | 0 ...VspGuruImplementNetworkCommandWrapper.java | 0 ...uageVspGuruTrashNetworkCommandWrapper.java | 0 ...uageVspImplementNetworkCommandWrapper.java | 0 ...eVspListDomainTemplatesCommandWrapper.java | 0 .../NuageVspMaintainCommandWrapper.java | 0 .../wrapper/NuageVspReadyCommandWrapper.java | 0 ...geVspReserveVmInterfaceCommandWrapper.java | 0 ...NuageVspShutdownNetworkCommandWrapper.java | 0 .../NuageVspShutdownVpcCommandWrapper.java | 0 .../NuageVspSyncCmsIdCommandWrapper.java | 0 .../NuageVspSyncDomainCommandWrapper.java | 0 ...ageVspUpdateDhcpOptionsCommandWrapper.java | 0 .../UpdateNuageVspDeviceCommandWrapper.java | 0 .../com/cloud/util/NuageVspEntityBuilder.java | 0 .../java}/com/cloud/util/NuageVspUtil.java | 0 .../NuageVspCheckHealthCommandWrapper.java | 0 ...uageVspExtraDhcpOptionsCommandWrapper.java | 0 .../META-INF/cloudstack/vsp/module.properties | 0 .../cloudstack/vsp/spring-vsp-context.xml | 0 .../test/java}/com/cloud/NuageTest.java | 0 .../com/cloud/agent/api/CommandsTest.java | 0 .../network/element/NuageVspElementTest.java | 0 .../guru/NuageVspGuestNetworkGuruTest.java | 0 .../network/manager/NuageVspManagerTest.java | 0 .../resource/NuageVspResourceTest.java | 0 .../cloud/util/NuageVspEntityBuilderTest.java | 0 .../com/cloud/util/NuageVspUtilTest.java | 0 plugins/network-elements/opendaylight/pom.xml | 16 --- .../agent/api/OvsCreateGreTunnelAnswer.java | 0 .../agent/api/OvsCreateGreTunnelCommand.java | 0 .../agent/api/OvsCreateTunnelAnswer.java | 0 .../agent/api/OvsCreateTunnelCommand.java | 0 .../cloud/agent/api/OvsDeleteFlowCommand.java | 0 .../agent/api/OvsDestroyBridgeCommand.java | 0 .../agent/api/OvsDestroyTunnelCommand.java | 0 .../agent/api/OvsFetchInterfaceAnswer.java | 0 .../agent/api/OvsFetchInterfaceCommand.java | 0 .../agent/api/OvsSetTagAndFlowAnswer.java | 0 .../agent/api/OvsSetTagAndFlowCommand.java | 0 .../agent/api/OvsSetupBridgeCommand.java | 0 .../OvsVpcPhysicalTopologyConfigCommand.java | 0 .../api/OvsVpcRoutingPolicyConfigCommand.java | 0 .../cloud/agent/api/StartupOvsCommand.java | 0 .../com/cloud/network/element/OvsElement.java | 0 .../network/element/OvsElementService.java | 0 .../network/guru/OvsGuestNetworkGuru.java | 0 .../cloud/network/ovs/GreTunnelException.java | 0 .../network/ovs/OvsNetworkTopologyGuru.java | 0 .../ovs/OvsNetworkTopologyGuruImpl.java | 0 .../cloud/network/ovs/OvsTunnelManager.java | 0 .../network/ovs/OvsTunnelManagerImpl.java | 0 .../com/cloud/network/ovs/dao/OvsTunnel.java | 0 .../ovs/dao/OvsTunnelInterfaceDao.java | 0 .../ovs/dao/OvsTunnelInterfaceDaoImpl.java | 0 .../network/ovs/dao/OvsTunnelInterfaceVO.java | 0 .../network/ovs/dao/OvsTunnelNetworkDao.java | 0 .../ovs/dao/OvsTunnelNetworkDaoImpl.java | 0 .../network/ovs/dao/OvsTunnelNetworkVO.java | 0 .../ovs/dao/VpcDistributedRouterSeqNoDao.java | 0 .../dao/VpcDistributedRouterSeqNoDaoImpl.java | 0 .../ovs/dao/VpcDistributedRouterSeqNoVO.java | 0 .../META-INF/cloudstack/ovs/module.properties | 0 .../cloudstack/ovs/spring-ovs-context.xml | 0 .../api/commands/AddPaloAltoFirewallCmd.java | 0 .../ConfigurePaloAltoFirewallCmd.java | 0 .../commands/DeletePaloAltoFirewallCmd.java | 0 .../ListPaloAltoFirewallNetworksCmd.java | 0 .../commands/ListPaloAltoFirewallsCmd.java | 0 .../response/PaloAltoFirewallResponse.java | 0 .../PaloAltoExternalFirewallElement.java | 0 .../PaloAltoFirewallElementService.java | 0 .../network/resource/PaloAltoResource.java | 0 .../network/utils/HttpClientWrapper.java | 0 .../cloudstack/paloalto/module.properties | 0 .../paloalto/spring-paloalto-context.xml | 0 .../resource/MockablePaloAltoResource.java | 0 .../resource/PaloAltoResourceTest.java | 0 .../cloudstack/api/commands/AddSspCmd.java | 0 .../cloudstack/api/commands/DeleteSspCmd.java | 0 .../cloudstack/api/response/SspResponse.java | 0 .../network/dao/SspCredentialDao.java | 0 .../network/dao/SspCredentialDaoImpl.java | 0 .../network/dao/SspCredentialVO.java | 0 .../cloudstack/network/dao/SspTenantDao.java | 0 .../network/dao/SspTenantDaoImpl.java | 0 .../cloudstack/network/dao/SspTenantVO.java | 0 .../cloudstack/network/dao/SspUuidDao.java | 0 .../network/dao/SspUuidDaoImpl.java | 0 .../cloudstack/network/dao/SspUuidVO.java | 0 .../cloudstack/network/element/SspClient.java | 0 .../network/element/SspElement.java | 0 .../network/element/SspManager.java | 0 .../network/element/SspService.java | 0 .../network/guru/SspGuestNetworkGuru.java | 0 .../META-INF/cloudstack/ssp/module.properties | 0 .../cloudstack/ssp/spring-ssp-context.xml | 0 .../network/element/SspClientTest.java | 0 .../network/element/SspElementTest.java | 0 .../network/guru/VxlanGuestNetworkGuru.java | 0 .../cloudstack/vxlan/module.properties | 0 .../cloudstack/vxlan/spring-vxlan-context.xml | 0 .../guru/VxlanGuestNetworkGuruTest.java | 0 .../IpmitoolOutOfBandManagementDriver.java | 0 .../driver/ipmitool/IpmitoolWrapper.java | 0 .../cloudstack/ipmitool/module.properties | 0 .../ipmitool/spring-ipmitool-context.xml | 0 .../driver/ipmitool/IpmitoolWrapperTest.java | 0 ...edCloudStackOutOfBandManagementDriver.java | 0 .../nested-cloudstack/module.properties | 0 .../spring-nested-cloudstack-context.xml | 0 ...oudStackOutOfBandManagementDriverTest.java | 0 .../allocator/RandomStoragePoolAllocator.java | 0 .../CloudStackImageStoreDriverImpl.java | 0 .../CloudStackImageStoreLifeCycleImpl.java | 0 .../CloudStackImageStoreProviderImpl.java | 0 .../storage-image-default/module.properties | 0 .../spring-storage-image-default-context.xml | 0 .../driver/S3ImageStoreDriverImpl.java | 0 .../lifecycle/S3ImageStoreLifeCycleImpl.java | 0 .../provider/S3ImageStoreProviderImpl.java | 0 .../storage-image-s3/module.properties | 0 .../spring-storage-image-s3-context.xml | 0 .../driver/SampleImageStoreDriverImpl.java | 0 .../SampleImageStoreLifeCycleImpl.java | 0 .../SampleImageStoreProviderImpl.java | 0 .../driver/SwiftImageStoreDriverImpl.java | 0 .../SwiftImageStoreLifeCycleImpl.java | 0 .../provider/SwiftImageStoreProviderImpl.java | 0 .../storage-image-swift/module.properties | 0 .../spring-storage-image-swift-context.xml | 0 plugins/storage/volume/cloudbyte/pom.xml | 2 - .../ElastistorPrimaryDataStoreDriver.java | 0 .../ElastistorPrimaryDataStoreLifeCycle.java | 0 .../provider/ElastistorHostListener.java | 0 .../ElastistorPrimaryDataStoreProvider.java | 0 .../datastore/util/ElastistorUtil.java | 0 .../util/ElastistorVolumeApiService.java | 0 .../util/ElastistorVolumeApiServiceImpl.java | 0 .../util/ListElastistorInterfaceCmd.java | 0 .../util/ListElastistorInterfaceResponse.java | 0 .../datastore/util/ListElastistorPoolCmd.java | 0 .../util/ListElastistorPoolResponse.java | 0 .../util/ListElastistorVolumeCmd.java | 0 .../util/ListElastistorVolumeResponse.java | 0 .../module.properties | 0 ...pring-storage-volume-cloudbyte-context.xml | 0 .../CloudStackPrimaryDataStoreDriverImpl.java | 0 ...oudStackPrimaryDataStoreLifeCycleImpl.java | 0 ...loudStackPrimaryDataStoreProviderImpl.java | 0 .../storage-volume-default/module.properties | 0 .../spring-storage-volume-default-context.xml | 0 ...tackPrimaryDataStoreLifeCycleImplTest.java | 0 .../driver/NexentaPrimaryDataStoreDriver.java | 0 .../NexentaPrimaryDataStoreLifeCycle.java | 0 .../provider/NexentaHostListener.java | 0 .../NexentaPrimaryDataStoreProvider.java | 0 .../datastore/util/NexentaNmsClient.java | 0 .../storage/datastore/util/NexentaNmsUrl.java | 0 .../datastore/util/NexentaStorAppliance.java | 0 .../storage/datastore/util/NexentaUtil.java | 0 .../module.properties | 0 .../spring-storage-volume-nexenta-context.xml | 0 .../util/NexentaStorApplianceTest.java | 0 .../datastore/util/NexentaUtilTest.java | 0 .../SamplePrimaryDataStoreDriverImpl.java | 0 .../SamplePrimaryDataStoreLifeCycleImpl.java | 0 .../SamplePrimaryDatastoreProviderImpl.java | 0 .../SolidFirePrimaryDataStoreDriver.java | 0 ...SolidFireSharedPrimaryDataStoreDriver.java | 0 .../SolidFirePrimaryDataStoreLifeCycle.java | 0 ...idFireSharedPrimaryDataStoreLifeCycle.java | 0 .../provider/SolidFireHostListener.java | 0 .../SolidFirePrimaryDataStoreProvider.java | 0 .../provider/SolidFireSharedHostListener.java | 0 ...lidFireSharedPrimaryDataStoreProvider.java | 0 .../storage/datastore/util/SolidFireUtil.java | 0 .../module.properties | 0 ...pring-storage-volume-solidfire-context.xml | 0 .../storage/test/AopTestAdvice.java | 0 .../storage/test/ChildTestConfiguration.java | 0 .../storage/test/TestConfiguration.java | 0 .../cloudstack/storage/test/VolumeTest.java | 0 .../test/resource/storageContext.xml | 0 .../api/command/LinkAccountToLdapCmd.java | 0 .../response/LinkAccountToLdapResponse.java | 0 .../cloudstack/api/command/LDAPConfigCmd.java | 0 .../cloudstack/api/command/LDAPRemoveCmd.java | 0 .../api/command/LdapAddConfigurationCmd.java | 0 .../api/command/LdapCreateAccountCmd.java | 0 .../command/LdapDeleteConfigurationCmd.java | 0 .../api/command/LdapImportUsersCmd.java | 0 .../api/command/LdapListConfigurationCmd.java | 0 .../api/command/LdapListUsersCmd.java | 0 .../api/command/LdapUserSearchCmd.java | 0 .../api/command/LinkDomainToLdapCmd.java | 0 .../api/response/LDAPConfigResponse.java | 0 .../api/response/LDAPRemoveResponse.java | 0 .../response/LdapConfigurationResponse.java | 0 .../api/response/LdapUserResponse.java | 0 .../response/LinkDomainToLdapResponse.java | 0 .../ldap/ADLdapUserManagerImpl.java | 0 .../cloudstack/ldap/LdapAuthenticator.java | 0 .../cloudstack/ldap/LdapConfiguration.java | 0 .../cloudstack/ldap/LdapConfigurationVO.java | 0 .../cloudstack/ldap/LdapContextFactory.java | 0 .../apache/cloudstack/ldap/LdapManager.java | 0 .../cloudstack/ldap/LdapManagerImpl.java | 0 .../cloudstack/ldap/LdapTrustMapVO.java | 0 .../org/apache/cloudstack/ldap/LdapUser.java | 0 .../cloudstack/ldap/LdapUserManager.java | 0 .../ldap/LdapUserManagerFactory.java | 0 .../org/apache/cloudstack/ldap/LdapUtils.java | 0 .../NoLdapUserMatchingQueryException.java | 0 .../ldap/OpenLdapUserManagerImpl.java | 0 .../ldap/dao/LdapConfigurationDao.java | 0 .../ldap/dao/LdapConfigurationDaoImpl.java | 0 .../cloudstack/ldap/dao/LdapTrustMapDao.java | 0 .../ldap/dao/LdapTrustMapDaoImpl.java | 0 .../cloudstack/ldap/module.properties | 0 .../cloudstack/ldap/spring-ldap-context.xml | 0 .../ldap/ADLdapUserManagerImplSpec.groovy | 0 .../ldap/BasicNamingEnumerationImpl.groovy | 0 .../ldap/LdapAddConfigurationCmdSpec.groovy | 0 .../ldap/LdapAuthenticatorSpec.groovy | 0 .../ldap/LdapConfigurationDaoImplSpec.groovy | 0 .../ldap/LdapConfigurationResponseSpec.groovy | 0 .../ldap/LdapConfigurationSpec.groovy | 0 .../ldap/LdapConfigurationVOSpec.groovy | 0 .../ldap/LdapContextFactorySpec.groovy | 0 .../ldap/LdapCreateAccountCmdSpec.groovy | 0 .../LdapDeleteConfigurationCmdSpec.groovy | 0 .../ldap/LdapImportUsersCmdSpec.groovy | 0 .../ldap/LdapListConfigurationCmdSpec.groovy | 0 .../ldap/LdapListUsersCmdSpec.groovy | 0 .../ldap/LdapManagerImplSpec.groovy | 0 .../ldap/LdapSearchUserCmdSpec.groovy | 0 .../ldap/LdapUserManagerFactorySpec.groovy | 0 .../ldap/LdapUserResponseSpec.groovy | 0 .../cloudstack/ldap/LdapUserSpec.groovy | 0 .../cloudstack/ldap/LdapUtilsSpec.groovy | 0 .../ldap/LinkDomainToLdapCmdSpec.groovy | 0 ...oLdapUserMatchingQueryExceptionSpec.groovy | 0 .../ldap/OpenLdapUserManagerSpec.groovy | 0 .../api/command/LdapConfigurationChanger.java | 0 .../api/command/LdapCreateAccountCmdTest.java | 0 .../api/command/LdapImportUsersCmdTest.java | 0 .../api/command/LinkAccountToLdapCmdTest.java | 0 .../api/command/LinkDomainToLdapCmdTest.java | 0 .../ldap/LdapConfigurationTest.java | 0 .../test/resources/cloudstack.org.ldif | 0 .../server/auth/MD5UserAuthenticator.java | 0 .../META-INF/cloudstack/md5/module.properties | 0 .../cloudstack/md5/spring-md5-context.xml | 0 .../server/auth/MD5UserAuthenticatorTest.java | 0 .../server/auth/PBKDF2UserAuthenticator.java | 0 .../cloudstack/pbkdf2/module.properties | 0 .../pbkdf2/spring-pbkdf2-context.xml | 0 .../auth/PBKD2UserAuthenticatorTest.java | 0 .../auth/PlainTextUserAuthenticator.java | 0 .../cloudstack/plaintext/module.properties | 0 .../plaintext/spring-plaintext-context.xml | 0 .../api/command/AuthorizeSAMLSSOCmd.java | 0 .../GetServiceProviderMetaDataCmd.java | 0 .../command/ListAndSwitchSAMLAccountCmd.java | 0 .../cloudstack/api/command/ListIdpsCmd.java | 0 .../api/command/ListSamlAuthorizationCmd.java | 0 .../SAML2LoginAPIAuthenticatorCmd.java | 0 .../SAML2LogoutAPIAuthenticatorCmd.java | 0 .../cloudstack/api/response/IdpResponse.java | 0 .../api/response/SAMLMetaDataResponse.java | 0 .../response/SamlAuthorizationResponse.java | 0 .../api/response/SamlUserAccountResponse.java | 0 .../cloudstack/saml/SAML2AuthManager.java | 0 .../cloudstack/saml/SAML2AuthManagerImpl.java | 0 .../saml/SAML2UserAuthenticator.java | 0 .../cloudstack/saml/SAMLPluginConstants.java | 0 .../cloudstack/saml/SAMLProviderMetadata.java | 0 .../apache/cloudstack/saml/SAMLTokenDao.java | 0 .../cloudstack/saml/SAMLTokenDaoImpl.java | 0 .../apache/cloudstack/saml/SAMLTokenVO.java | 0 .../org/apache/cloudstack/saml/SAMLUtils.java | 0 .../cloudstack/saml2/module.properties | 0 .../cloudstack/saml2/spring-saml2-context.xml | 0 .../GetServiceProviderMetaDataCmdTest.java | 0 .../cloudstack/SAML2AuthManagerImplTest.java | 0 .../SAML2UserAuthenticatorTest.java | 0 .../org/apache/cloudstack/SAMLUtilsTest.java | 0 .../ListAndSwitchSAMLAccountCmdTest.java | 0 .../SAML2LoginAPIAuthenticatorCmdTest.java | 0 .../SAML2LogoutAPIAuthenticatorCmdTest.java | 0 .../saml/SAML2AuthManagerImplTest.java | 0 .../auth/SHA256SaltedUserAuthenticator.java | 0 .../cloudstack/sha256salted/module.properties | 0 .../spring-sha256salted-context.xml | 0 .../server/auth/test/AuthenticatorTest.java | 2 +- pom.xml | 15 --- quickcloud/pom.xml | 4 +- server/pom.xml | 8 -- .../com/cloud/account/SecurityManager.java | 0 .../cloud/acl/AffinityGroupAccessChecker.java | 0 .../java}/com/cloud/acl/DomainChecker.java | 0 .../allocator/impl/FirstFitAllocator.java | 0 .../impl/FirstFitRoutingAllocator.java | 0 .../allocator/impl/RecreateHostAllocator.java | 0 .../allocator/impl/TestingAllocator.java | 0 .../impl/UserConcentratedAllocator.java | 0 .../manager/authn/AgentAuthnException.java | 0 .../agent/manager/authn/AgentAuthorizer.java | 0 .../authn/impl/BasicAgentAuthManager.java | 0 .../com/cloud/alert/AlertManagerImpl.java | 0 .../com/cloud/alert/ClusterAlertAdapter.java | 0 .../cloud/alert/ConsoleProxyAlertAdapter.java | 0 .../alert/SecondaryStorageVmAlertAdapter.java | 0 .../com/cloud/api/ApiAsyncJobDispatcher.java | 0 .../java}/com/cloud/api/ApiDBUtils.java | 0 .../java}/com/cloud/api/ApiDispatcher.java | 0 .../java}/com/cloud/api/ApiGsonHelper.java | 0 .../com/cloud/api/ApiResponseGsonHelper.java | 0 .../com/cloud/api/ApiResponseHelper.java | 0 .../com/cloud/api/ApiSerializerHelper.java | 0 .../java}/com/cloud/api/ApiServer.java | 0 .../java}/com/cloud/api/ApiServlet.java | 0 .../cloud/api/EncodedStringTypeAdapter.java | 0 .../cloud/api/ResponseObjectTypeAdapter.java | 0 .../com/cloud/api/SerializationContext.java | 0 .../com/cloud/api/StringMapTypeAdapter.java | 0 .../auth/APIAuthenticationManagerImpl.java | 0 .../auth/DefaultLoginAPIAuthenticatorCmd.java | 0 .../DefaultLogoutAPIAuthenticatorCmd.java | 0 .../api/dispatch/CommandCreationWorker.java | 0 .../com/cloud/api/dispatch/DispatchChain.java | 0 .../api/dispatch/DispatchChainFactory.java | 0 .../com/cloud/api/dispatch/DispatchTask.java | 0 .../cloud/api/dispatch/DispatchWorker.java | 0 .../ParamGenericValidationWorker.java | 0 .../api/dispatch/ParamProcessWorker.java | 0 .../cloud/api/dispatch/ParamUnpackWorker.java | 0 .../dispatch/SpecificCmdValidationWorker.java | 0 .../java}/com/cloud/api/doc/Alert.java | 0 .../com/cloud/api/doc/ApiXmlDocReader.java | 0 .../com/cloud/api/doc/ApiXmlDocWriter.java | 0 .../java}/com/cloud/api/doc/Argument.java | 0 .../java}/com/cloud/api/doc/Command.java | 0 .../query/MutualExclusiveIdsManagerBase.java | 0 .../com/cloud/api/query/QueryManagerImpl.java | 0 .../cloud/api/query/ViewResponseHelper.java | 0 .../cloud/api/query/dao/AccountJoinDao.java | 0 .../api/query/dao/AccountJoinDaoImpl.java | 0 .../api/query/dao/AffinityGroupJoinDao.java | 0 .../query/dao/AffinityGroupJoinDaoImpl.java | 0 .../cloud/api/query/dao/AsyncJobJoinDao.java | 0 .../api/query/dao/AsyncJobJoinDaoImpl.java | 0 .../api/query/dao/DataCenterJoinDao.java | 0 .../api/query/dao/DataCenterJoinDaoImpl.java | 0 .../api/query/dao/DiskOfferingJoinDao.java | 0 .../query/dao/DiskOfferingJoinDaoImpl.java | 0 .../cloud/api/query/dao/DomainJoinDao.java | 0 .../api/query/dao/DomainJoinDaoImpl.java | 0 .../api/query/dao/DomainRouterJoinDao.java | 0 .../query/dao/DomainRouterJoinDaoImpl.java | 0 .../dao/GenericDaoBaseWithTagInformation.java | 0 .../com/cloud/api/query/dao/HostJoinDao.java | 0 .../cloud/api/query/dao/HostJoinDaoImpl.java | 0 .../com/cloud/api/query/dao/HostTagDao.java | 0 .../cloud/api/query/dao/HostTagDaoImpl.java | 0 .../api/query/dao/ImageStoreJoinDao.java | 0 .../api/query/dao/ImageStoreJoinDaoImpl.java | 0 .../api/query/dao/InstanceGroupJoinDao.java | 0 .../query/dao/InstanceGroupJoinDaoImpl.java | 0 .../api/query/dao/ProjectAccountJoinDao.java | 0 .../query/dao/ProjectAccountJoinDaoImpl.java | 0 .../query/dao/ProjectInvitationJoinDao.java | 0 .../dao/ProjectInvitationJoinDaoImpl.java | 0 .../cloud/api/query/dao/ProjectJoinDao.java | 0 .../api/query/dao/ProjectJoinDaoImpl.java | 0 .../api/query/dao/ResourceTagJoinDao.java | 0 .../api/query/dao/ResourceTagJoinDaoImpl.java | 0 .../api/query/dao/SecurityGroupJoinDao.java | 0 .../query/dao/SecurityGroupJoinDaoImpl.java | 0 .../api/query/dao/ServiceOfferingJoinDao.java | 0 .../query/dao/ServiceOfferingJoinDaoImpl.java | 0 .../api/query/dao/StoragePoolJoinDao.java | 0 .../api/query/dao/StoragePoolJoinDaoImpl.java | 0 .../cloud/api/query/dao/TemplateJoinDao.java | 0 .../api/query/dao/TemplateJoinDaoImpl.java | 0 .../api/query/dao/UserAccountJoinDao.java | 0 .../api/query/dao/UserAccountJoinDaoImpl.java | 0 .../cloud/api/query/dao/UserVmJoinDao.java | 0 .../api/query/dao/UserVmJoinDaoImpl.java | 0 .../cloud/api/query/dao/VolumeJoinDao.java | 0 .../api/query/dao/VolumeJoinDaoImpl.java | 0 .../com/cloud/api/query/vo/AccountJoinVO.java | 0 .../api/query/vo/AffinityGroupJoinVO.java | 0 .../cloud/api/query/vo/AsyncJobJoinVO.java | 0 .../com/cloud/api/query/vo/BaseViewVO.java | 0 .../vo/BaseViewWithTagInformationVO.java | 0 .../api/query/vo/ControlledViewEntity.java | 0 .../cloud/api/query/vo/DataCenterJoinVO.java | 0 .../api/query/vo/DiskOfferingJoinVO.java | 0 .../com/cloud/api/query/vo/DomainJoinVO.java | 0 .../api/query/vo/DomainRouterJoinVO.java | 0 .../com/cloud/api/query/vo/EventJoinVO.java | 0 .../com/cloud/api/query/vo/HostJoinVO.java | 0 .../com/cloud/api/query/vo/HostTagVO.java | 0 .../cloud/api/query/vo/ImageStoreJoinVO.java | 0 .../api/query/vo/InstanceGroupJoinVO.java | 0 .../api/query/vo/ProjectAccountJoinVO.java | 0 .../api/query/vo/ProjectInvitationJoinVO.java | 0 .../com/cloud/api/query/vo/ProjectJoinVO.java | 0 .../cloud/api/query/vo/ResourceTagJoinVO.java | 0 .../api/query/vo/SecurityGroupJoinVO.java | 0 .../api/query/vo/ServiceOfferingJoinVO.java | 0 .../cloud/api/query/vo/StoragePoolJoinVO.java | 0 .../cloud/api/query/vo/TemplateJoinVO.java | 0 .../cloud/api/query/vo/UserAccountJoinVO.java | 0 .../com/cloud/api/query/vo/UserVmJoinVO.java | 0 .../com/cloud/api/query/vo/VolumeJoinVO.java | 0 .../api/response/ApiResponseSerializer.java | 0 .../response/EmptyFieldExclusionStrategy.java | 0 .../response/SecurityGroupResultObject.java | 0 .../SecurityGroupRuleResultObject.java | 0 .../java}/com/cloud/async/AsyncJobResult.java | 0 .../cloud/capacity/CapacityManagerImpl.java | 0 .../capacity/ComputeCapacityListener.java | 0 .../capacity/StorageCapacityListener.java | 0 .../network/NetworkMigrationManager.java | 0 .../network/NetworkMigrationManagerImpl.java | 0 .../java}/com/cloud/configuration/Config.java | 0 .../ConfigurationManagerImpl.java | 0 .../com/cloud/configuration/ZoneConfig.java | 0 .../AgentBasedConsoleProxyManager.java | 0 ...entBasedStandaloneConsoleProxyManager.java | 0 .../com/cloud/consoleproxy/AgentHook.java | 0 .../com/cloud/consoleproxy/AgentHookBase.java | 0 .../ConsoleProxyAlertEventArgs.java | 0 .../ConsoleProxyBalanceAllocator.java | 0 .../consoleproxy/ConsoleProxyListener.java | 0 .../ConsoleProxyManagementState.java | 0 .../consoleproxy/ConsoleProxyManager.java | 0 .../consoleproxy/ConsoleProxyManagerImpl.java | 0 .../consoleproxy/ConsoleProxyService.java | 0 .../StaticConsoleProxyManager.java | 0 .../com/cloud/dc/DedicatedResourceVO.java | 0 .../cloud/dc/dao/DedicatedResourceDao.java | 0 .../dc/dao/DedicatedResourceDaoImpl.java | 0 .../deploy/DeploymentPlanningManagerImpl.java | 0 .../com/cloud/deploy/FirstFitPlanner.java | 0 .../deploy/PlannerHostReservationVO.java | 0 .../deploy/dao/PlannerHostReservationDao.java | 0 .../dao/PlannerHostReservationDaoImpl.java | 0 .../cloud/event/ActionEventInterceptor.java | 0 .../com/cloud/event/ActionEventUtils.java | 0 .../java}/com/cloud/event/AlertGenerator.java | 0 .../com/cloud/event/dao/EventJoinDao.java | 0 .../com/cloud/event/dao/EventJoinDaoImpl.java | 0 .../cloud/ha/AbstractInvestigatorImpl.java | 0 .../cloud/ha/CheckOnAgentInvestigator.java | 0 .../java}/com/cloud/ha/HaWorkVO.java | 0 .../ha/HighAvailabilityManagerExtImpl.java | 0 .../cloud/ha/HighAvailabilityManagerImpl.java | 0 .../java}/com/cloud/ha/KVMFencer.java | 0 .../ha/ManagementIPSystemVMInvestigator.java | 0 .../java}/com/cloud/ha/RecreatableFencer.java | 0 .../com/cloud/ha/UserVmDomRInvestigator.java | 0 .../com/cloud/ha/XenServerInvestigator.java | 0 .../com/cloud/ha/dao/HighAvailabilityDao.java | 0 .../cloud/ha/dao/HighAvailabilityDaoImpl.java | 0 .../CloudZonesStartupProcessor.java | 0 .../cloud/hypervisor/HypervisorGuruBase.java | 0 .../hypervisor/HypervisorGuruManagerImpl.java | 0 .../java}/com/cloud/hypervisor/KVMGuru.java | 0 .../java}/com/cloud/hypervisor/LXCGuru.java | 0 .../kvm/discoverer/KvmDummyResourceBase.java | 0 .../kvm/discoverer/KvmServerDiscoverer.java | 0 .../discoverer/LibvirtServerDiscoverer.java | 0 .../kvm/discoverer/LxcServerDiscoverer.java | 0 .../metadata/ResourceMetaDataManager.java | 0 .../metadata/ResourceMetaDataManagerImpl.java | 0 .../network/ExternalDeviceUsageManager.java | 0 .../ExternalDeviceUsageManagerImpl.java | 0 .../ExternalFirewallDeviceManager.java | 0 .../ExternalFirewallDeviceManagerImpl.java | 0 .../network/ExternalIpAddressAllocator.java | 0 .../ExternalLoadBalancerDeviceManager.java | 0 ...ExternalLoadBalancerDeviceManagerImpl.java | 0 .../ExternalNetworkDeviceManagerImpl.java | 0 .../com/cloud/network/IpAddrAllocator.java | 0 .../cloud/network/IpAddressManagerImpl.java | 0 .../com/cloud/network/Ipv6AddressManager.java | 0 .../cloud/network/Ipv6AddressManagerImpl.java | 0 .../com/cloud/network/NetworkModelImpl.java | 0 .../com/cloud/network/NetworkServiceImpl.java | 0 .../cloud/network/NetworkUsageManager.java | 0 .../network/NetworkUsageManagerImpl.java | 0 .../cloud/network/PortProfileManagerImpl.java | 0 .../cloud/network/SshKeysDistriMonitor.java | 0 .../cloud/network/StorageNetworkManager.java | 0 .../network/StorageNetworkManagerImpl.java | 0 .../cloud/network/as/AutoScaleManager.java | 0 .../network/as/AutoScaleManagerImpl.java | 0 .../element/CloudZonesNetworkElement.java | 0 .../element/ConfigDriveNetworkElement.java | 0 .../network/element/SecurityGroupElement.java | 0 .../network/element/VirtualRouterElement.java | 0 .../element/VpcVirtualRouterElement.java | 0 .../network/firewall/FirewallManagerImpl.java | 0 .../network/guru/ControlNetworkGuru.java | 0 .../cloud/network/guru/DirectNetworkGuru.java | 0 .../guru/DirectPodBasedNetworkGuru.java | 0 .../guru/ExternalGuestNetworkGuru.java | 0 .../cloud/network/guru/GuestNetworkGuru.java | 0 .../network/guru/PodBasedNetworkGuru.java | 0 .../network/guru/PrivateNetworkGuru.java | 0 .../cloud/network/guru/PublicNetworkGuru.java | 0 .../network/guru/StorageNetworkGuru.java | 0 .../network/lb/LBHealthCheckManager.java | 0 .../network/lb/LBHealthCheckManagerImpl.java | 0 .../lb/LoadBalancingRulesManagerImpl.java | 0 .../network/router/CommandSetupHelper.java | 0 .../cloud/network/router/NetworkHelper.java | 0 .../network/router/NetworkHelperImpl.java | 0 .../network/router/NicProfileHelper.java | 0 .../network/router/NicProfileHelperImpl.java | 0 .../network/router/RouterControlHelper.java | 0 .../VirtualNetworkApplianceManager.java | 0 .../VirtualNetworkApplianceManagerImpl.java | 0 .../network/router/VpcNetworkHelperImpl.java | 0 .../VpcVirtualNetworkApplianceManager.java | 0 ...VpcVirtualNetworkApplianceManagerImpl.java | 0 .../cloud/network/rules/AdvancedVpnRules.java | 0 .../cloud/network/rules/BasicVpnRules.java | 0 .../cloud/network/rules/DhcpEntryRules.java | 0 .../cloud/network/rules/DhcpPvlanRules.java | 0 .../cloud/network/rules/DhcpSubNetRules.java | 0 .../cloud/network/rules/FirewallRules.java | 0 .../network/rules/IpAssociationRules.java | 0 .../network/rules/LoadBalancingRules.java | 0 .../cloud/network/rules/NetworkAclsRules.java | 0 .../network/rules/NicPlugInOutRules.java | 0 .../network/rules/PasswordToRouterRules.java | 0 .../network/rules/PrivateGatewayRules.java | 0 .../com/cloud/network/rules/RuleApplier.java | 0 .../network/rules/RuleApplierWrapper.java | 0 .../cloud/network/rules/RulesManagerImpl.java | 0 .../network/rules/SshKeyToRouterRules.java | 0 .../cloud/network/rules/StaticNatImpl.java | 0 .../cloud/network/rules/StaticNatRules.java | 0 .../network/rules/StaticRoutesRules.java | 0 .../cloud/network/rules/UserdataPwdRules.java | 0 .../network/rules/UserdataToRouterRules.java | 0 .../rules/VirtualNetworkApplianceFactory.java | 0 .../network/rules/VpcIpAssociationRules.java | 0 .../security/LocalSecurityGroupWorkQueue.java | 0 .../cloud/network/security/RuleUpdateLog.java | 0 .../security/SecurityGroupListener.java | 0 .../security/SecurityGroupManager.java | 0 .../security/SecurityGroupManagerImpl.java | 0 .../security/SecurityGroupManagerImpl2.java | 0 .../security/SecurityGroupManagerMBean.java | 0 .../security/SecurityGroupWorkQueue.java | 0 .../security/SecurityGroupWorkTracker.java | 0 .../security/SecurityManagerMBeanImpl.java | 0 .../network/vpc/NetworkACLManagerImpl.java | 0 .../network/vpc/NetworkACLServiceImpl.java | 0 .../network/vpc/PrivateGatewayProfile.java | 0 .../cloud/network/vpc/PrivateIpAddress.java | 0 .../com/cloud/network/vpc/VpcManagerImpl.java | 0 .../VpcPrivateGatewayTransactionCallable.java | 0 .../vpn/RemoteAccessVpnManagerImpl.java | 0 .../network/vpn/Site2SiteVpnManager.java | 0 .../network/vpn/Site2SiteVpnManagerImpl.java | 0 .../com/cloud/projects/ProjectManager.java | 0 .../cloud/projects/ProjectManagerImpl.java | 0 .../com/cloud/resource/DiscovererBase.java | 0 .../cloud/resource/DummyHostDiscoverer.java | 0 .../resource/DummyHostServerResource.java | 0 .../cloud/resource/ResourceManagerImpl.java | 0 .../ResourceLimitManagerImpl.java | 0 .../com/cloud/server/ConfigurationServer.java | 0 .../cloud/server/ConfigurationServerImpl.java | 0 .../java}/com/cloud/server/Criteria.java | 0 .../com/cloud/server/LockMasterListener.java | 0 .../com/cloud/server/ManagementServer.java | 0 .../cloud/server/ManagementServerImpl.java | 0 .../com/cloud/server/StatsCollector.java | 0 .../response/BaremetalTemplateResponse.java | 0 .../api/response/NwDeviceDhcpResponse.java | 0 .../response/NwDevicePxeServerResponse.java | 0 .../server/api/response/PxePingResponse.java | 0 .../netapp/AssociateLunCmdResponse.java | 0 .../response/netapp/CreateLunCmdResponse.java | 0 .../CreateVolumeOnFilerCmdResponse.java | 0 .../netapp/CreateVolumePoolCmdResponse.java | 0 .../response/netapp/DeleteLUNCmdResponse.java | 0 .../DeleteVolumeOnFilerCmdResponse.java | 0 .../netapp/DeleteVolumePoolCmdResponse.java | 0 .../netapp/DissociateLunCmdResponse.java | 0 .../response/netapp/ListLunsCmdResponse.java | 0 .../netapp/ListVolumePoolsCmdResponse.java | 0 .../netapp/ListVolumesOnFilerCmdResponse.java | 0 .../netapp/ModifyVolumePoolCmdResponse.java | 0 .../cloud/server/auth/UserAuthenticator.java | 0 .../cloud/servlet/CloudStartupServlet.java | 0 .../servlet/ConsoleProxyClientParam.java | 0 .../ConsoleProxyPasswordBasedEncryptor.java | 0 .../cloud/servlet/ConsoleProxyServlet.java | 0 .../cloud/storage/CreateSnapshotPayload.java | 0 .../cloud/storage/ImageStoreDetailsUtil.java | 0 .../storage/ImageStoreUploadMonitor.java | 0 .../storage/ImageStoreUploadMonitorImpl.java | 0 .../storage/LocalStoragePoolListener.java | 0 .../java}/com/cloud/storage/OCFS2Manager.java | 0 .../com/cloud/storage/OCFS2ManagerImpl.java | 0 .../cloud/storage/RegisterVolumePayload.java | 0 .../cloud/storage/ResizeVolumePayload.java | 0 .../com/cloud/storage/StorageManagerImpl.java | 0 .../cloud/storage/StoragePoolAutomation.java | 0 .../storage/StoragePoolAutomationImpl.java | 0 .../com/cloud/storage/TemplateProfile.java | 0 .../cloud/storage/VolumeApiServiceImpl.java | 0 .../download/DownloadAbandonedState.java | 0 .../storage/download/DownloadActiveState.java | 0 .../download/DownloadCompleteState.java | 0 .../storage/download/DownloadErrorState.java | 0 .../download/DownloadInProgressState.java | 0 .../download/DownloadInactiveState.java | 0 .../storage/download/DownloadListener.java | 0 .../storage/download/DownloadMonitor.java | 0 .../storage/download/DownloadMonitorImpl.java | 0 .../cloud/storage/download/DownloadState.java | 0 .../storage/download/NotDownloadedState.java | 0 .../listener/SnapshotStateListener.java | 0 .../storage/listener/StoragePoolMonitor.java | 0 .../storage/listener/StorageSyncListener.java | 0 .../storage/listener/VolumeStateListener.java | 0 .../storage/monitor/StorageHostMonitor.java | 0 .../DummySecondaryStorageResource.java | 0 .../secondary/SecStorageVmAlertEventArgs.java | 0 .../secondary/SecondaryStorageListener.java | 0 .../SecondaryStorageVmAllocator.java | 0 .../SecondaryStorageVmDefaultAllocator.java | 0 .../secondary/SecondaryStorageVmManager.java | 0 .../storage/snapshot/SnapshotManager.java | 0 .../storage/snapshot/SnapshotManagerImpl.java | 0 .../storage/snapshot/SnapshotScheduler.java | 0 .../snapshot/SnapshotSchedulerImpl.java | 0 .../storage/upload/NotUploadedState.java | 0 .../storage/upload/UploadAbandonedState.java | 0 .../storage/upload/UploadActiveState.java | 0 .../storage/upload/UploadCompleteState.java | 0 .../storage/upload/UploadErrorState.java | 0 .../storage/upload/UploadInProgressState.java | 0 .../storage/upload/UploadInactiveState.java | 0 .../cloud/storage/upload/UploadListener.java | 0 .../cloud/storage/upload/UploadMonitor.java | 0 .../storage/upload/UploadMonitorImpl.java | 0 .../com/cloud/storage/upload/UploadState.java | 0 .../cloud/tags/TaggedResourceManagerImpl.java | 0 .../template/HypervisorTemplateAdapter.java | 0 .../com/cloud/template/TemplateAdapter.java | 0 .../cloud/template/TemplateAdapterBase.java | 0 .../cloud/template/TemplateManagerImpl.java | 0 .../java}/com/cloud/test/DatabaseConfig.java | 0 .../java}/com/cloud/test/IPRangeConfig.java | 0 .../java}/com/cloud/test/PodZoneConfig.java | 0 .../java}/com/cloud/test/TestAppender.java | 0 .../com/cloud/usage/UsageServiceImpl.java | 0 .../java}/com/cloud/user/AccountManager.java | 0 .../com/cloud/user/AccountManagerImpl.java | 0 .../java}/com/cloud/user/DomainManager.java | 0 .../com/cloud/user/DomainManagerImpl.java | 0 .../cloud/uuididentity/UUIDManagerImpl.java | 0 .../com/cloud/vm/SystemVmLoadScanHandler.java | 0 .../com/cloud/vm/SystemVmLoadScanner.java | 0 .../java}/com/cloud/vm/UserVmManager.java | 0 .../java}/com/cloud/vm/UserVmManagerImpl.java | 0 .../com/cloud/vm/UserVmStateListener.java | 0 .../vm/snapshot/VMSnapshotManagerImpl.java | 0 .../vm/snapshot/VmWorkCreateVMSnapshot.java | 0 .../snapshot/VmWorkDeleteAllVMSnapshots.java | 0 .../vm/snapshot/VmWorkDeleteVMSnapshot.java | 0 .../vm/snapshot/VmWorkRevertToVMSnapshot.java | 0 .../cloudstack/acl/RoleManagerImpl.java | 0 .../affinity/AffinityGroupServiceImpl.java | 0 .../annotation/AnnotationManagerImpl.java | 0 .../apache/cloudstack/ca/CAManagerImpl.java | 0 .../download/DirectDownloadManagerImpl.java | 0 .../org/apache/cloudstack/ha/HAManager.java | 0 .../apache/cloudstack/ha/HAManagerImpl.java | 0 .../cloudstack/ha/HAResourceCounter.java | 0 .../ha/provider/ActivityCheckerInterface.java | 0 .../ha/provider/HACheckerException.java | 0 .../ha/provider/HAFenceException.java | 0 .../cloudstack/ha/provider/HAProvider.java | 0 .../ha/provider/HARecoveryException.java | 0 .../ha/provider/HealthCheckerInterface.java | 0 .../ha/provider/HostHAProvider.java | 0 .../provider/host/HAAbstractHostProvider.java | 0 .../cloudstack/ha/task/ActivityCheckTask.java | 0 .../apache/cloudstack/ha/task/BaseHATask.java | 0 .../apache/cloudstack/ha/task/FenceTask.java | 0 .../cloudstack/ha/task/HealthCheckTask.java | 0 .../cloudstack/ha/task/RecoveryTask.java | 0 .../ApplicationLoadBalancerManagerImpl.java | 0 .../network/ssl/CertServiceImpl.java | 0 .../topology/AdvancedNetworkTopology.java | 0 .../topology/AdvancedNetworkVisitor.java | 0 .../topology/BasicNetworkTopology.java | 0 .../network/topology/BasicNetworkVisitor.java | 0 .../network/topology/NetworkTopology.java | 0 .../topology/NetworkTopologyContext.java | 0 .../topology/NetworkTopologyVisitor.java | 0 .../OutOfBandManagementServiceImpl.java | 0 .../PowerOperationTask.java | 0 .../poll/BackgroundPollManagerImpl.java | 0 .../cloudstack/region/RegionAccount.java | 0 .../cloudstack/region/RegionDomain.java | 0 .../cloudstack/region/RegionManager.java | 0 .../cloudstack/region/RegionManagerImpl.java | 0 .../cloudstack/region/RegionServiceImpl.java | 0 .../region/RegionServiceProvider.java | 0 .../apache/cloudstack/region/RegionUser.java | 0 .../cloudstack/region/RegionsApiUtil.java | 0 .../GlobalLoadBalancingRulesServiceImpl.java | 0 .../region/gslb/GslbServiceProvider.java | 0 .../RouterDeploymentDefinition.java | 0 .../RouterDeploymentDefinitionBuilder.java | 0 .../VpcRouterDeploymentDefinition.java | 0 .../spring-server-core-managers-context.xml | 0 .../core/spring-server-core-misc-context.xml | 0 .../module.properties | 0 ...g-server-alert-adapter-backend-context.xml | 0 .../module.properties | 0 ...g-server-alert-adapter-compute-context.xml | 0 .../module.properties | 0 ...g-server-alert-adapter-storage-context.xml | 0 .../server-allocator/module.properties | 0 .../spring-server-allocator-context.xml | 0 .../cloudstack/server-api/module.properties | 0 .../server-api/spring-server-api-context.xml | 0 .../server-compute/module.properties | 0 .../spring-server-compute-context.xml | 0 .../server-discoverer/module.properties | 0 .../spring-server-discoverer-context.xml | 0 .../server-fencer/module.properties | 0 .../spring-server-fencer-context.xml | 0 .../server-investigator/module.properties | 0 .../spring-server-investigator-context.xml | 0 .../server-network/module.properties | 0 .../spring-server-network-context.xml | 0 .../server-planner/module.properties | 0 .../spring-server-planner-context.xml | 0 .../server-storage/module.properties | 0 .../spring-server-storage-context.xml | 0 .../server-template-adapter/module.properties | 0 ...spring-server-template-adapter-context.xml | 0 .../system/spring-server-system-context.xml | 0 .../cloud/upgrade/databaseCreatorContext.xml | 0 .../main}/scripts/vmops-fix-mysql-config | 0 server/{ => src}/test/async-job-component.xml | 0 .../cloud/alert/AlertControlsUnitTest.java | 0 .../com/cloud/alert/MockAlertManagerImpl.java | 0 .../test/java}/com/cloud/api/APITest.java | 0 .../com/cloud/api/ApiResponseHelperTest.java | 0 .../java}/com/cloud/api/ApiServletTest.java | 0 .../java}/com/cloud/api/ListPerfTest.java | 0 .../java}/com/cloud/api/LoginResponse.java | 0 .../dispatch/CommandCreationWorkerTest.java | 0 .../dispatch/DispatchChainFactoryTest.java | 0 .../ParamGenericValidationWorkerTest.java | 0 .../api/dispatch/ParamProcessWorkerTest.java | 0 .../SpecificCmdValidationWorkerTest.java | 0 .../MutualExclusiveIdsManagerBaseTest.java | 0 ...ericDaoBaseWithTagInformationBaseTest.java | 0 .../dao/SecurityGroupJoinDaoImplTest.java | 0 .../query/dao/TemplateJoinDaoImplTest.java | 0 .../api/query/dao/UserVmJoinDaoImplTest.java | 0 .../api/query/dao/VolumeJoinDaoImplTest.java | 0 .../cloud/capacity/CapacityManagerTest.java | 0 .../ConfigurationManagerTest.java | 0 .../configuration/ValidateIpRangeTest.java | 0 .../consoleproxy/ConsoleProxyManagerTest.java | 0 .../com/cloud/event/ActionEventUtilsTest.java | 0 .../cloud/event/EventControlsUnitTest.java | 0 .../ha/HighAvailabilityManagerImplTest.java | 0 .../java}/com/cloud/ha/KVMFencerTest.java | 0 .../com/cloud/keystore/KeystoreTest.java | 0 .../metadata/ResourceMetaDataManagerTest.java | 0 .../network/CreatePrivateNetworkTest.java | 0 .../network/DedicateGuestVlanRangesTest.java | 0 ...rnalLoadBalancerDeviceManagerImplTest.java | 0 .../cloud/network/IpAddressManagerTest.java | 0 .../network/MockFirewallManagerImpl.java | 0 .../cloud/network/MockNetworkModelImpl.java | 0 .../NetworkManagerTestComponentLibrary.java | 0 .../com/cloud/network/NetworkModelTest.java | 0 .../network/UpdatePhysicalNetworkTest.java | 0 .../com/cloud/network/dao/NetworkDaoTest.java | 0 .../ConfigDriveNetworkElementTest.java | 0 .../element/VirtualRouterElementTest.java | 0 .../element/VpcVirtualRouterElementTest.java | 0 .../network/firewall/FirewallManagerTest.java | 0 .../network/lb/AssignLoadBalancerTest.java | 0 .../network/lb/UpdateLoadBalancerTest.java | 0 .../network/router/NetworkHelperImplTest.java | 0 .../router/RouterControlHelperTest.java | 0 ...irtualNetworkApplianceManagerImplTest.java | 0 .../SecurityGroupManagerImpl2Test.java | 0 .../SecurityGroupManagerImplTest.java | 0 ...SecurityGroupManagerTestConfiguration.java | 0 .../security/SecurityGroupQueueTest.java | 0 .../cloud/network/vpc/VpcManagerImplTest.java | 0 .../MockRemoteAccessVPNServiceProvider.java | 0 .../network/vpn/RemoteAccessVpnTest.java | 0 .../projects/MockProjectManagerImpl.java | 0 .../resource/MockResourceManagerImpl.java | 0 .../ResourceLimitManagerImplTest.java | 0 .../server/ConfigurationServerImplTest.java | 0 .../server/ManagementServerImplTest.java | 0 .../servlet/ConsoleProxyServletTest.java | 0 .../com/cloud/snapshot/SnapshotDaoTest.java | 0 .../SnapshotDaoTestConfiguration.java | 0 .../storage/ImageStoreDetailsUtilTest.java | 0 .../storage/VolumeApiServiceImplTest.java | 0 .../cloud/storage/dao/StoragePoolDaoTest.java | 0 .../dao/StoragePoolDaoTestConfiguration.java | 0 .../listener/StoragePoolMonitorTest.java | 0 .../storage/snapshot/SnapshotManagerTest.java | 0 .../HypervisorTemplateAdapterTest.java | 0 .../template/TemplateManagerImplTest.java | 0 .../cloud/user/AccountManagerImplTest.java | 0 ...countManagerImplVolumeDeleteEventTest.java | 0 .../user/AccountManagetImplTestBase.java | 0 .../com/cloud/user/DomainManagerImplTest.java | 0 .../cloud/user/MockAccountManagerImpl.java | 0 .../com/cloud/user/MockDomainManagerImpl.java | 0 .../com/cloud/user/MockUsageEventDao.java | 0 .../vm/DeploymentPlanningManagerImplTest.java | 0 .../com/cloud/vm/FirstFitPlannerTest.java | 0 .../java}/com/cloud/vm/UserVmManagerTest.java | 0 .../vm/dao/UserVmCloneSettingDaoImplTest.java | 0 ...serVmCloneSettingDaoTestConfiguration.java | 0 .../com/cloud/vm/dao/UserVmDaoImplTest.java | 0 .../vm/dao/UserVmDaoTestConfiguration.java | 0 .../vm/snapshot/VMSnapshotManagerTest.java | 0 .../vpc/MockConfigurationManagerImpl.java | 0 .../com/cloud/vpc/MockNetworkManagerImpl.java | 0 .../com/cloud/vpc/MockNetworkModelImpl.java | 0 .../vpc/MockResourceLimitManagerImpl.java | 0 .../vpc/MockSite2SiteVpnManagerImpl.java | 0 .../vpc/MockSite2SiteVpnServiceProvider.java | 0 ...MockVpcVirtualNetworkApplianceManager.java | 0 .../com/cloud/vpc/NetworkACLManagerTest.java | 0 .../com/cloud/vpc/NetworkACLServiceTest.java | 0 .../java}/com/cloud/vpc/Site2SiteVpnTest.java | 0 .../java}/com/cloud/vpc/VpcApiUnitTest.java | 0 .../com/cloud/vpc/VpcTestConfiguration.java | 0 .../vpc/dao/MockConfigurationDaoImpl.java | 0 .../com/cloud/vpc/dao/MockNetworkDaoImpl.java | 0 .../vpc/dao/MockNetworkOfferingDaoImpl.java | 0 .../MockNetworkOfferingServiceMapDaoImpl.java | 0 .../vpc/dao/MockNetworkServiceMapDaoImpl.java | 0 .../com/cloud/vpc/dao/MockVpcDaoImpl.java | 0 .../cloud/vpc/dao/MockVpcOfferingDaoImpl.java | 0 .../dao/MockVpcOfferingServiceMapDaoImpl.java | 0 .../vpc/dao/MockVpcVirtualRouterElement.java | 0 .../affinity/AffinityApiUnitTest.java | 0 .../AffinityGroupServiceImplTest.java | 0 .../cloudstack/ca/CABackgroundTaskTest.java | 0 .../cloudstack/ca/CAManagerImplTest.java | 0 .../DirectDownloadManagerImplTest.java | 0 .../lb/ApplicationLoadBalancerTest.java | 0 .../network/ssl/CertServiceTest.java | 0 .../ChildTestConfiguration.java | 0 .../CreateNetworkOfferingTest.java | 0 .../OutOfBandManagementServiceTest.java | 0 .../poll/BackgroundPollManagerImplTest.java | 0 .../privategw/AclOnPrivateGwTest.java | 0 .../cloudstack/region/RegionManagerTest.java | 0 ...obalLoadBalancingRulesServiceImplTest.java | 0 .../service/ServiceOfferingVOTest.java | 0 .../RouterDeploymentDefinitionTest.java | 0 .../RouterDeploymentDefinitionTestBase.java | 0 .../VpcRouterDeploymentDefinitionTest.java | 0 .../resources/CloneSettingDaoTestContext.xml | 0 .../SecurityGroupManagerTestContext.xml | 0 .../test/resources/SnapshotDaoTestContext.xml | 0 .../resources/StoragePoolDaoTestContext.xml | 0 .../test/resources/UserVMDaoTestContext.xml | 0 .../test/resources/VpcApiUnitTestContext.xml | 0 .../test/resources/VpcTestContext.xml | 0 .../test/resources/appLoadBalancer.xml | 0 .../test/resources/certs/bad_format_cert.crt | 0 .../test/resources/certs/dsa_self_signed.key | 0 .../test/resources/certs/expired_cert.crt | 0 .../test/resources/certs/non_root.crt | 0 .../test/resources/certs/non_root.csr | 0 .../test/resources/certs/non_root.key | 0 .../test/resources/certs/non_x509_pem.crt | 0 .../test/resources/certs/root_chain.crt | 0 .../test/resources/certs/root_chain.csr | 0 .../test/resources/certs/root_chain.key | 0 .../test/resources/certs/rsa_ca_signed.crt | 0 .../test/resources/certs/rsa_ca_signed.csr | 0 .../test/resources/certs/rsa_ca_signed.key | 0 .../test/resources/certs/rsa_self_signed.crt | 0 .../test/resources/certs/rsa_self_signed.csr | 0 .../test/resources/certs/rsa_self_signed.key | 0 .../certs/rsa_self_signed_with_pwd.crt | 0 .../certs/rsa_self_signed_with_pwd.csr | 0 .../certs/rsa_self_signed_with_pwd.key | 0 server/{ => src}/test/resources/cleanup.sql | 0 .../test/resources/createNetworkOffering.xml | 0 server/{ => src}/test/resources/db.properties | 0 server/{ => src}/test/resources/fake.sql | 0 .../test/resources/network-mgr-component.xml | 0 .../{ => src}/test/resources/testContext.xml | 0 .../{ => src}/test/sync-queue-component.xml | 0 .../console-proxy-rdp/rdpconsole/README.txt | 0 services/console-proxy-rdp/rdpconsole/pom.xml | 19 ---- .../consoleproxy/AjaxFIFOImageCache.java | 0 .../consoleproxy/AuthenticationException.java | 0 .../com/cloud/consoleproxy/ConsoleProxy.java | 0 .../consoleproxy/ConsoleProxyAjaxHandler.java | 0 .../ConsoleProxyAjaxImageHandler.java | 0 .../ConsoleProxyAuthenticationResult.java | 0 .../ConsoleProxyBaseServerFactoryImpl.java | 0 .../consoleproxy/ConsoleProxyClient.java | 0 .../consoleproxy/ConsoleProxyClientBase.java | 0 .../ConsoleProxyClientListener.java | 0 .../consoleproxy/ConsoleProxyClientParam.java | 0 .../ConsoleProxyClientStatsCollector.java | 0 .../consoleproxy/ConsoleProxyCmdHandler.java | 0 .../consoleproxy/ConsoleProxyGCThread.java | 0 .../ConsoleProxyHttpHandlerHelper.java | 0 .../ConsoleProxyLoggerFactory.java | 0 .../consoleproxy/ConsoleProxyMonitor.java | 0 .../ConsoleProxyPasswordBasedEncryptor.java | 0 .../consoleproxy/ConsoleProxyRdpClient.java | 0 .../ConsoleProxyResourceHandler.java | 0 .../ConsoleProxySecureServerFactoryImpl.java | 0 .../ConsoleProxyServerFactory.java | 0 .../ConsoleProxyThumbnailHandler.java | 0 .../consoleproxy/ConsoleProxyVncClient.java | 0 .../cloud/consoleproxy/InputEventType.java | 0 .../consoleproxy/rdp/KeysymToKeycode.java | 0 .../rdp/RdpBufferedImageCanvas.java | 0 .../consoleproxy/util/ITileScanListener.java | 0 .../cloud/consoleproxy/util/ImageHelper.java | 0 .../com/cloud/consoleproxy/util/Logger.java | 0 .../consoleproxy/util/LoggerFactory.java | 0 .../com/cloud/consoleproxy/util/RawHTTP.java | 0 .../com/cloud/consoleproxy/util/Region.java | 0 .../consoleproxy/util/RegionClassifier.java | 0 .../com/cloud/consoleproxy/util/TileInfo.java | 0 .../cloud/consoleproxy/util/TileTracker.java | 0 .../consoleproxy/vnc/BufferedImageCanvas.java | 0 .../consoleproxy/vnc/FrameBufferCanvas.java | 0 .../vnc/FrameBufferUpdateListener.java | 0 .../vnc/PaintNotificationListener.java | 0 .../cloud/consoleproxy/vnc/RfbConstants.java | 0 .../com/cloud/consoleproxy/vnc/VncClient.java | 0 .../vnc/VncClientPacketSender.java | 0 .../vnc/VncScreenDescription.java | 0 .../vnc/VncServerPacketReceiver.java | 0 .../vnc/packet/client/ClientPacket.java | 0 .../FramebufferUpdateRequestPacket.java | 0 .../packet/client/KeyboardEventPacket.java | 0 .../vnc/packet/client/MouseEventPacket.java | 0 .../vnc/packet/client/SetEncodingsPacket.java | 0 .../packet/client/SetPixelFormatPacket.java | 0 .../vnc/packet/server/AbstractRect.java | 0 .../vnc/packet/server/CopyRect.java | 0 .../server/FrameBufferSizeChangeRequest.java | 0 .../server/FramebufferUpdatePacket.java | 0 .../vnc/packet/server/RawRect.java | 0 .../consoleproxy/vnc/packet/server/Rect.java | 0 .../vnc/packet/server/ServerCutText.java | 0 .../ConsoleProxyRdpClientTest.java | 0 .../command/iam/AddAccountToIAMGroupCmd.java | 0 .../iam/AddIAMPermissionToIAMPolicyCmd.java | 0 .../iam/AttachIAMPolicyToAccountCmd.java | 0 .../iam/AttachIAMPolicyToIAMGroupCmd.java | 0 .../api/command/iam/CreateIAMGroupCmd.java | 0 .../api/command/iam/CreateIAMPolicyCmd.java | 0 .../api/command/iam/DeleteIAMGroupCmd.java | 0 .../api/command/iam/DeleteIAMPolicyCmd.java | 0 .../api/command/iam/ListIAMGroupsCmd.java | 0 .../api/command/iam/ListIAMPoliciesCmd.java | 0 .../iam/RemoveAccountFromIAMGroupCmd.java | 0 .../RemoveIAMPermissionFromIAMPolicyCmd.java | 0 .../iam/RemoveIAMPolicyFromAccountCmd.java | 0 .../iam/RemoveIAMPolicyFromIAMGroupCmd.java | 0 .../api/response/iam/IAMGroupResponse.java | 0 .../response/iam/IAMPermissionResponse.java | 0 .../api/response/iam/IAMPolicyResponse.java | 0 .../apache/cloudstack/iam/IAMApiService.java | 0 .../cloudstack/iam/IAMApiServiceImpl.java | 0 .../iam/RoleBasedAPIAccessChecker.java | 0 .../iam/RoleBasedEntityAccessChecker.java | 0 .../iam/RoleBasedEntityQuerySelector.java | 0 .../iam-access-checkers/module.properties | 0 .../spring-iam-access-checkers-context.xml | 0 .../iam/test/IAMApiServiceTest.java | 0 .../{ => src}/test/resources/db.properties | 0 .../apache/cloudstack/iam/api/IAMGroup.java | 0 .../apache/cloudstack/iam/api/IAMPolicy.java | 0 .../iam/api/IAMPolicyPermission.java | 0 .../apache/cloudstack/iam/api/IAMService.java | 0 .../iam/server/IAMAccountPolicyMapVO.java | 0 .../iam/server/IAMGroupAccountMapVO.java | 0 .../iam/server/IAMGroupPolicyMapVO.java | 0 .../cloudstack/iam/server/IAMGroupVO.java | 0 .../iam/server/IAMPolicyPermissionVO.java | 0 .../cloudstack/iam/server/IAMPolicyVO.java | 0 .../cloudstack/iam/server/IAMServiceImpl.java | 0 .../server/dao/IAMAccountPolicyMapDao.java | 0 .../dao/IAMAccountPolicyMapDaoImpl.java | 0 .../iam/server/dao/IAMGroupAccountMapDao.java | 0 .../server/dao/IAMGroupAccountMapDaoImpl.java | 0 .../iam/server/dao/IAMGroupDao.java | 0 .../iam/server/dao/IAMGroupDaoImpl.java | 0 .../iam/server/dao/IAMGroupPolicyMapDao.java | 0 .../server/dao/IAMGroupPolicyMapDaoImpl.java | 0 .../iam/server/dao/IAMPolicyDao.java | 0 .../iam/server/dao/IAMPolicyDaoImpl.java | 0 .../server/dao/IAMPolicyPermissionDao.java | 0 .../dao/IAMPolicyPermissionDaoImpl.java | 0 .../core/spring-iam-server-context.xml | 0 .../cloudstack/iam/IAMServiceUnitTest.java | 0 .../{ => src}/test/resources/db.properties | 0 .../PremiumSecondaryStorageManagerImpl.java | 0 .../SecondaryStorageManagerImpl.java | 0 ...ondary-storage-controller-core-context.xml | 0 .../SecondaryStorageManagerTest.java | 0 .../resource/HttpUploadServerHandler.java | 0 .../LocalNfsSecondaryStorageResource.java | 0 .../LocalSecondaryStorageResource.java | 0 .../resource/NfsSecondaryStorageResource.java | 0 .../resource/SecondaryStorageDiscoverer.java | 0 .../resource/SecondaryStorageResource.java | 0 .../SecondaryStorageResourceHandler.java | 0 .../storage/template/DownloadManager.java | 0 .../storage/template/DownloadManagerImpl.java | 0 .../storage/template/UploadEntity.java | 0 .../storage/template/UploadManager.java | 0 .../storage/template/UploadManagerImpl.java | 0 .../module.properties | 0 ...g-secondary-storage-discoverer-context.xml | 0 .../LocalNfsSecondaryStorageResourceTest.java | 0 .../NfsSecondaryStorageResourceTest.java | 0 test/pom.xml | 2 - .../cloud/sample/UserCloudAPIExecutor.java | 0 .../cloud/test/longrun/BuildGuestNetwork.java | 0 .../com/cloud/test/longrun/GuestNetwork.java | 0 .../test/longrun/PerformanceWithAPI.java | 0 .../java}/com/cloud/test/longrun/User.java | 0 .../cloud/test/longrun/VirtualMachine.java | 0 .../com/cloud/test/regression/ApiCommand.java | 0 .../com/cloud/test/regression/ConfigTest.java | 0 .../test/regression/DelegatedAdminTest.java | 0 .../com/cloud/test/regression/Deploy.java | 0 .../cloud/test/regression/EventsApiTest.java | 0 .../java}/com/cloud/test/regression/HA.java | 0 .../test/regression/LoadBalancingTest.java | 0 .../test/regression/PortForwardingTest.java | 0 .../com/cloud/test/regression/SanityTest.java | 0 .../java}/com/cloud/test/regression/Test.java | 0 .../com/cloud/test/regression/TestCase.java | 0 .../cloud/test/regression/TestCaseEngine.java | 0 .../com/cloud/test/regression/VMApiTest.java | 0 .../java}/com/cloud/test/stress/SshTest.java | 0 .../test/stress/StressTestDirectAttach.java | 0 .../cloud/test/stress/TestClientWithAPI.java | 0 .../java}/com/cloud/test/stress/WgetTest.java | 0 .../test/ui/AbstractSeleniumTestCase.java | 0 .../com/cloud/test/ui/AddAndDeleteAISO.java | 0 .../cloud/test/ui/AddAndDeleteATemplate.java | 0 .../com/cloud/test/ui/UIScenarioTest.java | 0 .../com/cloud/test/utils/ConsoleProxy.java | 0 .../com/cloud/test/utils/IpSqlGenerator.java | 0 .../com/cloud/test/utils/ProxyLoadTemp.java | 0 .../java}/com/cloud/test/utils/SignEC2.java | 0 .../com/cloud/test/utils/SignRequest.java | 0 .../cloud/test/utils/SqlDataGenerator.java | 0 .../com/cloud/test/utils/SubmitCert.java | 0 .../com/cloud/test/utils/TestClient.java | 0 .../com/cloud/test/utils/UtilsForTest.java | 0 tools/apidoc/pom.xml | 2 +- tools/whisker/LICENSE | 4 +- tools/whisker/descriptor-for-packaging.xml | 4 +- tools/whisker/descriptor.xml | 4 +- .../org/apache/cloudstack/wix/HeatMojo.java | 0 usage/pom.xml | 5 - .../parser/VMSanpshotOnPrimaryParser.java | 0 .../java}/com/cloud/usage/StorageTypes.java | 0 .../cloud/usage/UsageAlertManagerImpl.java | 0 .../java}/com/cloud/usage/UsageManager.java | 0 .../com/cloud/usage/UsageManagerImpl.java | 0 .../com/cloud/usage/UsageSanityChecker.java | 0 .../java}/com/cloud/usage/UsageServer.java | 0 .../usage/parser/IPAddressUsageParser.java | 0 .../usage/parser/LoadBalancerUsageParser.java | 0 .../parser/NetworkOfferingUsageParser.java | 0 .../usage/parser/NetworkUsageParser.java | 0 .../parser/PortForwardingUsageParser.java | 0 .../parser/SecurityGroupUsageParser.java | 0 .../usage/parser/StorageUsageParser.java | 0 .../com/cloud/usage/parser/UsageParser.java | 0 .../usage/parser/VMInstanceUsageParser.java | 0 .../usage/parser/VMSnapshotUsageParser.java | 0 .../usage/parser/VPNUserUsageParser.java | 0 .../cloud/usage/parser/VmDiskUsageParser.java | 0 .../cloud/usage/parser/VolumeUsageParser.java | 0 .../resources/usageApplicationContext.xml | 0 .../com/cloud/usage/UsageManagerTest.java | 0 .../usage/UsageManagerTestConfiguration.java | 0 .../com/cloud/usage/UsageSanityCheckerIT.java | 0 .../cloud/usage/UsageSanityCheckerTest.java | 0 .../resources/UsageManagerTestContext.xml | 0 usage/{ => src}/test/resources/cloud1.xml | 0 usage/{ => src}/test/resources/cloud2.xml | 0 usage/{ => src}/test/resources/cloud3.xml | 0 .../{ => src}/test/resources/cloud_usage1.xml | 0 .../{ => src}/test/resources/cloud_usage2.xml | 0 .../{ => src}/test/resources/cloud_usage3.xml | 0 usage/{ => src}/test/resources/db.properties | 0 utils/pom.xml | 14 --- .../cloud/hypervisor/vmware/mo/BaseMO.java | 0 .../cloud/hypervisor/vmware/mo/ClusterMO.java | 0 .../vmware/mo/CustomFieldConstants.java | 0 .../vmware/mo/CustomFieldsManagerMO.java | 0 .../hypervisor/vmware/mo/DatacenterMO.java | 0 .../hypervisor/vmware/mo/DatastoreFile.java | 0 .../hypervisor/vmware/mo/DatastoreMO.java | 0 .../vmware/mo/DiskControllerType.java | 0 .../vmware/mo/DistributedVirtualSwitchMO.java | 0 .../vmware/mo/FeatureKeyConstants.java | 0 .../vmware/mo/HostDatastoreBrowserMO.java | 0 .../vmware/mo/HostDatastoreSystemMO.java | 0 .../vmware/mo/HostFirewallSystemMO.java | 0 .../cloud/hypervisor/vmware/mo/HostMO.java | 0 .../vmware/mo/HostNetworkSystemMO.java | 0 .../vmware/mo/HostStorageSystemMO.java | 0 .../vmware/mo/HostVirtualNicType.java | 0 .../hypervisor/vmware/mo/HttpNfcLeaseMO.java | 0 .../vmware/mo/HypervisorHostHelper.java | 0 .../vmware/mo/LicenseAssignmentManagerMO.java | 0 .../vmware/mo/LicenseManagerMO.java | 0 .../hypervisor/vmware/mo/NetworkDetails.java | 0 .../cloud/hypervisor/vmware/mo/NetworkMO.java | 0 .../vmware/mo/PerfCounterInfoMapper.java | 0 .../hypervisor/vmware/mo/PerfManagerMO.java | 0 .../vmware/mo/ScsiDiskControllerType.java | 0 .../vmware/mo/SnapshotDescriptor.java | 0 .../cloud/hypervisor/vmware/mo/TaskMO.java | 0 .../vmware/mo/VersioningContants.java | 0 .../vmware/mo/VirtualDiskManagerMO.java | 0 .../vmware/mo/VirtualEthernetCardType.java | 0 .../mo/VirtualMachineDiskInfoBuilder.java | 0 .../vmware/mo/VirtualMachineMO.java | 0 .../vmware/mo/VirtualSwitchType.java | 0 .../hypervisor/vmware/mo/VmdkAdapterType.java | 0 .../vmware/mo/VmdkFileDescriptor.java | 0 .../hypervisor/vmware/mo/VmwareHostType.java | 0 .../vmware/mo/VmwareHypervisorHost.java | 0 .../VmwareHypervisorHostNetworkSummary.java | 0 .../VmwareHypervisorHostResourceSummary.java | 0 .../hypervisor/vmware/util/VmwareClient.java | 0 .../hypervisor/vmware/util/VmwareContext.java | 0 .../vmware/util/VmwareContextPool.java | 0 .../vmware/util/VmwareGuestOsMapper.java | 0 .../hypervisor/vmware/util/VmwareHelper.java | 0 .../hypervisor/vmware/mo/DatastoreMOTest.java | 0 .../vmware/mo/HypervisorHostHelperTest.java | 0 .../vmware/mo/TestVmwareContextFactory.java | 0 .../vmware/mo/VirtualMachineMOTest.java | 0 .../hypervisor/vmware/mo/VmwareMOTest.java | 0 .../vmware/util/VmwareContextPoolTest.java | 0 .../vmware/util/VmwareContextTest.java | 0 5435 files changed, 100 insertions(+), 314 deletions(-) rename agent/src/{ => main/java}/com/cloud/agent/Agent.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/AgentShell.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/IAgentShell.java (100%) rename agent/src/{com/cloud => main/java/com/cloud/agent}/agent/direct/download/DirectTemplateDownloader.java (100%) rename agent/src/{com/cloud => main/java/com/cloud/agent}/agent/direct/download/DirectTemplateDownloaderImpl.java (100%) rename agent/src/{com/cloud => main/java/com/cloud/agent}/agent/direct/download/HttpDirectTemplateDownloader.java (100%) rename agent/src/{com/cloud => main/java/com/cloud/agent}/agent/direct/download/HttpsDirectTemplateDownloader.java (100%) rename agent/src/{com/cloud => main/java/com/cloud/agent}/agent/direct/download/MetalinkDirectTemplateDownloader.java (100%) rename agent/src/{com/cloud => main/java/com/cloud/agent}/agent/direct/download/NfsDirectTemplateDownloader.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/dao/StorageComponent.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/dao/impl/PropertiesStorage.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/dhcp/DhcpProtocolParserServer.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/dhcp/DhcpSnooper.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/dhcp/FakeDhcpSnooper.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/mockvm/MockVm.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/mockvm/MockVmMgr.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/mockvm/VmMgr.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/resource/DummyResource.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/resource/consoleproxy/ConsoleProxyAuthenticationResult.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java (100%) rename agent/src/{ => main/java}/com/cloud/agent/vmdata/VmDataServer.java (100%) rename agent/{test => src/test/java}/com/cloud/agent/AgentShellTest.java (100%) rename agent/{test/com/cloud => src/test/java/com/cloud/agent}/agent/direct/download/DirectTemplateDownloaderImplTest.java (100%) rename agent/{test => src/test/java}/com/cloud/agent/dao/impl/PropertiesStorageTest.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/Answer.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/BadCommand.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/Command.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/HostVmStateReportEntry.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/LogLevel.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/PvlanSetupCommand.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/StoragePoolInfo.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/UnsupportedAnswer.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/VgpuTypesInfo.java (100%) rename api/src/{com/cloud/agent => main/java/com/cloud/agent/api}/api/storage/OVFHelper.java (100%) rename api/src/{com/cloud/agent => main/java/com/cloud/agent/api}/api/to/DatadiskTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/storage/CopyTemplateToPrimaryStorageAnswer.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/storage/CreateVolumeOVACommand.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/storage/PasswordAuth.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/DataObjectType.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/DataStoreTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/DataTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/DhcpTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/DiskTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/FirewallRuleTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/GPUDeviceTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/HostTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/IpAddressTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/LoadBalancerTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/MonitorServiceTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/NetworkACLTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/NetworkTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/NfsTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/NicTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/PortForwardingRuleTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/S3TO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/StaticNatRuleTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/StorageFilerTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/SwiftTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/TemplateTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/VirtualMachineTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/api/to/VolumeTO.java (100%) rename api/src/{ => main/java}/com/cloud/agent/manager/allocator/HostAllocator.java (100%) rename api/src/{ => main/java}/com/cloud/agent/manager/allocator/PodAllocator.java (100%) rename api/src/{ => main/java}/com/cloud/alert/Alert.java (100%) rename api/src/{ => main/java}/com/cloud/alert/AlertAdapter.java (100%) rename api/src/{ => main/java}/com/cloud/api/commands/.gitignore (100%) rename api/src/{ => main/java}/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java (100%) rename api/src/{ => main/java}/com/cloud/capacity/Capacity.java (100%) rename api/src/{ => main/java}/com/cloud/capacity/CapacityState.java (100%) rename api/src/{ => main/java}/com/cloud/configuration/ConfigurationService.java (100%) rename api/src/{ => main/java}/com/cloud/configuration/Resource.java (100%) rename api/src/{ => main/java}/com/cloud/configuration/ResourceCount.java (100%) rename api/src/{ => main/java}/com/cloud/configuration/ResourceLimit.java (100%) rename api/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyAllocator.java (100%) rename api/src/{ => main/java}/com/cloud/dc/DataCenter.java (100%) rename api/src/{ => main/java}/com/cloud/dc/DedicatedResources.java (100%) rename api/src/{ => main/java}/com/cloud/dc/Pod.java (100%) rename api/src/{ => main/java}/com/cloud/dc/StorageNetworkIpRange.java (100%) rename api/src/{ => main/java}/com/cloud/dc/Vlan.java (100%) rename api/src/{ => main/java}/com/cloud/deploy/DataCenterDeployment.java (100%) rename api/src/{ => main/java}/com/cloud/deploy/DeployDestination.java (100%) rename api/src/{ => main/java}/com/cloud/deploy/DeploymentClusterPlanner.java (100%) rename api/src/{ => main/java}/com/cloud/deploy/DeploymentPlan.java (100%) rename api/src/{ => main/java}/com/cloud/deploy/DeploymentPlanner.java (100%) rename api/src/{ => main/java}/com/cloud/deploy/HAPlanner.java (100%) rename api/src/{ => main/java}/com/cloud/domain/Domain.java (100%) rename api/src/{ => main/java}/com/cloud/domain/PartOf.java (100%) rename api/src/{ => main/java}/com/cloud/event/ActionEvent.java (100%) rename api/src/{ => main/java}/com/cloud/event/ActionEvents.java (100%) rename api/src/{ => main/java}/com/cloud/event/Event.java (100%) rename api/src/{ => main/java}/com/cloud/event/EventCategory.java (100%) rename api/src/{ => main/java}/com/cloud/event/EventTypes.java (100%) rename api/src/{ => main/java}/com/cloud/event/UsageEvent.java (100%) rename api/src/{ => main/java}/com/cloud/exception/AccountLimitException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/AffinityConflictException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/AgentControlChannelException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/AgentUnavailableException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/CloudAuthenticationException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/CloudException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/ConcurrentOperationException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/ConflictingNetworkSettingsException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/ConnectionException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/DiscoveredWithErrorException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/DiscoveryException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/HAStateException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/InsufficientAddressCapacityException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/InsufficientCapacityException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/InsufficientNetworkCapacityException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/InsufficientServerCapacityException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/InsufficientStorageCapacityException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/InsufficientVirtualNetworkCapacityException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/InternalErrorException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/InvalidParameterValueException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/ManagementServerException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/NetworkRuleConflictException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/OperationTimedoutException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/PermissionDeniedException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/RequestLimitException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/ResourceAllocationException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/ResourceInUseException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/ResourceUnavailableException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/StorageConflictException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/StorageUnavailableException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/UnsupportedServiceException.java (100%) rename api/src/{ => main/java}/com/cloud/exception/VirtualMachineMigrationException.java (100%) rename api/src/{ => main/java}/com/cloud/gpu/GPU.java (100%) rename api/src/{ => main/java}/com/cloud/ha/FenceBuilder.java (100%) rename api/src/{ => main/java}/com/cloud/ha/Investigator.java (100%) rename api/src/{ => main/java}/com/cloud/host/Host.java (100%) rename api/src/{ => main/java}/com/cloud/host/HostEnvironment.java (100%) rename api/src/{ => main/java}/com/cloud/host/HostStats.java (100%) rename api/src/{ => main/java}/com/cloud/host/Status.java (100%) rename api/src/{ => main/java}/com/cloud/hypervisor/Hypervisor.java (100%) rename api/src/{ => main/java}/com/cloud/hypervisor/HypervisorCapabilities.java (100%) rename api/src/{ => main/java}/com/cloud/hypervisor/HypervisorGuru.java (100%) rename api/src/{ => main/java}/com/cloud/info/ConsoleProxyLoadInfo.java (100%) rename api/src/{ => main/java}/com/cloud/info/RunningHostCountInfo.java (100%) rename api/src/{ => main/java}/com/cloud/network/GuestVlan.java (100%) rename api/src/{ => main/java}/com/cloud/network/IpAddress.java (100%) rename api/src/{ => main/java}/com/cloud/network/MonitoringService.java (100%) rename api/src/{ => main/java}/com/cloud/network/Network.java (100%) rename api/src/{ => main/java}/com/cloud/network/NetworkMigrationResponder.java (100%) rename api/src/{ => main/java}/com/cloud/network/NetworkModel.java (100%) rename api/src/{ => main/java}/com/cloud/network/NetworkProfile.java (100%) rename api/src/{ => main/java}/com/cloud/network/NetworkRuleApplier.java (100%) rename api/src/{ => main/java}/com/cloud/network/NetworkService.java (100%) rename api/src/{ => main/java}/com/cloud/network/NetworkUsageService.java (100%) rename api/src/{ => main/java}/com/cloud/network/Networks.java (100%) rename api/src/{ => main/java}/com/cloud/network/OvsProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/PhysicalNetwork.java (100%) rename api/src/{ => main/java}/com/cloud/network/PhysicalNetworkServiceProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/PhysicalNetworkSetupInfo.java (100%) rename api/src/{ => main/java}/com/cloud/network/PhysicalNetworkTrafficType.java (100%) rename api/src/{ => main/java}/com/cloud/network/PublicIpAddress.java (100%) rename api/src/{ => main/java}/com/cloud/network/RemoteAccessVpn.java (100%) rename api/src/{ => main/java}/com/cloud/network/Site2SiteCustomerGateway.java (100%) rename api/src/{ => main/java}/com/cloud/network/Site2SiteVpnConnection.java (100%) rename api/src/{ => main/java}/com/cloud/network/Site2SiteVpnGateway.java (100%) rename api/src/{ => main/java}/com/cloud/network/StorageNetworkService.java (100%) rename api/src/{ => main/java}/com/cloud/network/TrafficLabel.java (100%) rename api/src/{ => main/java}/com/cloud/network/UserIpv6Address.java (100%) rename api/src/{ => main/java}/com/cloud/network/VirtualNetworkApplianceService.java (100%) rename api/src/{ => main/java}/com/cloud/network/VirtualRouterProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/VpcVirtualNetworkApplianceService.java (100%) rename api/src/{ => main/java}/com/cloud/network/VpnUser.java (100%) rename api/src/{ => main/java}/com/cloud/network/as/AutoScaleCounter.java (100%) rename api/src/{ => main/java}/com/cloud/network/as/AutoScalePolicy.java (100%) rename api/src/{ => main/java}/com/cloud/network/as/AutoScaleService.java (100%) rename api/src/{ => main/java}/com/cloud/network/as/AutoScaleVmGroup.java (100%) rename api/src/{ => main/java}/com/cloud/network/as/AutoScaleVmProfile.java (100%) rename api/src/{ => main/java}/com/cloud/network/as/Condition.java (100%) rename api/src/{ => main/java}/com/cloud/network/as/Counter.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/AggregatedCommandExecutor.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/ConnectivityProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/DhcpServiceProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/DnsServiceProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/FirewallServiceProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/IpDeployer.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/IpDeployingRequester.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/LoadBalancingServiceProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/NetworkACLServiceProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/NetworkElement.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/PortForwardingServiceProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/RedundantResource.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/RemoteAccessVPNServiceProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/Site2SiteVpnServiceProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/SourceNatServiceProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/StaticNatServiceProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/UserDataServiceProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/VirtualRouterElementService.java (100%) rename api/src/{ => main/java}/com/cloud/network/element/VpcProvider.java (100%) rename api/src/{ => main/java}/com/cloud/network/firewall/FirewallService.java (100%) rename api/src/{ => main/java}/com/cloud/network/guru/NetworkGuru.java (100%) rename api/src/{ => main/java}/com/cloud/network/guru/NetworkGuruAdditionalFunctions.java (100%) rename api/src/{ => main/java}/com/cloud/network/lb/LoadBalancingRule.java (100%) rename api/src/{ => main/java}/com/cloud/network/lb/LoadBalancingRulesService.java (100%) rename api/src/{ => main/java}/com/cloud/network/router/VirtualRouter.java (100%) rename api/src/{ => main/java}/com/cloud/network/rules/FirewallRule.java (100%) rename api/src/{ => main/java}/com/cloud/network/rules/HealthCheckPolicy.java (100%) rename api/src/{ => main/java}/com/cloud/network/rules/LbStickinessMethod.java (100%) rename api/src/{ => main/java}/com/cloud/network/rules/LoadBalancer.java (100%) rename api/src/{ => main/java}/com/cloud/network/rules/LoadBalancerContainer.java (100%) rename api/src/{ => main/java}/com/cloud/network/rules/PortForwardingRule.java (100%) rename api/src/{ => main/java}/com/cloud/network/rules/RulesService.java (100%) rename api/src/{ => main/java}/com/cloud/network/rules/StaticNat.java (100%) rename api/src/{ => main/java}/com/cloud/network/rules/StaticNatRule.java (100%) rename api/src/{ => main/java}/com/cloud/network/rules/StickinessPolicy.java (100%) rename api/src/{ => main/java}/com/cloud/network/security/SecurityGroup.java (100%) rename api/src/{ => main/java}/com/cloud/network/security/SecurityGroupRules.java (100%) rename api/src/{ => main/java}/com/cloud/network/security/SecurityGroupService.java (100%) rename api/src/{ => main/java}/com/cloud/network/security/SecurityRule.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpc/NetworkACL.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpc/NetworkACLItem.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpc/NetworkACLService.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpc/PrivateGateway.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpc/PrivateIp.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpc/StaticRoute.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpc/StaticRouteProfile.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpc/Vpc.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpc/VpcGateway.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpc/VpcOffering.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpc/VpcProvisioningService.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpc/VpcService.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpn/RemoteAccessVpnService.java (100%) rename api/src/{ => main/java}/com/cloud/network/vpn/Site2SiteVpnService.java (100%) rename api/src/{ => main/java}/com/cloud/offering/DiskOffering.java (100%) rename api/src/{ => main/java}/com/cloud/offering/DiskOfferingInfo.java (100%) rename api/src/{ => main/java}/com/cloud/offering/NetworkOffering.java (100%) rename api/src/{ => main/java}/com/cloud/offering/OfferingManager.java (100%) rename api/src/{ => main/java}/com/cloud/offering/ServiceOffering.java (100%) rename api/src/{ => main/java}/com/cloud/org/Cluster.java (100%) rename api/src/{ => main/java}/com/cloud/org/Grouping.java (100%) rename api/src/{ => main/java}/com/cloud/org/Managed.java (100%) rename api/src/{ => main/java}/com/cloud/org/RunningIn.java (100%) rename api/src/{ => main/java}/com/cloud/projects/Project.java (100%) rename api/src/{ => main/java}/com/cloud/projects/ProjectAccount.java (100%) rename api/src/{ => main/java}/com/cloud/projects/ProjectInvitation.java (100%) rename api/src/{ => main/java}/com/cloud/projects/ProjectService.java (100%) rename api/src/{ => main/java}/com/cloud/region/ha/GlobalLoadBalancerRule.java (100%) rename api/src/{ => main/java}/com/cloud/region/ha/GlobalLoadBalancingRulesService.java (100%) rename api/src/{ => main/java}/com/cloud/resource/ResourceService.java (100%) rename api/src/{ => main/java}/com/cloud/resource/ResourceState.java (100%) rename api/src/{ => main/java}/com/cloud/resource/UnableDeleteHostException.java (100%) rename api/src/{ => main/java}/com/cloud/serializer/Param.java (100%) rename api/src/{ => main/java}/com/cloud/server/ManagementService.java (100%) rename api/src/{ => main/java}/com/cloud/server/ResourceMetaDataService.java (100%) rename api/src/{ => main/java}/com/cloud/server/ResourceTag.java (100%) rename api/src/{ => main/java}/com/cloud/server/TaggedResourceService.java (100%) rename api/src/{ => main/java}/com/cloud/storage/DataStoreProviderApiService.java (100%) rename api/src/{ => main/java}/com/cloud/storage/DataStoreRole.java (100%) rename api/src/{ => main/java}/com/cloud/storage/GuestOS.java (100%) rename api/src/{ => main/java}/com/cloud/storage/GuestOSHypervisor.java (100%) rename api/src/{ => main/java}/com/cloud/storage/GuestOsCategory.java (100%) rename api/src/{ => main/java}/com/cloud/storage/ImageStore.java (100%) rename api/src/{ => main/java}/com/cloud/storage/ScopeType.java (100%) rename api/src/{ => main/java}/com/cloud/storage/Snapshot.java (100%) rename api/src/{ => main/java}/com/cloud/storage/Storage.java (100%) rename api/src/{ => main/java}/com/cloud/storage/StorageGuru.java (100%) rename api/src/{ => main/java}/com/cloud/storage/StoragePool.java (100%) rename api/src/{ => main/java}/com/cloud/storage/StoragePoolDiscoverer.java (100%) rename api/src/{ => main/java}/com/cloud/storage/StoragePoolStatus.java (100%) rename api/src/{ => main/java}/com/cloud/storage/StorageService.java (100%) rename api/src/{ => main/java}/com/cloud/storage/StorageStats.java (100%) rename api/src/{ => main/java}/com/cloud/storage/Upload.java (100%) rename api/src/{ => main/java}/com/cloud/storage/VMTemplateStorageResourceAssoc.java (100%) rename api/src/{ => main/java}/com/cloud/storage/Volume.java (100%) rename api/src/{ => main/java}/com/cloud/storage/VolumeApiService.java (100%) rename api/src/{ => main/java}/com/cloud/storage/VolumeStats.java (100%) rename api/src/{ => main/java}/com/cloud/storage/snapshot/SnapshotApiService.java (100%) rename api/src/{ => main/java}/com/cloud/storage/snapshot/SnapshotPolicy.java (100%) rename api/src/{ => main/java}/com/cloud/storage/snapshot/SnapshotSchedule.java (100%) rename api/src/{ => main/java}/com/cloud/storage/template/TemplateProp.java (100%) rename api/src/{ => main/java}/com/cloud/template/BasedOn.java (100%) rename api/src/{ => main/java}/com/cloud/template/TemplateApiService.java (100%) rename api/src/{ => main/java}/com/cloud/template/VirtualMachineTemplate.java (100%) rename api/src/{ => main/java}/com/cloud/user/Account.java (100%) rename api/src/{ => main/java}/com/cloud/user/AccountService.java (100%) rename api/src/{ => main/java}/com/cloud/user/DomainService.java (100%) rename api/src/{ => main/java}/com/cloud/user/OwnedBy.java (100%) rename api/src/{ => main/java}/com/cloud/user/ResourceLimitService.java (100%) rename api/src/{ => main/java}/com/cloud/user/SSHKeyPair.java (100%) rename api/src/{ => main/java}/com/cloud/user/User.java (100%) rename api/src/{ => main/java}/com/cloud/user/UserAccount.java (100%) rename api/src/{ => main/java}/com/cloud/uservm/UserVm.java (100%) rename api/src/{ => main/java}/com/cloud/vm/BareMetalVmService.java (100%) rename api/src/{ => main/java}/com/cloud/vm/ConsoleProxy.java (100%) rename api/src/{ => main/java}/com/cloud/vm/DiskProfile.java (100%) rename api/src/{ => main/java}/com/cloud/vm/InstanceGroup.java (100%) rename api/src/{ => main/java}/com/cloud/vm/Nic.java (100%) rename api/src/{ => main/java}/com/cloud/vm/NicExtraDhcpOption.java (100%) rename api/src/{ => main/java}/com/cloud/vm/NicIpAlias.java (100%) rename api/src/{ => main/java}/com/cloud/vm/NicProfile.java (100%) rename api/src/{ => main/java}/com/cloud/vm/NicSecondaryIp.java (100%) rename api/src/{ => main/java}/com/cloud/vm/ReservationContext.java (100%) rename api/src/{ => main/java}/com/cloud/vm/RunningOn.java (100%) rename api/src/{ => main/java}/com/cloud/vm/SecondaryStorageVm.java (100%) rename api/src/{ => main/java}/com/cloud/vm/SystemVm.java (100%) rename api/src/{ => main/java}/com/cloud/vm/UserVmService.java (100%) rename api/src/{ => main/java}/com/cloud/vm/VirtualMachine.java (100%) rename api/src/{ => main/java}/com/cloud/vm/VirtualMachineName.java (100%) rename api/src/{ => main/java}/com/cloud/vm/VirtualMachineProfile.java (100%) rename api/src/{ => main/java}/com/cloud/vm/VmDetailConstants.java (100%) rename api/src/{ => main/java}/com/cloud/vm/VmDiskStats.java (100%) rename api/src/{ => main/java}/com/cloud/vm/VmNetworkStats.java (100%) rename api/src/{ => main/java}/com/cloud/vm/VmStats.java (100%) rename api/src/{ => main/java}/com/cloud/vm/snapshot/VMSnapshot.java (100%) rename api/src/{ => main/java}/com/cloud/vm/snapshot/VMSnapshotService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/acl/APIChecker.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/acl/APILimitChecker.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/acl/ControlledEntity.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/acl/InfrastructureEntity.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/acl/PermissionScope.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/acl/QuerySelector.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/acl/Role.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/acl/RolePermission.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/acl/RoleService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/acl/RoleType.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/acl/Rule.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/acl/SecurityChecker.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/affinity/AffinityGroup.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/affinity/AffinityGroupProcessor.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/affinity/AffinityGroupResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/affinity/AffinityGroupService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/affinity/AffinityProcessorBase.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/alert/AlertService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/annotation/Annotation.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/annotation/AnnotationService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/ACL.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/APICommand.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/AbstractGetUploadParamsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/ApiArgValidator.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/ApiCommandJobType.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/ApiConstants.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/ApiErrorCode.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/ApiServerService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseAsyncCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseAsyncCreateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseCustomIdCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseListAccountResourcesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseListCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseListProjectAndAccountResourcesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseListTaggedResourcesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseResponseWithTagInformation.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/Displayable.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/EntityReference.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/IBaseListAccountResourcesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/IBaseListCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/IBaseListDomainResourcesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/IBaseListProjectAndAccountResourcesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/IBaseListTaggedResourcesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/Identity.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/InternalIdentity.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/LdapValidator.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/Parameter.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/ResourceDetail.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/ResponseGenerator.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/ResponseObject.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/ServerApiException.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/Validate.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/auth/APIAuthenticationManager.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/auth/APIAuthenticationType.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/auth/APIAuthenticator.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/auth/PluggableAPIAuthenticator.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/address/AcquirePodIpCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/iso/CopyIsoCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/AddImageStoreS3CMD.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/volume/CreateVolumeCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/firewall/IListFirewallRulesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/snapshot/UpdateSnapshotPolicyCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/SecurityGroupAction.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolumeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/AccountResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/AcquirePodIpCmdResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/AlertResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/AnnotationResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/AsyncJobResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/AuthenticationCmdResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/CAProviderResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/CapabilitiesResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/CapabilityResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/CapacityResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/CertificateResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/CloudIdentifierResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ClusterResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ConditionResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ConfigurationResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ControlledEntityResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ControlledViewEntityResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/CounterResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/CreateCmdResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/CustomCertificateResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/DiskOfferingResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/DomainResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/DomainRouterResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/EventResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/EventTypeResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ExceptionResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ExternalFirewallResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ExtractResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/FirewallResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/FirewallRuleResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/GetUploadParamsResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/GetVMPasswordResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/GpuResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/GuestOSResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/GuestOsMappingResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/HAProviderResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/HostForMigrationResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/HostHAResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/HostResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/HostTagResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/HypervisorResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/IPAddressResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ImageStoreResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/InstanceGroupResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/IsoVmResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/IsolationMethodResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/LBHealthCheckResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/LBStickinessResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ListResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/LoadBalancerResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/LoadBalancerRuleVmMapResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/LoginCmdResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/LogoutCmdResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/NetworkACLItemResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/NetworkACLResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/NetworkDeviceResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/NetworkOfferingResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/NetworkResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/NicExtraDhcpOptionResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/NicResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/OutOfBandManagementResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/OvsProviderResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/PodResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/PortableIpRangeResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/PortableIpResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/PrivateGatewayResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ProjectAccountResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ProjectInvitationResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ProjectResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ProviderResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/RegionResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/RegisterResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ResourceCountResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ResourceDetailResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ResourceLimitResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ResourceTagResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/RolePermissionResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/RoleResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/SSHKeyPairResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/SecurityGroupResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ServiceOfferingResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ServiceResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/SnapshotResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/SslCertResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/StaticRouteResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/StoragePoolResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/StorageProviderResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/StorageTagResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/SuccessResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/SystemVmResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/TemplateResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/TrafficMonitorResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/TrafficTypeResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/UsageRecordResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/UsageTypeResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/UserResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/UserVmResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/VMSnapshotResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/VMUserDataResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/VgpuResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/VlanIpRangeResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/VolumeResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/VpcOfferingResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/VpcResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/VpnUsersResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/api/response/ZoneResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/ca/CAManager.java (100%) rename api/src/{org/apache => main/java/org/apache/cloudstack}/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java (100%) rename api/src/{org/apache => main/java/org/apache/cloudstack}/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java (100%) rename api/src/{org/apache => main/java/org/apache/cloudstack}/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java (100%) rename api/src/{org/apache => main/java/org/apache/cloudstack}/cloudstack/api/command/admin/network/MigrateNetworkCmd.java (100%) rename api/src/{org/apache => main/java/org/apache/cloudstack}/cloudstack/api/command/admin/network/MigrateVPCCmd.java (100%) rename api/src/{org/apache => main/java/org/apache/cloudstack}/cloudstack/api/command/admin/user/MoveUserCmd.java (100%) rename api/src/{org/apache => main/java/org/apache/cloudstack}/cloudstack/api/response/ChildTemplateResponse.java (100%) rename api/src/{org/apache => main/java/org/apache/cloudstack}/cloudstack/direct/download/DirectDownloadManager.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/config/ApiServiceConfiguration.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/context/CallContext.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/context/CallContextListener.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/context/LogContext.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/context/LogContextListener.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/ha/HAConfig.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/ha/HAConfigManager.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/ha/HAResource.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/jobs/JobInfo.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/kernel/Partition.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/network/lb/ApplicationLoadBalancerRule.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/network/tls/CertService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/network/tls/SslCert.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/OutOfBandManagement.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementDriver.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverChangePasswordCommand.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverCommand.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverPowerCommand.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverResponse.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/poll/BackgroundPollManager.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/poll/BackgroundPollTask.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/query/QueryService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/region/PortableIp.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/region/PortableIpRange.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/region/Region.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/region/RegionService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/region/RegionSync.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/usage/Usage.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/usage/UsageService.java (100%) rename api/src/{ => main/java}/org/apache/cloudstack/usage/UsageTypes.java (100%) rename api/{ => src/main}/resources/META-INF/cloudstack/api-config/module.properties (100%) rename api/{ => src/main}/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml (100%) rename api/{ => src/main}/resources/META-INF/cloudstack/api-planner/module.properties (100%) rename api/{ => src/main}/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml (100%) rename api/{test => src/test/java}/com/cloud/network/IsolationMethodTest.java (100%) rename api/{test => src/test/java}/com/cloud/network/NetworksTest.java (100%) rename api/{test => src/test/java}/com/cloud/storage/StorageTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/acl/RoleTypeTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/acl/RuleTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/ApiCmdTestUtil.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/BaseCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/admin/account/CreateAccountCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/admin/user/CreateUserCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/AddClusterCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/AddHostCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/RegionCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/UpdateHostPasswordCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/UpdateVmNicIpTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/test/UsageCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdByAdminTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdByAdminTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/api/response/HostResponseTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/context/CallContextTest.java (100%) rename api/{test => src/test/java}/org/apache/cloudstack/test/utils/SpringUtils.java (100%) rename client/src/{ => main/java}/org/apache/cloudstack/ServerDaemon.java (100%) rename client/{ => src/main}/resources/META-INF/cloudstack/webApplicationContext.xml (100%) rename client/{ => src/main/webapp}/WEB-INF/web.xml (100%) rename core/src/{ => main/java}/com/cloud/agent/IAgentControl.java (100%) rename core/src/{ => main/java}/com/cloud/agent/IAgentControlListener.java (100%) rename core/src/{ => main/java}/com/cloud/agent/StartupCommandProcessor.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/AgentControlAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/AgentControlCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/AttachIsoAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/AttachIsoCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/BackupSnapshotAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/BackupSnapshotCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/BumpUpPriorityCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CancelCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ChangeAgentAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ChangeAgentCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckHealthAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckHealthCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckNetworkAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckNetworkCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckOnHostAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckOnHostCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckRouterAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckRouterCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckStateAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckStateCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckVMActivityOnStoragePoolCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckVirtualMachineAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CheckVirtualMachineCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CleanupNetworkRulesCmd.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ComputeChecksumCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CreateStoragePoolCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CreateVMSnapshotAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CreateVMSnapshotCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/CronCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/DeleteSnapshotsDirCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/DeleteStoragePoolCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/DeleteVMSnapshotAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/DeleteVMSnapshotCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/DirectNetworkUsageAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/DirectNetworkUsageCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/FenceAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/FenceCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetDomRVersionAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetDomRVersionCmd.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetGPUStatsAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetGPUStatsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetHostStatsAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetHostStatsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetRouterAlertsAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetStorageStatsAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetStorageStatsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetVmConfigAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetVmConfigCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetVmDiskStatsAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetVmDiskStatsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetVmIpAddressCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetVmNetworkStatsAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetVmNetworkStatsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetVmStatsAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetVmStatsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetVncPortAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetVncPortCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetVolumeStatsAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/GetVolumeStatsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/HandleConfigDriveIsoCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/HostStatsEntry.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/MaintainAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/MaintainCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ManageSnapshotAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ManageSnapshotCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/MigrateAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/MigrateCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/MigrateWithStorageAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/MigrateWithStorageCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/MigrateWithStorageSendAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/MigrateWithStorageSendCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ModifySshKeysCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ModifyStoragePoolAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ModifyStoragePoolCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ModifyTargetsAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ModifyTargetsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ModifyVmNicConfigAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ModifyVmNicConfigCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/NetScalerImplementNetworkCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/NetworkRulesSystemVmCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/NetworkUsageAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/NetworkUsageCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PerformanceMonitorAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PerformanceMonitorCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PingAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PingCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PingRoutingCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PingRoutingWithOvsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PingStorageCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PingTestCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PlugNicAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PlugNicCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PrepareForMigrationAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PrepareForMigrationCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PrepareOCFS2NodesCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/PropagateResourceEventCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ReadyAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ReadyCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/RebootAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/RebootCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/RebootRouterCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/RecurringNetworkUsageAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/RecurringNetworkUsageCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/RestoreVMSnapshotAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/RestoreVMSnapshotCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/RevertToVMSnapshotAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/RevertToVMSnapshotCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ScaleVmAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ScaleVmCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ScheduleHostScanTaskCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/SecStorageFirewallCfgCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/SecStorageSetupAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/SecStorageSetupCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/SecStorageVMSetupCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/SecurityGroupRuleAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/SecurityGroupRulesCmd.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/SetHostParamsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/SetupAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/SetupCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/SetupGuestNetworkCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ShutdownCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/SnapshotCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartupAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartupCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartupExternalDhcpCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartupExternalFirewallCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartupProxyCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartupPxeServerCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartupRoutingCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartupSecondaryStorageCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartupStorageCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartupTrafficMonitorCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StartupVMMAgentCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StopAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/StopCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/TransferAgentCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/UnPlugNicAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/UnPlugNicCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/UnregisterNicCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/UnregisterVMCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/UpdateHostPasswordCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/UpgradeSnapshotCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/VMSnapshotBaseCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/VMSnapshotTO.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ValidateSnapshotAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/ValidateSnapshotCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/VmDiskStatsEntry.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/VmNetworkStatsEntry.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/VmStatsEntry.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/VolumeStatsEntry.java (100%) rename core/src/{com/cloud/agent => main/java/com/cloud/agent/api}/api/ReplugNicAnswer.java (100%) rename core/src/{com/cloud/agent => main/java/com/cloud/agent/api}/api/ReplugNicCommand.java (100%) rename core/src/{com/cloud/agent => main/java/com/cloud/agent/api}/api/storage/CreateDatadiskTemplateAnswer.java (100%) rename core/src/{com/cloud/agent => main/java/com/cloud/agent/api}/api/storage/CreateDatadiskTemplateCommand.java (100%) rename core/src/{com/cloud/agent => main/java/com/cloud/agent/api}/api/storage/GetDatadisksAnswer.java (100%) rename core/src/{com/cloud/agent => main/java/com/cloud/agent/api}/api/storage/GetDatadisksCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/check/CheckSshAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/check/CheckSshCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/proxy/ProxyCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/AggregationControlCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/CreateIpAliasCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/DeleteIpAliasCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/DhcpEntryCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/DnsMasqConfigCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/GetRouterAlertsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/GroupAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/IpAliasTO.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/IpAssocAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/IpAssocCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/IpAssocVpcCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/NetworkElementCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SavePasswordCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetFirewallRulesCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetMonitorServiceCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetNetworkACLAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetNetworkACLCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetSourceNatAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetSourceNatCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetStaticRouteAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SetStaticRouteCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/UserDataCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/VmDataCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/routing/VpnUsersCfgCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/AbstractDownloadCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/AbstractUploadCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/CopyVolumeAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/CopyVolumeCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/CreateAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/CreateCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/DestroyAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/DestroyCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/DownloadAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/ListTemplateAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/ListTemplateCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/ListVolumeAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/ListVolumeCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/MigrateVolumeAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/MigrateVolumeCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/ResizeVolumeAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/ResizeVolumeCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/SsCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/StorageCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/StorageNfsVersionCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/UpgradeDiskAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/UpgradeDiskCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/UploadAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/UploadCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/api/storage/UploadProgressCommand.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/ConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/FileConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/ScriptConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/VRScripts.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/BumpUpPriorityConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/CreateIpAliasConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/DeleteIpAliasConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/DhcpEntryConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/DnsMasqConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/IpAssociationConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/LoadBalancerConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/RemoteAccessVpnConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/SavePasswordConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/SetFirewallRulesConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/SetGuestNetworkConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/SetMonitorServiceConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/SetNetworkAclConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/SetPortForwardingRulesConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/SetPortForwardingRulesVpcConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/SetSourceNatConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/SetStaticNatRulesConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/SetStaticRouteConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/Site2SiteVpnConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/VmDataConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/facade/VpnUsersConfigItem.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/AclRule.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/AllAclRule.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/ConfigBase.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/DhcpConfig.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/DhcpConfigEntry.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/FirewallRule.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/FirewallRules.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/ForwardingRule.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/ForwardingRules.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/GuestNetwork.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/IcmpAclRule.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/IpAddress.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/IpAddressAlias.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/IpAliases.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/IpAssociation.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/LoadBalancerRule.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/LoadBalancerRules.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/NetworkACL.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/ProtocolAclRule.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/RemoteAccessVpn.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/Site2SiteVpn.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/StaticNatRule.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/StaticNatRules.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/StaticRoute.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/StaticRoutes.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/TcpAclRule.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/UdpAclRule.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/VmData.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/VmDhcpConfig.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/VmPassword.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/VpnUser.java (100%) rename core/src/{ => main/java}/com/cloud/agent/resource/virtualnetwork/model/VpnUserList.java (100%) rename core/src/{ => main/java}/com/cloud/agent/transport/ArrayTypeAdaptor.java (100%) rename core/src/{ => main/java}/com/cloud/agent/transport/InterfaceTypeAdaptor.java (100%) rename core/src/{ => main/java}/com/cloud/agent/transport/LoggingExclusionStrategy.java (100%) rename core/src/{ => main/java}/com/cloud/agent/transport/Request.java (100%) rename core/src/{ => main/java}/com/cloud/agent/transport/Response.java (100%) rename core/src/{com => main/java/com/cloud}/cloud/storage/template/MetalinkTemplateDownloader.java (100%) rename core/src/{ => main/java}/com/cloud/exception/UnsupportedVersionException.java (100%) rename core/src/{ => main/java}/com/cloud/exception/UsageServerException.java (100%) rename core/src/{ => main/java}/com/cloud/host/HostInfo.java (100%) rename core/src/{ => main/java}/com/cloud/info/ConsoleProxyConnectionInfo.java (100%) rename core/src/{ => main/java}/com/cloud/info/ConsoleProxyInfo.java (100%) rename core/src/{ => main/java}/com/cloud/info/ConsoleProxyStatus.java (100%) rename core/src/{ => main/java}/com/cloud/info/RunningHostInfoAgregator.java (100%) rename core/src/{ => main/java}/com/cloud/info/SecStorageVmLoadInfo.java (100%) rename core/src/{ => main/java}/com/cloud/network/HAProxyConfigurator.java (100%) rename core/src/{ => main/java}/com/cloud/network/LoadBalancerConfigurator.java (100%) rename core/src/{ => main/java}/com/cloud/network/LoadBalancerValidator.java (100%) rename core/src/{ => main/java}/com/cloud/network/resource/CreateLoadBalancerApplianceAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/network/resource/DestroyLoadBalancerApplianceAnswer.java (100%) rename core/src/{ => main/java}/com/cloud/network/resource/TrafficSentinelResource.java (100%) rename core/src/{ => main/java}/com/cloud/resource/CommandWrapper.java (100%) rename core/src/{ => main/java}/com/cloud/resource/RequestWrapper.java (100%) rename core/src/{ => main/java}/com/cloud/resource/ResourceListener.java (100%) rename core/src/{ => main/java}/com/cloud/resource/ResourceWrapper.java (100%) rename core/src/{ => main/java}/com/cloud/resource/ServerResource.java (100%) rename core/src/{ => main/java}/com/cloud/resource/ServerResourceBase.java (100%) rename core/src/{ => main/java}/com/cloud/resource/hypervisor/HypervisorResource.java (100%) rename core/src/{ => main/java}/com/cloud/serializer/GsonHelper.java (100%) rename core/src/{ => main/java}/com/cloud/serializer/SerializerHelper.java (100%) rename core/src/{ => main/java}/com/cloud/storage/JavaStorageLayer.java (100%) rename core/src/{ => main/java}/com/cloud/storage/StorageLayer.java (100%) rename core/src/{ => main/java}/com/cloud/storage/resource/StoragePoolResource.java (100%) rename core/src/{ => main/java}/com/cloud/storage/resource/StorageProcessor.java (100%) rename core/src/{ => main/java}/com/cloud/storage/resource/StorageSubsystemCommandHandler.java (100%) rename core/src/{ => main/java}/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/FtpTemplateUploader.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/HttpTemplateDownloader.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/IsoProcessor.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/LocalTemplateDownloader.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/OVAProcessor.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/Processor.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/QCOW2Processor.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/RawImageProcessor.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/S3TemplateDownloader.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/ScpTemplateDownloader.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/TARProcessor.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/TemplateConstants.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/TemplateDownloader.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/TemplateDownloaderBase.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/TemplateLocation.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/TemplateUploader.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/VhdProcessor.java (100%) rename core/src/{ => main/java}/com/cloud/storage/template/VmdkProcessor.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/agent/directdownload/CheckUrlAnswer.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/agent/directdownload/CheckUrlCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/agent/directdownload/DirectDownloadAnswer.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/agent/directdownload/DirectDownloadCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/agent/directdownload/HttpDirectDownloadCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/agent/directdownload/HttpsDirectDownloadCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/agent/directdownload/MetalinkDirectDownloadCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/agent/directdownload/NfsDirectDownloadCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/agent/directdownload/SetupDirectDownloadCertificate.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/ca/SetupCertificateAnswer.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/ca/SetupCertificateCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/ca/SetupKeyStoreCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/ca/SetupKeystoreAnswer.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/AttachAnswer.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/AttachCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/CopyCmdAnswer.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/CopyCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/CreateObjectAnswer.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/CreateObjectCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/DeleteCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/DettachAnswer.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/DettachCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/DownloadCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/DownloadProgressCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/ForgetObjectCmd.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/IntroduceObjectAnswer.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/ResignatureAnswer.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/ResignatureCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/RevertSnapshotCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/SnapshotAndCopyAnswer.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/SnapshotAndCopyCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/UploadStatusAnswer.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/command/UploadStatusCommand.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/to/ImageStoreTO.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/to/SnapshotObjectTO.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/to/TemplateObjectTO.java (100%) rename core/src/{ => main/java}/org/apache/cloudstack/storage/to/VolumeObjectTO.java (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/allocator/module.properties (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/api/module.properties (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/backend/module.properties (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/bootstrap/module.properties (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/ca/module.properties (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/ca/spring-core-lifecycle-ca-context-inheritable.xml (100%) rename core/{resources/META-INF => src/main/resources/META-INF/cloudstack}/cloudstack/direct-download/module.properties (100%) rename core/{resources/META-INF => src/main/resources/META-INF/cloudstack}/cloudstack/direct-download/spring-lifecycle-direct-download-context-inheritable.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/compute/module.properties (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/core/module.properties (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/core/spring-core-context.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/discoverer/module.properties (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/network/module.properties (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/outofbandmanagement/module.properties (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/outofbandmanagement/spring-core-lifecycle-outofbandmanagement-context-inheritable.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/planner/module.properties (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/storage/module.properties (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/system/module.properties (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml (100%) rename core/{ => src/main}/resources/META-INF/cloudstack/system/spring-core-system-context.xml (100%) rename core/{test => src/test/java}/com/cloud/agent/api/SecurityGroupRulesCmdTest.java (100%) rename core/{test => src/test/java}/com/cloud/agent/api/routing/SetNetworkACLCommandTest.java (100%) rename core/{test => src/test/java}/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java (100%) rename core/{test => src/test/java}/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java (100%) rename core/{test => src/test/java}/com/cloud/agent/transport/RequestTest.java (100%) rename core/{test => src/test/java}/com/cloud/network/HAProxyConfiguratorTest.java (100%) rename core/{test => src/test/java}/com/cloud/storage/template/LocalTemplateDownloaderTest.java (100%) rename core/{test => src/test/java}/com/cloud/storage/template/OVAProcessorTest.java (100%) rename core/{test => src/test/java}/com/cloud/storage/template/QCOW2ProcessorTest.java (100%) rename core/{test => src/test/java}/com/cloud/storage/template/VhdProcessorTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/AnswerTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/CancelCommandTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java (100%) rename core/{test => src/test/java}/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java (100%) rename core/{ => src}/test/resources/vhds/test.vhd (100%) rename core/{ => src}/test/resources/vhds/test.vhd.bz2 (100%) rename core/{ => src}/test/resources/vhds/test.vhd.gz (100%) rename core/{ => src}/test/resources/vhds/test.vhd.zip (100%) rename engine/api/src/{ => main/java}/com/cloud/vm/VirtualMachineGuru.java (100%) rename engine/api/src/{ => main/java}/com/cloud/vm/VirtualMachineManager.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/BackupEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/EdgeService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/NetworkEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/NicEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/SnapshotEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/TemplateEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/VolumeEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/OrganizationScope.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/StorageEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/exception/InsufficientCapacityException.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/rest/service/api/PodRestService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/service/api/DirectoryService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/service/api/EntityService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/service/api/OperationsServices.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/service/api/OrchestrationService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/service/api/ProvisioningService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/hypervisor/ComputeSubsystem.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/network/NetworkServiceProvider.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/network/NetworkSubsystem.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/AbstractScope.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/ChapInfo.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/ClusterScope.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/CopyCommandResult.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/CreateCmdResult.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionStrategy.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/DataObject.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/DataObjectInStore.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/DataStore.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreCapabilities.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreLifeCycle.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreManager.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProvider.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/EndPoint.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/HostScope.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/HypervisorHostListener.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/ImageStoreProvider.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreInfo.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreLifeCycle.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreParameters.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreProvider.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/Scope.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotDataFactory.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotInfo.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotProfile.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotResult.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/StorageAction.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/StorageCacheManager.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/StorageEvent.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/StoragePoolAllocator.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/StorageStrategyFactory.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriority.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/TemplateDataFactory.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/TemplateEvent.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/TemplateService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/TemplateState.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotOptions.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotStrategy.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/VolumeDataFactory.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/ZoneScope.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/disktype/DiskFormat.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/disktype/QCOW2.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/disktype/Unknown.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VHD.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VHDX.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VMDK.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskType.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskTypeBase.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskTypeHelper.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/type/BaseImage.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/type/DataDisk.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/type/Iso.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/type/RootDisk.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/type/Unknown.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeType.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeBase.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelper.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/storage/command/CommandResult.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/storage/image/datastore/ImageStoreEntity.java (100%) rename engine/api/src/{ => main/java}/org/apache/cloudstack/storage/image/datastore/ImageStoreInfo.java (100%) rename engine/api/{ => src/main}/resources/META-INF/cloudstack/core/spring-engine-api-core-context.xml (100%) rename engine/api/{test => src/test/java}/org/apache/cloudstack/engine/subsystem/api/storage/ScopeTest.java (100%) rename engine/api/{test => src/test/java}/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelperTest.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/agent/AgentManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/agent/Listener.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/alert/AlertManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/capacity/CapacityManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/configuration/ConfigurationManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/deploy/DeploymentPlanningManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/event/UsageEventUtils.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/ha/HighAvailabilityManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/hypervisor/HypervisorGuruManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/network/IpAddressManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/network/NetworkStateListener.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/network/addr/PublicIp.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/network/lb/LoadBalancingRulesManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/network/rules/FirewallManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/network/rules/RulesManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/network/rules/StaticNatRuleImpl.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/network/vpc/NetworkACLManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/network/vpc/VpcManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/resource/Discoverer.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/resource/ResourceManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/resource/ResourceStateAdapter.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/storage/StorageManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/template/TemplateManager.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/ReservationContextImpl.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/VirtualMachineProfileImpl.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/VmWork.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/VmWorkAttachVolume.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/VmWorkConstants.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/VmWorkDetachVolume.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/VmWorkExtractVolume.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/VmWorkJobHandler.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/VmWorkJobHandlerProxy.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/VmWorkMigrateVolume.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/VmWorkResizeVolume.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/VmWorkSerializer.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/VmWorkTakeVolumeSnapshot.java (100%) rename engine/components-api/src/{ => main/java}/com/cloud/vm/snapshot/VMSnapshotManager.java (100%) rename engine/components-api/src/{ => main/java}/org/apache/cloudstack/compute/ComputeGuru.java (100%) rename engine/components-api/{ => src/main}/resources/META-INF/cloudstack/core/spring-engine-components-api-core-context.xml (100%) rename engine/network/src/{ => main/java}/org/apache/cloudstack/network/NetworkOrchestrator.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/agent/manager/AgentAttache.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/agent/manager/AgentManagerImpl.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/agent/manager/ClusteredAgentAttache.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/agent/manager/ClusteredAgentManagerImpl.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/agent/manager/ClusteredDirectAgentAttache.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/agent/manager/ConnectedAgentAttache.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/agent/manager/DirectAgentAttache.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/agent/manager/DummyAttache.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/agent/manager/Routable.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/agent/manager/SynchronousListener.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/cluster/ClusteredAgentRebalanceService.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/cluster/agentlb/AgentLoadBalancerPlanner.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VirtualMachineManagerImpl.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VirtualMachinePowerStateSync.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkAddVmToNetwork.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkJobDispatcher.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkJobWakeupDispatcher.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkMigrate.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkMigrateAway.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkMigrateForScale.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkMigrateWithStorage.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkReboot.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkReconfigure.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkRemoveNicFromVm.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkRemoveVmFromNetwork.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkStart.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkStop.java (100%) rename engine/orchestration/src/{ => main/java}/com/cloud/vm/VmWorkStorageMigration.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterDetailsVO.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/DcDetailVO.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDao.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDao.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDao.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDao.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java (100%) rename engine/orchestration/src/{ => main/java}/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java (100%) rename engine/orchestration/{ => src/main}/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml (100%) rename engine/orchestration/{test => src/test/java}/com/cloud/agent/manager/AgentManagerImplTest.java (100%) rename engine/orchestration/{test => src/test/java}/com/cloud/agent/manager/ConnectedAgentAttacheTest.java (100%) rename engine/orchestration/{test => src/test/java}/com/cloud/agent/manager/DirectAgentAttacheTest.java (100%) rename engine/orchestration/{test => src/test/java}/com/cloud/vm/VirtualMachineManagerImplTest.java (100%) rename engine/orchestration/{test => src/test/java}/org/apache/cloudstack/engine/orchestration/NetworkOrchestratorTest.java (100%) rename engine/orchestration/{test => src/test/java}/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java (100%) rename engine/orchestration/{test => src/test/java}/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java (100%) rename engine/orchestration/{test/resource => src/test/resources}/provisioningContext.xml (100%) rename engine/schema/src/{ => main/java}/com/cloud/alert/AlertVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/alert/dao/AlertDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/alert/dao/AlertDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/capacity/CapacityVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/capacity/dao/CapacityDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/capacity/dao/CapacityDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/certificate/CertificateVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/certificate/CrlVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/certificate/dao/CertificateDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/certificate/dao/CertificateDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/certificate/dao/CrlDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/certificate/dao/CrlDaoImpl.java (100%) rename engine/schema/src/{com => main/java/com/cloud}/cloud/configuration/ManagementServiceConfiguration.java (100%) rename engine/schema/src/{com => main/java/com/cloud}/cloud/configuration/ManagementServiceConfigurationImpl.java (100%) rename engine/schema/src/{com => main/java/com/cloud}/cloud/usage/UsageSnapshotOnPrimaryVO.java (100%) rename engine/schema/src/{com => main/java/com/cloud}/cloud/usage/dao/UsageVMSnapshotOnPrimaryDao.java (100%) rename engine/schema/src/{com => main/java/com/cloud}/cloud/usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/cluster/agentlb/HostTransferMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/cluster/agentlb/dao/HostTransferMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/configuration/ResourceCountVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/configuration/ResourceLimitVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/configuration/dao/ResourceCountDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/configuration/dao/ResourceCountDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/configuration/dao/ResourceLimitDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/configuration/dao/ResourceLimitDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/AccountVlanMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/ClusterDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/ClusterDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/ClusterDetailsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/ClusterVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/ClusterVSMMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/DataCenterDetailVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/DataCenterIpAddressVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/DataCenterVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/DataCenterVnetVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/DomainVlanMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/HostPodVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/PodCluster.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/PodVlanMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/PodVlanVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/StorageNetworkIpAddressVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/StorageNetworkIpRangeVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/VlanDetailsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/VlanVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/AccountVlanMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/AccountVlanMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/ClusterDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/ClusterDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/ClusterVSMMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/DataCenterDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/DataCenterDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/DataCenterDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/DataCenterIpAddressDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/DataCenterVnetDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/DataCenterVnetDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/DomainVlanMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/DomainVlanMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/HostPodDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/HostPodDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/PodVlanDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/PodVlanDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/PodVlanMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/PodVlanMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/StorageNetworkIpAddressDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/StorageNetworkIpRangeDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/VlanDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/VlanDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/VlanDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/dc/dao/VlanDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/domain/DomainVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/domain/dao/DomainDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/domain/dao/DomainDaoImpl.java (100%) rename engine/schema/src/{com/cloud => main/java/com/cloud/domain}/domain/DomainDetailVO.java (100%) rename engine/schema/src/{com/cloud => main/java/com/cloud/domain}/domain/dao/DomainDetailsDao.java (100%) rename engine/schema/src/{com/cloud => main/java/com/cloud/domain}/domain/dao/DomainDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/event/EventVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/event/UsageEventDetailsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/event/UsageEventVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/event/dao/EventDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/event/dao/EventDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/event/dao/UsageEventDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/event/dao/UsageEventDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/event/dao/UsageEventDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/event/dao/UsageEventDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/gpu/HostGpuGroupsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/gpu/VGPUTypesVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/gpu/dao/HostGpuGroupsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/gpu/dao/VGPUTypesDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/gpu/dao/VGPUTypesDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/host/DetailVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/host/HostTagVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/host/HostVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/host/dao/HostDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/host/dao/HostDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/host/dao/HostDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/host/dao/HostDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/host/dao/HostTagsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/host/dao/HostTagsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/hypervisor/HypervisorCapabilitiesVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/hypervisor/dao/HypervisorCapabilitiesDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/LBHealthCheckPolicyVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/UserIpv6AddressVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/VpnUserVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/AutoScalePolicyConditionMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/AutoScalePolicyVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/AutoScaleVmGroupVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/AutoScaleVmProfileVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/ConditionVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/CounterVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/AutoScalePolicyDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/AutoScaleVmGroupDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/AutoScaleVmProfileDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/ConditionDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/ConditionDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/CounterDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/as/dao/CounterDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/AccountGuestVlanMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/AccountGuestVlanMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/ExternalFirewallDeviceDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/ExternalFirewallDeviceVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/FirewallRulesCidrsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/FirewallRulesCidrsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/FirewallRulesDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/FirewallRulesDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/FirewallRulesDcidrsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/FirewallRulesDcidrsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/FirewallRulesDestCidrsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/IPAddressDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/IPAddressDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/IPAddressVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/InlineLoadBalancerNicMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LBHealthCheckPolicyDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LBStickinessPolicyDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LBStickinessPolicyVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LoadBalancerCertMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LoadBalancerCertMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LoadBalancerDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LoadBalancerDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LoadBalancerVMMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LoadBalancerVMMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/LoadBalancerVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/MonitoringServiceDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/MonitoringServiceDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/MonitoringServiceVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkAccountDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkAccountDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkAccountVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkDetailVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkDomainDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkDomainDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkDomainVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkExternalFirewallDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkExternalFirewallVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkExternalLoadBalancerDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkOpDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkOpDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkOpVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkRuleConfigDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkRuleConfigVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkServiceMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkServiceMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkServiceMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/NetworkVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/OpRouterMonitorServiceDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/OpRouterMonitorServiceVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/OvsProviderDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/OvsProviderDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PhysicalNetworkDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PhysicalNetworkDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PhysicalNetworkServiceProviderDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PhysicalNetworkTagDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PhysicalNetworkTagVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PhysicalNetworkTrafficTypeDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PhysicalNetworkVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PortProfileDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PortProfileDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/PortProfileVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/RemoteAccessVpnDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/RemoteAccessVpnVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/RouterNetworkDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/RouterNetworkDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/RouterNetworkVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/Site2SiteVpnConnectionDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/Site2SiteVpnConnectionVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/Site2SiteVpnGatewayDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/Site2SiteVpnGatewayVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/SslCertDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/SslCertDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/SslCertVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/UserIpv6AddressDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/UserIpv6AddressDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/VirtualRouterProviderDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/VpnUserDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/dao/VpnUserDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/element/OvsProviderVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/element/VirtualRouterProviderVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/rules/FirewallRuleVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/rules/PortForwardingRuleVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/rules/dao/PortForwardingRulesDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/SecurityGroupRuleVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/SecurityGroupRulesVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/SecurityGroupVMMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/SecurityGroupVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/SecurityGroupWork.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/SecurityGroupWorkVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/VmRulesetLogVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/dao/SecurityGroupDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/dao/SecurityGroupDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/dao/SecurityGroupRuleDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/dao/SecurityGroupRulesDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/dao/SecurityGroupVMMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/dao/SecurityGroupWorkDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/dao/VmRulesetLogDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/NetworkACLItemCidrsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/NetworkACLItemCidrsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/NetworkACLItemDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/NetworkACLItemVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/NetworkACLVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/PrivateIpVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/StaticRouteVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/VpcGatewayVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/VpcOfferingServiceMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/VpcOfferingVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/VpcServiceMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/VpcVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/NetworkACLDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/PrivateIpDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/StaticRouteDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/VpcDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/VpcDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/VpcGatewayDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/VpcOfferingDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/VpcServiceMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/offerings/NetworkOfferingDetailsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/offerings/NetworkOfferingServiceMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/offerings/NetworkOfferingVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/offerings/dao/NetworkOfferingDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/offerings/dao/NetworkOfferingDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/offerings/dao/NetworkOfferingDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/offerings/dao/NetworkOfferingServiceMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/projects/ProjectAccountVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/projects/ProjectInvitationVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/projects/ProjectVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/projects/dao/ProjectAccountDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/projects/dao/ProjectAccountDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/projects/dao/ProjectDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/projects/dao/ProjectDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/projects/dao/ProjectInvitationDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/projects/dao/ProjectInvitationDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/secstorage/CommandExecLogDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/secstorage/CommandExecLogDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/secstorage/CommandExecLogVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/service/ServiceOfferingDetailsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/service/ServiceOfferingVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/service/dao/ServiceOfferingDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/service/dao/ServiceOfferingDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/service/dao/ServiceOfferingDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/DiskOfferingVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/GuestOSCategoryVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/GuestOSHypervisorVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/GuestOSVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/LaunchPermissionVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/SnapshotPolicyVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/SnapshotScheduleVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/SnapshotVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/StoragePoolHostAssoc.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/StoragePoolHostVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/StoragePoolTagVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/StoragePoolWorkVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/UploadVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/VMTemplateDetailVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/VMTemplateHostVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/VMTemplateStoragePoolVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/VMTemplateVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/VMTemplateZoneVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/VolumeDetailVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/VolumeHostVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/VolumeVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/DiskOfferingDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/DiskOfferingDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/GuestOSCategoryDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/GuestOSDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/GuestOSDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/GuestOSHypervisorDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/LaunchPermissionDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/LaunchPermissionDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/SnapshotDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/SnapshotDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/SnapshotDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/SnapshotDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/SnapshotDetailsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/SnapshotPolicyDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/SnapshotScheduleDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/StoragePoolHostDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/StoragePoolHostDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/StoragePoolTagsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/StoragePoolTagsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/StoragePoolWorkDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/UploadDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/UploadDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VMTemplateDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VMTemplateDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VMTemplateDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VMTemplateHostDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VMTemplateHostDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VMTemplatePoolDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VMTemplateZoneDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VolumeDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VolumeDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VolumeDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VolumeDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VolumeHostDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/storage/dao/VolumeHostDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/tags/ResourceTagVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/tags/dao/ResourceTagDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/tags/dao/ResourceTagsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/DatabaseCreator.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/DatabaseIntegrityChecker.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/DatabaseUpgradeChecker.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/DatabaseAccessObject.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/DbUpgrade.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/DbUpgradeUtils.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/LegacyDbUpgrade.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade217to218.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade218to22.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade218to224DomainVlans.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade218to22Premium.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade2210to2211.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade2211to2212.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade2211to2212Premium.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade2212to2213.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade2213to2214.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade2214to30.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade221to222.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade221to222Premium.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade222to224.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade222to224Premium.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade224to225.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade225to226.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade227to228.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade227to228Premium.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade228to229.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade229to2210.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade301to302.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade302to303.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade302to40.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade303to304.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade304to305.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade305to306.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade306to307.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade307to410.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade30to301.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade30xBase.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade40to41.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade41000to41100.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade410to420.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade420to421.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade421to430.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade430to440.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade431to440.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade432to440.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade440to441.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade441to442.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade442to450.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade443to444.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade443to450.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade444to450.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade450to451.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade451to452.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade452to453.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade452to460.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade453to460.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade460to461.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade461to470.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade470to471.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade471to480.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade480to481.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade481to490.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade490to4910.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade4910to4920.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade4920to4930.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/Upgrade4930to41000.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/UpgradeSnapshot217to224.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/UpgradeSnapshot223to224.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/VersionDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/VersionDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/upgrade/dao/VersionVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/ExternalPublicIpStatisticsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsageIPAddressVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsageJobVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsageLoadBalancerPolicyVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsageNetworkOfferingVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsageNetworkVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsagePortForwardingRuleVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsageSecurityGroupVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsageStorageVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsageVMInstanceVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsageVMSnapshotVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsageVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsageVPNUserVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsageVmDiskVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/UsageVolumeVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/ExternalPublicIpStatisticsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageIPAddressDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageIPAddressDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageJobDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageJobDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageLoadBalancerPolicyDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageNetworkDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageNetworkDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageNetworkOfferingDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsagePortForwardingRuleDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageSecurityGroupDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageStorageDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageStorageDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageVMInstanceDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageVMSnapshotDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageVMSnapshotDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageVPNUserDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageVPNUserDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageVmDiskDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageVmDiskDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageVolumeDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/usage/dao/UsageVolumeDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/AccountDetailVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/AccountDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/AccountDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/AccountVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/SSHKeyPairVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/UserAccountVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/UserStatisticsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/UserStatsLogVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/UserVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/VmDiskStatisticsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/AccountDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/AccountDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/SSHKeyPairDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/SSHKeyPairDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/UserAccountDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/UserAccountDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/UserDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/UserDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/UserStatisticsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/UserStatisticsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/UserStatsLogDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/UserStatsLogDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/VmDiskStatisticsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/ConsoleProxyVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/DomainRouterVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/InstanceGroupVMMapVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/InstanceGroupVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/ItWorkDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/ItWorkDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/ItWorkVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/NicDetailVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/NicExtraDhcpOptionVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/NicVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/SecondaryStorageVmVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/UserVmCloneSettingVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/UserVmDetailVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/UserVmVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/VMInstanceVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/ConsoleProxyDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/ConsoleProxyDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/DomainRouterDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/DomainRouterDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/InstanceGroupDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/InstanceGroupDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/InstanceGroupVMMapDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/NicDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/NicDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/NicDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/NicDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/NicExtraDhcpOptionDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/NicExtraDhcpOptionDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/NicIpAliasDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/NicIpAliasDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/NicIpAliasVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/NicSecondaryIpDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/NicSecondaryIpDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/NicSecondaryIpVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/SecondaryStorageVmDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/UserVmCloneSettingDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/UserVmDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/UserVmDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/UserVmData.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/UserVmDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/UserVmDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/VMInstanceDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/dao/VMInstanceDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/snapshot/VMSnapshotVO.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/snapshot/dao/VMSnapshotDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/acl/RolePermissionVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/acl/RoleVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/acl/dao/RoleDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/acl/dao/RoleDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/acl/dao/RolePermissionsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/acl/dao/RolePermissionsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/affinity/AffinityGroupDomainMapVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/affinity/AffinityGroupVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/affinity/dao/AffinityGroupDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/annotation/AnnotationVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/annotation/dao/AnnotationDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/annotation/dao/AnnotationDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/ha/HAConfigVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/ha/dao/HAConfigDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/ha/dao/HAConfigDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/lb/ApplicationLoadBalancerRuleVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/dao/OutOfBandManagementDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/dao/OutOfBandManagementDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/PortableIpDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/PortableIpDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/PortableIpRangeDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/PortableIpRangeVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/PortableIpVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/RegionSyncVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/RegionVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/dao/RegionDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/dao/RegionDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/AutoScaleVmGroupDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/DiskOfferingDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/GuestOsDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/LBHealthCheckPolicyDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/LBStickinessPolicyDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/Site2SiteCustomerGatewayDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/Site2SiteVpnConnectionDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/Site2SiteVpnGatewayDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/UserDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/VpcDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/VpcGatewayDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/GuestOsDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/GuestOsDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/UserDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/ImageStoreDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/ImageStoreDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailsDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailsDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/StoragePoolVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java (100%) rename engine/schema/src/{ => main/java}/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java (100%) rename engine/schema/{ => src/main}/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml (100%) rename engine/schema/{ => src/main}/resources/META-INF/cloudstack/system/spring-engine-schema-system-checkers-context.xml (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/create-default-role-api-mappings.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/data-217to218.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-20to21.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-217to218.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-21to22-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-21to22-premium.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-21to22.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-2210to2211.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-2211to2212-premium.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-2211to2212.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-2212to2213.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-2213to2214.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-2214to30-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-2214to30.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-221to222-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-221to222-premium.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-221to222.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-222to224-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-222to224-premium.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-222to224.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-224to225-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-224to225.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-225to226.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-227to228-premium.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-227to228.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-228to229.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-229to2210.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-22beta1to22beta2.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-22beta3to22beta4.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-301to302-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-301to302.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-302to303.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-302to40-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-302to40.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-304to305-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-304to305.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-305to306-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-305to306.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-306to307.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-307to410-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-307to410.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-30to301.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-40to410-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-40to410.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-41000to41100-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-41000to41100.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-410to420-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-410to420.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-420to421.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-421to430-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-421to430.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-430to440-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-430to440.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-440to441-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-440to441.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-441to442.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-442to450-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-442to450.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-443to444.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-450to451-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-450to451.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-451to452-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-451to452.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-452to453-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-452to453.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-452to460-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-452to460.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-460to461-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-460to461.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-461to470-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-461to470.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-470to471-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-470to471.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-471to480-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-471to480.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-480to481-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-480to481.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-481to490-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-481to490.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-490to4910-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-490to4910.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-4910to4920-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-4910to4920.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-4920to4930-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-4920to4930.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-4930to41000-cleanup.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-4930to41000.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-level.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-snapshot-217to224.sql (100%) rename engine/schema/{ => src/main}/resources/META-INF/db/schema-snapshot-223to224.sql (100%) rename engine/schema/{test => src/test/java}/com/cloud/storage/dao/StoragePoolTagsDaoImplTest.java (100%) rename engine/schema/{test => src/test/java}/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java (100%) rename engine/schema/{test => src/test/java}/com/cloud/upgrade/dao/DatabaseAccessObjectTest.java (100%) rename engine/schema/{test => src/test/java}/com/cloud/upgrade/dao/DbUpgradeUtilsTest.java (100%) rename engine/schema/{test => src/test/java}/com/cloud/usage/dao/UsageStorageDaoImplTest.java (100%) rename engine/schema/{test => src/test/java}/com/cloud/vm/dao/VMInstanceDaoImplTest.java (100%) rename engine/schema/{test => src/test/java}/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImplTest.java (100%) rename engine/schema/{ => src}/test/resources/db.properties (100%) rename engine/storage/cache/src/{ => main/java}/org/apache/cloudstack/storage/cache/allocator/StorageCacheAllocator.java (100%) rename engine/storage/cache/src/{ => main/java}/org/apache/cloudstack/storage/cache/allocator/StorageCacheRandomAllocator.java (100%) rename engine/storage/cache/src/{ => main/java}/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java (100%) rename engine/storage/cache/src/{ => main/java}/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithm.java (100%) rename engine/storage/cache/src/{ => main/java}/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java (100%) rename engine/storage/cache/{ => src/main}/resources/META-INF/cloudstack/core/spring-engine-storage-cache-core-context.xml (100%) rename engine/storage/datamotion/src/{ => main/java}/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java (100%) rename engine/storage/datamotion/src/{ => main/java}/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java (100%) rename engine/storage/datamotion/src/{ => main/java}/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java (100%) rename engine/storage/datamotion/{ => src/main}/resources/META-INF/cloudstack/core/spring-engine-storage-datamotion-core-context.xml (100%) rename engine/storage/datamotion/{ => src/main}/resources/META-INF/cloudstack/storage/spring-engine-storage-datamotion-storage-context.xml (100%) rename engine/storage/datamotion/{test => src/test/java}/org/apache/cloudstack/storage/motion/AncientDataMotionStrategyTest.java (100%) rename engine/storage/image/src/{ => main/java}/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java (100%) rename engine/storage/image/src/{ => main/java}/org/apache/cloudstack/storage/image/TemplateServiceImpl.java (100%) rename engine/storage/image/src/{ => main/java}/org/apache/cloudstack/storage/image/manager/ImageStoreProviderManagerImpl.java (100%) rename engine/storage/image/src/{ => main/java}/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java (100%) rename engine/storage/image/src/{ => main/java}/org/apache/cloudstack/storage/image/store/TemplateObject.java (100%) rename engine/storage/image/src/{ => main/java}/org/apache/cloudstack/storage/image/store/lifecycle/ImageStoreLifeCycle.java (100%) rename engine/storage/image/{ => src/main}/resources/META-INF/cloudstack/core/spring-engine-storage-image-core-context.xml (100%) rename engine/storage/integration-test/{test => src/test/java}/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/MockLocalNfsSecondaryStorageResource.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/allocator/StorageAllocatorTestConfiguration.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRUTest.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/AllTests.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/AopTest.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/AopTestAdvice.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/ChildTestConfiguration.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/DirectAgentTest.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/EndpointSelectorTest.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/MockRpcCallBack.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/S3TemplateTest.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/SnapshotTest.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/StorageFactoryBean.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/StorageTest.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/TemplateTest.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/TestConfiguration.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/TestHttp.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/TestNG.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/TestNGAop.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/VolumeServiceTest.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/VolumeTest.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/VolumeTestVmware.java (100%) rename engine/storage/integration-test/{test => src/test/java}/org/apache/cloudstack/storage/test/XenEndpoint.java (100%) rename engine/storage/integration-test/{ => src}/test/resources/StorageAllocatorTestContext.xml (100%) rename engine/storage/integration-test/{ => src}/test/resources/component.xml (100%) rename engine/storage/integration-test/{test/resource => src/test/resources}/fakeDriverTestContext.xml (100%) rename engine/storage/integration-test/{ => src}/test/resources/s3_testng.xml (100%) rename engine/storage/integration-test/{ => src}/test/resources/storageContext.xml (100%) rename engine/storage/integration-test/{ => src}/test/resources/testng.xml (100%) rename engine/storage/snapshot/src/{ => main/java}/org/apache/cloudstack/storage/snapshot/SnapshotBackupException.java (100%) rename engine/storage/snapshot/src/{ => main/java}/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java (100%) rename engine/storage/snapshot/src/{ => main/java}/org/apache/cloudstack/storage/snapshot/SnapshotObject.java (100%) rename engine/storage/snapshot/src/{ => main/java}/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java (100%) rename engine/storage/snapshot/src/{ => main/java}/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManager.java (100%) rename engine/storage/snapshot/src/{ => main/java}/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java (100%) rename engine/storage/snapshot/src/{ => main/java}/org/apache/cloudstack/storage/snapshot/SnapshotStrategyBase.java (100%) rename engine/storage/snapshot/src/{ => main/java}/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java (100%) rename engine/storage/snapshot/src/{ => main/java}/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java (100%) rename engine/storage/snapshot/src/{ => main/java}/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java (100%) rename engine/storage/snapshot/{ => src/main}/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml (100%) rename engine/storage/snapshot/{ => src/main}/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml (100%) rename engine/storage/snapshot/{test => src/test/java}/src/SnapshotDataFactoryTest.java (100%) rename engine/storage/snapshot/{test => src/test/java}/src/VMSnapshotStrategyTest.java (100%) rename engine/storage/snapshot/{ => src}/test/resources/SnapshotManagerTestContext.xml (100%) rename engine/storage/snapshot/{ => src}/test/resources/db.properties (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/BaseType.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/EndPoint.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/LocalHostEndpoint.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/RemoteHostEndPoint.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/allocator/UseLocalForRootAllocator.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/backup/SnapshotOnBackupStoreInfo.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/backup/datastore/BackupStoreInfo.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/datastore/DataObjectManager.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/datastore/DataStore.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManager.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/datastore/PrimaryDataStoreProviderManager.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/datastore/TemplateInDataStore.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/datastore/protocol/DataStoreProtocol.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/db/ObjectInDataStoreDao.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/helper/HypervisorHelper.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/helper/StorageStrategyFactoryImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/ImageStoreDriver.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/NfsImageStoreDriverImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/TemplateEntityImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/datastore/ImageStoreHelper.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/datastore/ImageStoreProviderManager.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/format/BAREMETAL.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/format/ISO.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/format/ImageFormat.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/format/ImageFormatHelper.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/format/OVA.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/format/QCOW2.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/format/RAW.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/format/Unknown.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/format/VHD.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/format/VHDX.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/image/motion/ImageMotionService.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotHelper.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/volume/TemplateOnPrimaryDataStoreInfo.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/volume/VolumeEvent.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java (100%) rename engine/storage/src/{ => main/java}/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java (100%) rename engine/storage/{ => src/main}/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml (100%) rename engine/storage/{ => src/main}/resources/META-INF/cloudstack/storage-allocator/module.properties (100%) rename engine/storage/{ => src/main}/resources/META-INF/cloudstack/storage-allocator/spring-engine-storage-storage-allocator-context.xml (100%) rename engine/storage/{test => src/test/java}/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriorityTest.java (100%) rename engine/storage/{test => src/test/java}/org/apache/cloudstack/storage/BaseTypeTest.java (100%) rename engine/storage/volume/src/{ => main/java}/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java (100%) rename engine/storage/volume/src/{ => main/java}/org/apache/cloudstack/storage/datastore/manager/PrimaryDataStoreProviderManagerImpl.java (100%) rename engine/storage/volume/src/{ => main/java}/org/apache/cloudstack/storage/datastore/manager/data model.ucls (88%) rename engine/storage/volume/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java (100%) rename engine/storage/volume/src/{ => main/java}/org/apache/cloudstack/storage/datastore/type/DataStoreType.java (100%) rename engine/storage/volume/src/{ => main/java}/org/apache/cloudstack/storage/datastore/type/ISCSI.java (100%) rename engine/storage/volume/src/{ => main/java}/org/apache/cloudstack/storage/datastore/type/NetworkFileSystem.java (100%) rename engine/storage/volume/src/{ => main/java}/org/apache/cloudstack/storage/datastore/type/SharedMount.java (100%) rename engine/storage/volume/src/{ => main/java}/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java (100%) rename engine/storage/volume/src/{ => main/java}/org/apache/cloudstack/storage/volume/VolumeObject.java (100%) rename engine/storage/volume/src/{ => main/java}/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java (100%) rename engine/storage/volume/{ => src/main}/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml (100%) rename engine/storage/volume/{test => src/test/java}/org/apache/cloudstack/storage/volume/VolumeObjectTest.java (100%) rename engine/storage/volume/{test => src/test/java}/org/apache/cloudstack/storage/volume/test/ConfiguratorTest.java (100%) rename engine/storage/volume/{test => src/test/java}/org/apache/cloudstack/storage/volume/test/Server.java (100%) rename engine/storage/volume/{test => src/test/java}/org/apache/cloudstack/storage/volume/test/Server1.java (100%) rename engine/storage/volume/{test => src/test/java}/org/apache/cloudstack/storage/volume/test/TestConfiguration.java (100%) rename engine/storage/volume/{test => src/test/java}/org/apache/cloudstack/storage/volume/test/TestInProcessAsync.java (100%) rename engine/storage/volume/{ => src}/test/resource/testContext.xml (100%) rename framework/ca/src/{ => main/java}/org/apache/cloudstack/framework/ca/CAProvider.java (100%) rename framework/ca/src/{ => main/java}/org/apache/cloudstack/framework/ca/CAService.java (100%) rename framework/ca/src/{ => main/java}/org/apache/cloudstack/framework/ca/Certificate.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ActiveFencingException.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterFenceManager.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterFenceManagerImpl.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterInvalidSessionException.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterManager.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterManagerImpl.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterManagerListener.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterManagerMBean.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterManagerMBeanImpl.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterManagerMessage.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterNodeJoinEventArgs.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterNodeLeftEventArgs.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterService.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterServiceAdapter.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterServicePdu.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterServiceRequestPdu.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterServiceServletAdapter.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterServiceServletContainer.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterServiceServletHttpHandler.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ClusterServiceServletImpl.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ManagementServerHost.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ManagementServerHostPeerVO.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/ManagementServerHostVO.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/RemoteMethodConstants.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/dao/ManagementServerHostDao.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/dao/ManagementServerHostPeerDao.java (100%) rename framework/cluster/src/{ => main/java}/com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java (100%) rename framework/cluster/{ => src/main}/resources/META-INF/cloudstack/core/spring-framework-cluster-core-context.xml (100%) rename framework/cluster/{test => src/test/java}/com/cloud/cluster/ClusterServiceServletAdapterTest.java (100%) rename framework/config/src/{ => main/java}/org/apache/cloudstack/config/Configuration.java (100%) rename framework/config/src/{ => main/java}/org/apache/cloudstack/framework/config/ConfigDepot.java (100%) rename framework/config/src/{ => main/java}/org/apache/cloudstack/framework/config/ConfigDepotAdmin.java (100%) rename framework/config/src/{ => main/java}/org/apache/cloudstack/framework/config/ConfigKey.java (100%) rename framework/config/src/{ => main/java}/org/apache/cloudstack/framework/config/Configurable.java (100%) rename framework/config/src/{ => main/java}/org/apache/cloudstack/framework/config/ScopedConfigStorage.java (100%) rename framework/config/src/{ => main/java}/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java (100%) rename framework/config/src/{ => main/java}/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java (100%) rename framework/config/src/{ => main/java}/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java (100%) rename framework/config/src/{ => main/java}/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java (100%) rename framework/config/{ => src/main}/resources/META-INF/cloudstack/system/spring-framework-config-system-context-inheritable.xml (100%) rename framework/config/{ => src/main}/resources/META-INF/cloudstack/system/spring-framework-config-system-context.xml (100%) rename framework/config/{test => src/test/java}/org/apache/cloudstack/framework/config/ConfigKeyTest.java (100%) rename framework/config/{test => src/test/java}/org/apache/cloudstack/framework/config/impl/ConfigDepotAdminTest.java (100%) rename framework/db/src/{ => main/java}/com/cloud/dao/EntityManagerImpl.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/Attribute.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/ConnectionConcierge.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/ConnectionConciergeMBean.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/DB.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/DbUtil.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/DriverLoader.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/EcInfo.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/Encrypt.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/Filter.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/GenericDao.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/GenericDaoBase.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/GenericQueryBuilder.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/GenericSearchBuilder.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/GlobalLock.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/GroupBy.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/JoinBuilder.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/JoinType.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/Merovingian2.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/MerovingianMBean.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/QueryBuilder.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/ScriptRunner.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/SearchBase.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/SearchBuilder.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/SearchCriteria.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/SequenceFetcher.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/SqlGenerator.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/StateMachine.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/Transaction.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/TransactionAttachment.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/TransactionCallback.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/TransactionCallbackNoReturn.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/TransactionCallbackWithException.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/TransactionCallbackWithExceptionNoReturn.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/TransactionContextBuilder.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/TransactionContextInterceptor.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/TransactionContextListener.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/TransactionLegacy.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/TransactionMBean.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/TransactionMBeanImpl.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/TransactionStatus.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/UpdateBuilder.java (100%) rename framework/db/src/{ => main/java}/com/cloud/utils/db/UpdateFilter.java (100%) rename framework/db/{ => src/main}/resources/META-INF/cloudstack/system/spring-framework-db-system-context.xml (100%) rename framework/db/{ => src}/test/db.properties (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/DbUtilTest.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/DbAnnotatedBase.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/DbAnnotatedBaseDerived.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/DbTestDao.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/DbTestUtils.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/DbTestVO.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/DummyComponent.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/ElementCollectionTest.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/FilterTest.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/GenericDaoBaseTest.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/GlobalLockTest.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/GroupByTest.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/Merovingian2Test.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/TestTransaction.java (100%) rename framework/db/{test => src/test/java}/com/cloud/utils/db/TransactionContextBuilderTest.java (100%) rename framework/db/{ => src}/test/resources/db.properties (100%) rename framework/direct-download/src/{ => main/java}/org/apache/cloudstack/framework/agent/direct/download/DirectDownloadService.java (100%) rename framework/events/src/{ => main/java}/org/apache/cloudstack/framework/events/Event.java (100%) rename framework/events/src/{ => main/java}/org/apache/cloudstack/framework/events/EventBus.java (100%) rename framework/events/src/{ => main/java}/org/apache/cloudstack/framework/events/EventBusException.java (100%) rename framework/events/src/{ => main/java}/org/apache/cloudstack/framework/events/EventSubscriber.java (100%) rename framework/events/src/{ => main/java}/org/apache/cloudstack/framework/events/EventTopic.java (100%) rename framework/ipc/src/{ => main/java}/com/cloud/agent/manager/Commands.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/async/AsyncCallFuture.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/async/AsyncCallbackDriver.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/async/AsyncCompletionCallback.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/async/AsyncRpcContext.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/async/InplaceAsyncCallbackDriver.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/client/ClientMessageBus.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/client/ClientTransportConnection.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/client/ClientTransportEndpoint.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/client/ClientTransportEndpointSite.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/client/ClientTransportProvider.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/messagebus/MessageBus.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/messagebus/MessageBusBase.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/messagebus/MessageBusEndpoint.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/messagebus/MessageDetector.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/messagebus/MessageDispatcher.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/messagebus/MessageHandler.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/messagebus/MessageSubscriber.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/messagebus/PublishScope.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcCallRequestPdu.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcCallResponsePdu.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcCallbackDispatcher.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcCallbackListener.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcClientCall.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcException.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcIOException.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcProvider.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcServerCall.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcServerCallImpl.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcServiceDispatcher.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcServiceEndpoint.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcServiceHandler.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/rpc/RpcTimeoutException.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/serializer/JsonMessageSerializer.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/serializer/MessageSerializer.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/serializer/OnwireName.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/server/ServerMessageBus.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/server/ServerTransportProvider.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/transport/TransportAddress.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/transport/TransportAddressMapper.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/transport/TransportAttachRequestPdu.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/transport/TransportAttachResponsePdu.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/transport/TransportConnectRequestPdu.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/transport/TransportConnectResponsePdu.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/transport/TransportDataPdu.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/transport/TransportEndpoint.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/transport/TransportEndpointSite.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/transport/TransportMultiplexier.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/transport/TransportPdu.java (100%) rename framework/ipc/src/{ => main/java}/org/apache/cloudstack/framework/transport/TransportProvider.java (100%) rename framework/ipc/{ => src/main}/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml (100%) rename framework/ipc/{test => src/test/java}/org/apache/cloudstack/framework/codestyle/AsyncSampleCallee.java (100%) rename framework/ipc/{test => src/test/java}/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java (100%) rename framework/ipc/{test => src/test/java}/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java (100%) rename framework/ipc/{test => src/test/java}/org/apache/cloudstack/framework/sampleserver/SampleManagementServer.java (100%) rename framework/ipc/{test => src/test/java}/org/apache/cloudstack/framework/sampleserver/SampleManagementServerApp.java (100%) rename framework/ipc/{test => src/test/java}/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java (100%) rename framework/ipc/{test => src/test/java}/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java (100%) rename framework/ipc/{test => src/test/java}/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareAnswer.java (100%) rename framework/ipc/{test => src/test/java}/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareCommand.java (100%) rename framework/ipc/{test => src/test/java}/org/apache/cloudstack/messagebus/TestMessageBus.java (100%) rename framework/ipc/{ => src}/test/resources/MessageBusTestContext.xml (100%) rename framework/ipc/{ => src}/test/resources/SampleManagementServerAppContext.xml (100%) rename framework/ipc/{ => src}/test/resources/log4j-cloud.xml (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/AsyncJob.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/AsyncJobDispatcher.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/AsyncJobMBean.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/AsyncJobManager.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/Outcome.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/dao/AsyncJobDao.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDao.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDaoImpl.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/dao/AsyncJobJournalDao.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/dao/AsyncJobJournalDaoImpl.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/dao/SyncQueueDao.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/dao/SyncQueueDaoImpl.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDao.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDaoImpl.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDao.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/AsyncJobJoinMapVO.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/AsyncJobJournalVO.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/AsyncJobMBeanImpl.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/AsyncJobVO.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/OutcomeImpl.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/SyncQueueItem.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/SyncQueueItemVO.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/SyncQueueManager.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/SyncQueueVO.java (100%) rename framework/jobs/src/{ => main/java}/org/apache/cloudstack/framework/jobs/impl/VmWorkJobVO.java (100%) rename framework/jobs/{ => src/main}/resources/META-INF/cloudstack/core/spring-framework-jobs-core-context.xml (100%) rename framework/jobs/{test => src/test/java}/org/apache/cloudstack/framework/jobs/AsyncJobManagerTest.java (100%) rename framework/jobs/{test => src/test/java}/org/apache/cloudstack/framework/jobs/AsyncJobManagerTestConfiguration.java (100%) rename framework/jobs/{test => src/test/java}/org/apache/cloudstack/framework/jobs/AsyncJobTestDashboard.java (100%) rename framework/jobs/{test => src/test/java}/org/apache/cloudstack/framework/jobs/AsyncJobTestDispatcher.java (100%) rename framework/jobs/{ => src}/test/resources/AsyncJobManagerTestContext.xml (100%) rename framework/jobs/{ => src}/test/resources/commonContext.xml (100%) rename framework/jobs/{ => src}/test/resources/db.properties (100%) rename framework/jobs/{ => src}/test/resources/log4j.properties (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/QuotaAlertManager.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/QuotaManager.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/QuotaManagerImpl.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/QuotaStatement.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/QuotaStatementImpl.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/constant/QuotaConfig.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/constant/QuotaTypes.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/QuotaAccountDao.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/QuotaAccountDaoImpl.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/QuotaBalanceDao.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/QuotaBalanceDaoImpl.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/QuotaCreditsDao.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/QuotaCreditsDaoImpl.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/QuotaEmailTemplatesDao.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/QuotaEmailTemplatesDaoImpl.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/QuotaTariffDao.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/QuotaTariffDaoImpl.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/QuotaUsageDao.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/QuotaUsageDaoImpl.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/ServiceOfferingDao.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/ServiceOfferingDaoImpl.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/UserVmDetailsDao.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/dao/UserVmDetailsDaoImpl.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/vo/QuotaAccountVO.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/vo/QuotaBalanceVO.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/vo/QuotaCreditsVO.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/vo/QuotaEmailTemplatesVO.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/vo/QuotaTariffVO.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/vo/QuotaUsageVO.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java (100%) rename framework/quota/src/{ => main/java}/org/apache/cloudstack/quota/vo/UserVmDetailVO.java (100%) rename framework/quota/{ => src/main}/resources/META-INF/cloudstack/quota/spring-framework-quota-context.xml (100%) rename framework/quota/{test => src/test/java}/org/apache/cloudstack/quota/QuotaAlertManagerImplTest.java (100%) rename framework/quota/{test => src/test/java}/org/apache/cloudstack/quota/QuotaManagerImplTest.java (100%) rename framework/quota/{test => src/test/java}/org/apache/cloudstack/quota/QuotaStatementTest.java (100%) rename framework/quota/{test => src/test/java}/org/apache/cloudstack/quota/constant/QuotaTypesTest.java (100%) rename framework/rest/src/{ => main/java}/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationIntrospector.java (100%) rename framework/rest/src/{ => main/java}/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationModule.java (100%) rename framework/rest/src/{ => main/java}/org/apache/cloudstack/framework/ws/jackson/UriSerializer.java (100%) rename framework/rest/src/{ => main/java}/org/apache/cloudstack/framework/ws/jackson/UrisSerializer.java (100%) rename framework/rest/src/{ => main/java}/org/apache/cloudstack/framework/ws/jackson/Url.java (100%) rename framework/rest/{test => src/test/java}/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationTest.java (100%) rename framework/security/src/{ => main/java}/org/apache/cloudstack/framework/security/keys/KeysManager.java (100%) rename framework/security/src/{ => main/java}/org/apache/cloudstack/framework/security/keys/KeysManagerImpl.java (100%) rename framework/security/src/{ => main/java}/org/apache/cloudstack/framework/security/keystore/KeystoreDao.java (100%) rename framework/security/src/{ => main/java}/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java (100%) rename framework/security/src/{ => main/java}/org/apache/cloudstack/framework/security/keystore/KeystoreManager.java (100%) rename framework/security/src/{ => main/java}/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java (100%) rename framework/security/src/{ => main/java}/org/apache/cloudstack/framework/security/keystore/KeystoreVO.java (100%) rename framework/security/{ => src/main}/resources/META-INF/cloudstack/core/spring-framework-security-core-context.xml (100%) delete mode 100644 maven-standard/pom.xml rename plugins/acl/dynamic-role-based/src/{ => main/java}/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessChecker.java (100%) rename plugins/acl/dynamic-role-based/{ => src/main}/resources/META-INF/cloudstack/acl-dynamic-role-based/module.properties (100%) rename plugins/acl/dynamic-role-based/{ => src/main}/resources/META-INF/cloudstack/acl-dynamic-role-based/spring-acl-dynamic-role-based-context.xml (100%) rename plugins/acl/dynamic-role-based/{test => src/test/java}/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessCheckerTest.java (100%) rename plugins/acl/static-role-based/src/{ => main/java}/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java (100%) rename plugins/acl/static-role-based/{ => src/main}/resources/META-INF/cloudstack/acl-static-role-based/module.properties (100%) rename plugins/acl/static-role-based/{ => src/main}/resources/META-INF/cloudstack/acl-static-role-based/spring-acl-static-role-based-context.xml (100%) rename plugins/affinity-group-processors/explicit-dedication/src/{ => main/java}/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java (100%) rename plugins/affinity-group-processors/explicit-dedication/{ => src/main}/resources/META-INF/cloudstack/explicit-dedication/module.properties (100%) rename plugins/affinity-group-processors/explicit-dedication/{ => src/main}/resources/META-INF/cloudstack/explicit-dedication/spring-explicit-dedication-context.xml (100%) rename plugins/affinity-group-processors/host-anti-affinity/src/{ => main/java}/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java (100%) rename plugins/affinity-group-processors/host-anti-affinity/{ => src/main}/resources/META-INF/cloudstack/host-anti-affinity/module.properties (100%) rename plugins/affinity-group-processors/host-anti-affinity/{ => src/main}/resources/META-INF/cloudstack/host-anti-affinity/spring-host-anti-affinity-context.xml (100%) rename plugins/alert-handlers/snmp-alerts/src/{ => main/java}/org/apache/cloudstack/alert/snmp/CsSnmpConstants.java (100%) rename plugins/alert-handlers/snmp-alerts/src/{ => main/java}/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayout.java (100%) rename plugins/alert-handlers/snmp-alerts/src/{ => main/java}/org/apache/cloudstack/alert/snmp/SnmpHelper.java (100%) rename plugins/alert-handlers/snmp-alerts/src/{ => main/java}/org/apache/cloudstack/alert/snmp/SnmpTrapAppender.java (100%) rename plugins/alert-handlers/snmp-alerts/src/{ => main/java}/org/apache/cloudstack/alert/snmp/SnmpTrapInfo.java (100%) rename plugins/alert-handlers/snmp-alerts/{test => src/test/java}/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayoutTest.java (100%) rename plugins/alert-handlers/snmp-alerts/{test => src/test/java}/org/apache/cloudstack/alert/snmp/SnmpTrapAppenderTest.java (100%) rename plugins/alert-handlers/syslog-alerts/src/{ => main/java}/org/apache/cloudstack/syslog/AlertsSyslogAppender.java (100%) rename plugins/alert-handlers/syslog-alerts/{test => src/test/java}/org/apache/cloudstack/syslog/AlertsSyslogAppenderTest.java (100%) rename plugins/api/discovery/src/{ => main/java}/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java (100%) rename plugins/api/discovery/src/{ => main/java}/org/apache/cloudstack/api/response/ApiDiscoveryResponse.java (100%) rename plugins/api/discovery/src/{ => main/java}/org/apache/cloudstack/api/response/ApiParameterResponse.java (100%) rename plugins/api/discovery/src/{ => main/java}/org/apache/cloudstack/api/response/ApiResponseResponse.java (100%) rename plugins/api/discovery/src/{ => main/java}/org/apache/cloudstack/discovery/ApiDiscoveryService.java (100%) rename plugins/api/discovery/src/{ => main/java}/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java (100%) rename plugins/api/discovery/{test => src/test/java}/org/apache/cloudstack/discovery/ApiDiscoveryTest.java (100%) rename plugins/api/rate-limit/src/{ => main/java}/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java (100%) rename plugins/api/rate-limit/src/{ => main/java}/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java (100%) rename plugins/api/rate-limit/src/{ => main/java}/org/apache/cloudstack/api/response/ApiLimitResponse.java (100%) rename plugins/api/rate-limit/src/{ => main/java}/org/apache/cloudstack/ratelimit/ApiRateLimitService.java (100%) rename plugins/api/rate-limit/src/{ => main/java}/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java (100%) rename plugins/api/rate-limit/src/{ => main/java}/org/apache/cloudstack/ratelimit/EhcacheLimitStore.java (100%) rename plugins/api/rate-limit/src/{ => main/java}/org/apache/cloudstack/ratelimit/LimitStore.java (100%) rename plugins/api/rate-limit/src/{ => main/java}/org/apache/cloudstack/ratelimit/StoreEntry.java (100%) rename plugins/api/rate-limit/src/{ => main/java}/org/apache/cloudstack/ratelimit/StoreEntryImpl.java (100%) rename plugins/api/rate-limit/{ => src/main}/resources/META-INF/cloudstack/rate-limit/module.properties (100%) rename plugins/api/rate-limit/{ => src/main}/resources/META-INF/cloudstack/rate-limit/spring-rate-limit-context.xml (100%) rename plugins/api/rate-limit/{test => src/test/java}/org/apache/cloudstack/ratelimit/ApiRateLimitTest.java (100%) rename plugins/api/rate-limit/{test => src/test/java}/org/apache/cloudstack/ratelimit/integration/APITest.java (100%) rename plugins/api/rate-limit/{test => src/test/java}/org/apache/cloudstack/ratelimit/integration/LoginResponse.java (100%) rename plugins/api/rate-limit/{test => src/test/java}/org/apache/cloudstack/ratelimit/integration/RateLimitIntegrationTest.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/command/admin/solidfire/GetPathForVolumeCmd.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireAccountIdCmd.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeAccessGroupIdCmd.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeSizeCmd.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeSnapshotDetailsCmd.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeiScsiNameCmd.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/response/solidfire/ApiPathForVolumeResponse.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/response/solidfire/ApiSolidFireAccountIdResponse.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/response/solidfire/ApiSolidFireVolumeAccessGroupIdResponse.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/response/solidfire/ApiSolidFireVolumeSizeResponse.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/response/solidfire/ApiVolumeSnapshotDetailsResponse.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/response/solidfire/ApiVolumeiScsiNameResponse.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/solidfire/ApiSolidFireIntegrationTestService.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/api/solidfire/ApiSolidFireIntegrationTestServiceImpl.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/solidfire/SolidFireIntegrationTestManager.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/solidfire/SolidFireIntegrationTestManagerImpl.java (100%) rename plugins/api/solidfire-intg-test/src/{ => main/java}/org/apache/cloudstack/util/solidfire/SolidFireIntegrationTestUtil.java (100%) rename plugins/api/solidfire-intg-test/{ => src/main}/resources/META-INF/cloudstack/solidfire-intg-test/module.properties (100%) rename plugins/api/solidfire-intg-test/{ => src/main}/resources/META-INF/cloudstack/solidfire-intg-test/spring-solidfire-intg-test-context.xml (100%) rename plugins/api/vmware-sioc/src/{ => main/java}/org/apache/cloudstack/api/command/admin/sioc/UpdateSiocInfoCmd.java (100%) rename plugins/api/vmware-sioc/src/{ => main/java}/org/apache/cloudstack/api/response/sioc/ApiUpdateSiocInfoResponse.java (100%) rename plugins/api/vmware-sioc/src/{ => main/java}/org/apache/cloudstack/api/sioc/ApiSiocService.java (100%) rename plugins/api/vmware-sioc/src/{ => main/java}/org/apache/cloudstack/api/sioc/ApiSiocServiceImpl.java (100%) rename plugins/api/vmware-sioc/src/{ => main/java}/org/apache/cloudstack/sioc/SiocManager.java (100%) rename plugins/api/vmware-sioc/src/{ => main/java}/org/apache/cloudstack/sioc/SiocManagerImpl.java (100%) rename plugins/api/vmware-sioc/src/{ => main/java}/org/apache/cloudstack/util/LoginInfo.java (100%) rename plugins/api/vmware-sioc/src/{ => main/java}/org/apache/cloudstack/util/vmware/VMwareUtil.java (100%) rename plugins/api/vmware-sioc/{ => src/main}/resources/META-INF/cloudstack/vmware-sioc/module.properties (100%) rename plugins/api/vmware-sioc/{ => src/main}/resources/META-INF/cloudstack/vmware-sioc/spring-sioc-context.xml (100%) rename plugins/ca/root-ca/src/{ => main/java}/org/apache/cloudstack/ca/provider/RootCACustomTrustManager.java (100%) rename plugins/ca/root-ca/src/{ => main/java}/org/apache/cloudstack/ca/provider/RootCAProvider.java (100%) rename plugins/ca/root-ca/{ => src/main}/resources/META-INF/cloudstack/root-ca/module.properties (100%) rename plugins/ca/root-ca/{ => src/main}/resources/META-INF/cloudstack/root-ca/spring-root-ca-context.xml (100%) rename plugins/ca/root-ca/{test => src/test/java}/org/apache/cloudstack/ca/provider/RootCACustomTrustManagerTest.java (100%) rename plugins/ca/root-ca/{test => src/test/java}/org/apache/cloudstack/ca/provider/RootCAProviderTest.java (100%) rename plugins/database/mysql-ha/src/{ => main/java}/com/cloud/utils/db/StaticStrategy.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/command/QuotaBalanceCmd.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/command/QuotaCreditsCmd.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmd.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmd.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/command/QuotaEnabledCmd.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/command/QuotaStatementCmd.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/command/QuotaSummaryCmd.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/command/QuotaTariffListCmd.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/command/QuotaUpdateCmd.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/response/QuotaBalanceResponse.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/response/QuotaCreditsResponse.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/response/QuotaEmailTemplateResponse.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/response/QuotaEnabledResponse.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/response/QuotaResponseBuilder.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/response/QuotaStatementItemResponse.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/response/QuotaStatementResponse.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/response/QuotaSummaryResponse.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/response/QuotaTariffResponse.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/response/QuotaTypeResponse.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/api/response/QuotaUpdateResponse.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/quota/QuotaService.java (100%) rename plugins/database/quota/src/{ => main/java}/org/apache/cloudstack/quota/QuotaServiceImpl.java (100%) rename plugins/database/quota/{ => src/main}/resources/META-INF/cloudstack/quota/module.properties (100%) rename plugins/database/quota/{ => src/main}/resources/META-INF/cloudstack/quota/spring-quota-context.xml (100%) rename plugins/database/quota/{test => src/test/java}/org/apache/cloudstack/api/command/QuotaBalanceCmdTest.java (100%) rename plugins/database/quota/{test => src/test/java}/org/apache/cloudstack/api/command/QuotaCreditsCmdTest.java (100%) rename plugins/database/quota/{test => src/test/java}/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmdTest.java (100%) rename plugins/database/quota/{test => src/test/java}/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmdTest.java (100%) rename plugins/database/quota/{test => src/test/java}/org/apache/cloudstack/api/command/QuotaStatementCmdTest.java (100%) rename plugins/database/quota/{test => src/test/java}/org/apache/cloudstack/api/command/QuotaTariffListCmdTest.java (100%) rename plugins/database/quota/{test => src/test/java}/org/apache/cloudstack/api/command/QuotaTariffUpdateCmdTest.java (100%) rename plugins/database/quota/{test => src/test/java}/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java (100%) rename plugins/database/quota/{test => src/test/java}/org/apache/cloudstack/quota/QuotaServiceImplTest.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/commands/DedicateClusterCmd.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/commands/DedicateHostCmd.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/commands/DedicatePodCmd.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/commands/DedicateZoneCmd.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/response/DedicateClusterResponse.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/response/DedicateHostResponse.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/response/DedicatePodResponse.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/api/response/DedicateZoneResponse.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java (100%) rename plugins/dedicated-resources/src/{ => main/java}/org/apache/cloudstack/dedicated/DedicatedService.java (100%) rename plugins/dedicated-resources/{ => src/main}/resources/META-INF/cloudstack/core/spring-dedicated-resources-core-context.xml (100%) rename plugins/dedicated-resources/{test => src/test/java}/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java (100%) rename plugins/dedicated-resources/{test/resource => src/test/resources}/dedicatedContext.xml (100%) rename plugins/deployment-planners/implicit-dedication/src/{ => main/java}/com/cloud/deploy/ImplicitDedicationPlanner.java (100%) rename plugins/deployment-planners/implicit-dedication/{ => src/main}/resources/META-INF/cloudstack/implicit-dedication/module.properties (100%) rename plugins/deployment-planners/implicit-dedication/{ => src/main}/resources/META-INF/cloudstack/implicit-dedication/spring-implicit-dedication-context.xml (100%) rename plugins/deployment-planners/implicit-dedication/{test => src/test/java}/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java (100%) rename plugins/deployment-planners/user-concentrated-pod/src/{ => main/java}/com/cloud/deploy/UserConcentratedPodPlanner.java (100%) rename plugins/deployment-planners/user-concentrated-pod/{ => src/main}/resources/META-INF/cloudstack/user-concentrated-pod/module.properties (100%) rename plugins/deployment-planners/user-concentrated-pod/{ => src/main}/resources/META-INF/cloudstack/user-concentrated-pod/spring-user-concentrated-pod-context.xml (100%) rename plugins/deployment-planners/user-dispersing/src/{ => main/java}/com/cloud/deploy/UserDispersingPlanner.java (100%) rename plugins/event-bus/inmemory/src/{ => main/java}/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java (100%) rename plugins/event-bus/inmemory/{test => src/test/java}/org/apache/cloudstack/mom/inmemory/InMemoryEventBusTest.java (100%) rename plugins/event-bus/kafka/src/{ => main/java}/org/apache/cloudstack/mom/kafka/KafkaEventBus.java (100%) rename plugins/event-bus/rabbitmq/src/{ => main/java}/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/api/commands/netapp/AssociateLunCmd.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/api/commands/netapp/CreateLunCmd.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/api/commands/netapp/DestroyLunCmd.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/api/commands/netapp/DissociateLunCmd.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/api/commands/netapp/ListLunsCmd.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/netapp/LunVO.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/netapp/NetappAllocator.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/netapp/NetappDefaultAllocatorImpl.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/netapp/NetappManager.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/netapp/NetappManagerImpl.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/netapp/NetappVolumeVO.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/netapp/PoolVO.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/netapp/dao/LunDao.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/netapp/dao/LunDaoImpl.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/netapp/dao/PoolDao.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/netapp/dao/PoolDaoImpl.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/netapp/dao/VolumeDao.java (100%) rename plugins/file-systems/netapp/src/{ => main/java}/com/cloud/netapp/dao/VolumeDaoImpl.java (100%) rename plugins/ha-planners/skip-heurestics/src/{ => main/java}/com/cloud/deploy/SkipHeuresticsPlanner.java (100%) rename plugins/ha-planners/skip-heurestics/{ => src/main}/resources/META-INF/cloudstack/skip-heurestics/module.properties (100%) rename plugins/ha-planners/skip-heurestics/{ => src/main}/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml (100%) rename plugins/host-allocators/random/src/{ => main/java}/com/cloud/agent/manager/allocator/impl/RandomAllocator.java (100%) rename plugins/host-allocators/random/{ => src/main}/resources/META-INF/cloudstack/host-allocator-random/module.properties (100%) rename plugins/host-allocators/random/{ => src/main}/resources/META-INF/cloudstack/host-allocator-random/spring-host-allocator-random-context.xml (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/database/BaremetalDhcpDao.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/database/BaremetalDhcpVO.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/database/BaremetalPxeDao.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/database/BaremetalPxeVO.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/database/BaremetalRctDao.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/database/BaremetalRctDaoImpl.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/database/BaremetalRctVO.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/manager/BareMetalDiscoverer.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/manager/BareMetalGuru.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/manager/BareMetalPlanner.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/manager/BaremetalManager.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/manager/BaremetalManagerImpl.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/manager/BaremetalRct.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/manager/BaremetalVlanManager.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BareMetalPxeServiceBase.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BareMetalResourceBase.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalDhcpResourceBase.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalDhcpResponse.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalDhcpdResource.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalPxeElement.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalPxeManager.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalPxePingResponse.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalPxeResourceBase.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalPxeResponse.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalPxeService.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalRctResponse.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalSwitchBackend.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalVirtualRouterCommands.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/BaremetalVlanStruct.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/Force10BaremetalSwitchBackend.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/SecurityGroupHttpClient.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/schema/ObjectFactory.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/schema/SecurityGroupRule.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/com/cloud/baremetal/networkservice/schema/SecurityGroupVmRuleSet.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/org/apache/cloudstack/api/AddBaremetalHostCmd.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/org/apache/cloudstack/api/AddBaremetalPxeCmd.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/org/apache/cloudstack/api/AddBaremetalRctCmd.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/org/apache/cloudstack/api/BaremetalProvisionDoneNotificationCmd.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java (100%) rename plugins/hypervisors/baremetal/src/{ => main/java}/org/apache/cloudstack/api/ListBaremetalRctCmd.java (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/META-INF/cloudstack/baremetal-compute/module.properties (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/META-INF/cloudstack/baremetal-compute/spring-baremetal-compute-context.xml (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/META-INF/cloudstack/baremetal-discoverer/module.properties (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/META-INF/cloudstack/baremetal-discoverer/spring-baremetal-discoverer-context.xml (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/META-INF/cloudstack/baremetal-network/module.properties (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/META-INF/cloudstack/baremetal-network/spring-baremetal-network-context.xml (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/META-INF/cloudstack/baremetal-planner/module.properties (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/META-INF/cloudstack/baremetal-planner/spring-baremetal-planner-context.xml (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/META-INF/cloudstack/baremetal-storage/module.properties (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/META-INF/cloudstack/baremetal-storage/spring-baremetal-storage-context.xml (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/META-INF/cloudstack/core/spring-baremetal-core-context.xml (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/security_group_agent/cs-sgagent (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/security_group_agent/security_group_agent/__init__.py (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/security_group_agent/security_group_agent/cs_sg_agent.py (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/security_group_agent/security_group_agent/sglib.py (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/security_group_agent/security_group_agent/xmlobject.py (100%) rename plugins/hypervisors/baremetal/{ => src/main}/resources/security_group_agent/setup.py (100%) rename plugins/hypervisors/hyperv/src/{ => main/java}/com/cloud/ha/HypervInvestigator.java (100%) rename plugins/hypervisors/hyperv/src/{ => main/java}/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java (100%) rename plugins/hypervisors/hyperv/src/{ => main/java}/com/cloud/hypervisor/hyperv/guru/HypervGuru.java (100%) rename plugins/hypervisors/hyperv/src/{ => main/java}/com/cloud/hypervisor/hyperv/manager/HypervManager.java (100%) rename plugins/hypervisors/hyperv/src/{ => main/java}/com/cloud/hypervisor/hyperv/manager/HypervManagerImpl.java (100%) rename plugins/hypervisors/hyperv/src/{ => main/java}/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java (100%) rename plugins/hypervisors/hyperv/src/{ => main/java}/org/apache/cloudstack/storage/motion/HypervStorageMotionStrategy.java (100%) rename plugins/hypervisors/hyperv/{ => src/main}/resources/META-INF/cloudstack/core/spring-hyperv-core-context.xml (100%) rename plugins/hypervisors/hyperv/{ => src/main}/resources/META-INF/cloudstack/hyperv-compute/module.properties (100%) rename plugins/hypervisors/hyperv/{ => src/main}/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml (100%) rename plugins/hypervisors/hyperv/{ => src/main}/resources/META-INF/cloudstack/hyperv-discoverer/module.properties (100%) rename plugins/hypervisors/hyperv/{ => src/main}/resources/META-INF/cloudstack/hyperv-discoverer/spring-hyperv-discoverer-context.xml (100%) rename plugins/hypervisors/hyperv/{conf => src/main/resources}/agent.properties (100%) rename plugins/hypervisors/hyperv/{test => src/test/java}/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java (100%) rename plugins/hypervisors/kvm/src/{com => main/java/com/cloud}/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/ha/KVMInvestigator.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/DirectVifDriver.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/KVMHABase.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/LibvirtCapXMLParser.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/LibvirtNetworkDef.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/LibvirtSecretDef.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDef.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeXMLParser.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/LibvirtXMLParser.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/MigrateKVMAsync.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/VifDriver.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/VifDriverBase.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAttachIsoCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckConsoleProxyLoadCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckHealthCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckNetworkCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckOnHostCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckSshCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckUrlCommand.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVMActivityOnStoragePoolCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVirtualMachineCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCleanupNetworkRulesCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConsoleProxyLoadCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyVolumeCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromVolumeCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateStoragePoolCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateVMSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateVolumeFromSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteStoragePoolCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteVMSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDestroyCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFenceCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetHostStatsCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetStorageStatsCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmIpAddressCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmNetworkStatsCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmStatsCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVncPortCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumeStatsCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMaintainCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtManageSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifySshKeysCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyTargetsCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesSystemVmCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesVmSecondaryIpCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkUsageCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsCreateTunnelCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsDestroyBridgeCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsDestroyTunnelCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsFetchInterfaceCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsSetupBridgeCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsVpcPhysicalTopologyConfigCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsVpcRoutingPolicyConfigCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPingTestCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPlugNicCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrepareForMigrationCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrimaryStorageDownloadCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPvlanSetupCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootRouterCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRequestWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreVMSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertToVMSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSecurityGroupRulesCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSetHostParamsCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStopCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStorageSubSystemCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUnPlugNicCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUpdateHostPasswordCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUpgradeSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtWatchConsoleProxyLoadCommandWrapper.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/storage/IscsiAdmStoragePool.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/storage/KVMStorageResource.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/storage/KVMVirtualDisk.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/storage/ManagedNfsStorageAdaptor.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/com/cloud/hypervisor/kvm/storage/StorageAdaptorInfo.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/org/apache/cloudstack/kvm/ha/KVMHAConfig.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/org/apache/cloudstack/kvm/ha/KVMHAProvider.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/org/apache/cloudstack/kvm/ha/KVMHostActivityChecker.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/org/apache/cloudstack/utils/linux/CPUStat.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/org/apache/cloudstack/utils/linux/MemStat.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/org/apache/cloudstack/utils/qemu/QemuImg.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/org/apache/cloudstack/utils/qemu/QemuImgException.java (100%) rename plugins/hypervisors/kvm/src/{ => main/java}/org/apache/cloudstack/utils/qemu/QemuImgFile.java (100%) rename plugins/hypervisors/kvm/{ => src/main}/resources/META-INF/cloudstack/kvm-compute/module.properties (100%) rename plugins/hypervisors/kvm/{ => src/main}/resources/META-INF/cloudstack/kvm-compute/spring-kvm-compute-context.xml (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/com/cloud/hypervisor/kvm/resource/LibvirtSecretDefTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDefTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/com/cloud/hypervisor/kvm/resource/LibvirtVifDriverTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapperTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapperTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelperTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/com/cloud/hypervisor/kvm/storage/LibvirtStoragePoolTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/org/apache/cloudstack/kvm/ha/KVMHostHATest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/org/apache/cloudstack/utils/linux/MemStatTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/org/apache/cloudstack/utils/qemu/QemuImgFileTest.java (100%) rename plugins/hypervisors/kvm/{test => src/test/java}/org/apache/cloudstack/utils/qemu/QemuImgTest.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/hypervisor/OvmDiscoverer.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/hypervisor/OvmFencer.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/hypervisor/OvmGuru.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/hypervisor/OvmHelper.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/hypervisor/OvmResourceBase.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/object/Coder.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/object/Connection.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/object/OvmBridge.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/object/OvmDisk.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/object/OvmHost.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/object/OvmObject.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/object/OvmSecurityGroup.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/object/OvmStoragePool.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/object/OvmVif.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/object/OvmVlan.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/object/OvmVm.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/object/OvmVolume.java (100%) rename plugins/hypervisors/ovm/src/{ => main/java}/com/cloud/ovm/object/Test.java (100%) rename plugins/hypervisors/ovm/{ => src/main}/resources/META-INF/cloudstack/ovm-compute/module.properties (100%) rename plugins/hypervisors/ovm/{ => src/main}/resources/META-INF/cloudstack/ovm-compute/spring-ovm-compute-context.xml (100%) rename plugins/hypervisors/ovm/{ => src/main}/resources/META-INF/cloudstack/ovm-discoverer/module.properties (100%) rename plugins/hypervisors/ovm/{ => src/main}/resources/META-INF/cloudstack/ovm-discoverer/spring-ovm-discoverer-context.xml (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/ConfigFileOps.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmCommonModule.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmDiskModule.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmDispatcher.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmFaultConstants.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmHaHeartBeatModule.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmHostModule.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmLoggerModule.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmNetworkModule.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmObjectModule.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmSecurityGroupModule.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmVifModule.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmVmModule.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/OvmVolumeModule.py (100%) rename plugins/hypervisors/ovm/{ => src/main}/scripts/vm/hypervisor/ovm/configureOvm.sh (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/agent/manager/MockAgentManager.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/agent/manager/MockAgentManagerImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/agent/manager/MockNetworkManager.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/agent/manager/MockNetworkManagerImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/agent/manager/MockStorageManager.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/agent/manager/MockStorageManagerImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/agent/manager/MockVmManager.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/agent/manager/MockVmManagerImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/agent/manager/SimulatorInfo.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/agent/manager/SimulatorManager.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/agent/manager/SimulatorManagerImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/api/commands/CleanupSimulatorMockCmd.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/api/commands/ConfigureSimulatorCmd.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/api/commands/ConfigureSimulatorHAProviderState.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/api/commands/ListSimulatorHAStateTransitions.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/api/commands/QuerySimulatorMockCmd.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/api/commands/SimulatorAddSecondaryAgent.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/api/response/MockResponse.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/api/response/SimulatorHAStateResponse.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/ha/SimulatorFencer.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/ha/SimulatorInvestigator.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/resource/AgentResourceBase.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/resource/AgentRoutingResource.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/resource/AgentStorageResource.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/resource/SimulatorDiscoverer.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/resource/SimulatorSecondaryDiscoverer.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/resource/SimulatorStorageProcessor.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/MockConfigurationVO.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/MockHost.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/MockHostVO.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/MockSecStorageVO.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/MockSecurityRulesVO.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/MockStoragePoolVO.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/MockVMVO.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/MockVm.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/MockVolumeVO.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/SimulatorGuru.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/SimulatorRuntimeException.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockConfigurationDao.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockConfigurationDaoImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockHostDao.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockHostDaoImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockSecStorageDao.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockSecStorageDaoImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockSecurityRulesDao.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockSecurityRulesDaoImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockStoragePoolDao.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockVMDao.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockVMDaoImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockVolumeDao.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/com/cloud/simulator/dao/MockVolumeDaoImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/org/apache/cloudstack/ha/SimulatorHAProvider.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/org/apache/cloudstack/ha/SimulatorHAState.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/org/apache/cloudstack/storage/datastore/driver/SimulatorImageStoreDriverImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/org/apache/cloudstack/storage/datastore/lifecycle/SimulatorImageStoreLifeCycleImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/org/apache/cloudstack/storage/motion/SimulatorDataMotionStrategy.java (100%) rename plugins/hypervisors/simulator/src/{ => main/java}/org/apache/cloudstack/storage/resource/SimulatorSecondaryStorageResource.java (100%) rename plugins/hypervisors/simulator/{ => src/main}/resources/META-INF/cloudstack/core/spring-simulator-core-context.xml (100%) rename plugins/hypervisors/simulator/{ => src/main}/resources/META-INF/cloudstack/simulator-compute/module.properties (100%) rename plugins/hypervisors/simulator/{ => src/main}/resources/META-INF/cloudstack/simulator-compute/spring-simulator-compute-context.xml (100%) rename plugins/hypervisors/simulator/{ => src/main}/resources/META-INF/cloudstack/simulator-discoverer/module.properties (100%) rename plugins/hypervisors/simulator/{ => src/main}/resources/META-INF/cloudstack/simulator-discoverer/spring-simulator-discover-context.xml (100%) rename plugins/hypervisors/simulator/{ => src/main}/resources/META-INF/cloudstack/simulator-storage/module.properties (100%) rename plugins/hypervisors/simulator/{ => src/main}/resources/META-INF/cloudstack/simulator-storage/spring-simulator-storage-context.xml (100%) mode change 100755 => 100644 plugins/hypervisors/ucs/pom.xml rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/database/UcsBladeDao.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/database/UcsBladeDaoImpl.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/database/UcsBladeVO.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/database/UcsManagerDao.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/database/UcsManagerDaoImpl.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/database/UcsManagerVO.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/manager/StringTemplate.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/manager/UcsCommands.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/manager/UcsHttpClient.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/manager/UcsManager.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/manager/UcsManagerImpl.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/structure/ComputeBlade.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/structure/UcsCookie.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/com/cloud/ucs/structure/UcsProfile.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/org/apache/cloudstack/api/AddUcsManagerCmd.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/org/apache/cloudstack/api/DeleteUcsManagerCmd.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/org/apache/cloudstack/api/ListUcsBladeCmd.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/org/apache/cloudstack/api/ListUcsManagerCmd.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/org/apache/cloudstack/api/ListUcsProfileCmd.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/org/apache/cloudstack/api/response/UcsBladeResponse.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/org/apache/cloudstack/api/response/UcsManagerResponse.java (100%) rename plugins/hypervisors/ucs/src/{ => main/java}/org/apache/cloudstack/api/response/UcsProfileResponse.java (100%) rename plugins/hypervisors/ucs/{ => src/main}/resources/META-INF/cloudstack/core/spring-ucs-core-context.xml (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/api/response/CiscoNexusVSMResponse.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/ha/VmwareFencer.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/ha/VmwareInvestigator.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/guru/VMwareGuru.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/LegacyZone.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/LegacyZoneVO.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/VmwareCleanupMaid.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/VmwareDatacenter.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/VmwareDatacenterService.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDao.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDao.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDaoImpl.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/manager/CleanupFullyClonedTemplatesTask.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/manager/VmwareHostService.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/manager/VmwareManager.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/manager/VmwareStorageMount.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/hypervisor/vmware/resource/VmwareResource.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/network/CiscoNexusVSMDevice.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/network/CiscoNexusVSMDeviceVO.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/network/VmwareTrafficLabel.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/network/element/CiscoNexusVSMElement.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/network/element/CiscoNexusVSMElementService.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/storage/resource/PremiumSecondaryStorageResource.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/storage/resource/VmwareStorageLayoutHelper.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/storage/resource/VmwareStorageLayoutType.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/storage/resource/VmwareStorageProcessor.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/org/apache/cloudstack/api/response/VmwareDatacenterResponse.java (100%) rename plugins/hypervisors/vmware/src/{ => main/java}/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java (100%) rename plugins/hypervisors/vmware/{ => src/main}/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml (100%) rename plugins/hypervisors/vmware/{ => src/main}/resources/META-INF/cloudstack/vmware-compute/module.properties (100%) rename plugins/hypervisors/vmware/{ => src/main}/resources/META-INF/cloudstack/vmware-compute/spring-vmware-compute-context.xml (100%) rename plugins/hypervisors/vmware/{ => src/main}/resources/META-INF/cloudstack/vmware-compute/vmware-defaults.properties (100%) rename plugins/hypervisors/vmware/{ => src/main}/resources/META-INF/cloudstack/vmware-discoverer/module.properties (100%) rename plugins/hypervisors/vmware/{ => src/main}/resources/META-INF/cloudstack/vmware-discoverer/spring-vmware-discoverer-context.xml (100%) rename plugins/hypervisors/vmware/{ => src/main}/resources/META-INF/cloudstack/vmware-network/module.properties (100%) rename plugins/hypervisors/vmware/{ => src/main}/resources/META-INF/cloudstack/vmware-network/spring-vmware-network-context.xml (100%) rename plugins/hypervisors/vmware/{ => src/main}/resources/META-INF/cloudstack/vmware-storage/module.properties (100%) rename plugins/hypervisors/vmware/{ => src/main}/resources/META-INF/cloudstack/vmware-storage/spring-vmware-storage-context.xml (100%) rename plugins/hypervisors/vmware/{test => src/test/java}/com/cloud/hypervisor/guru/VMwareGuruTest.java (100%) rename plugins/hypervisors/vmware/{test => src/test/java}/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java (100%) rename plugins/hypervisors/vmware/{test => src/test/java}/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java (100%) rename plugins/hypervisors/vmware/{test => src/test/java}/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/ha/XenServerFencer.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/XenServerGuru.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/CitrixHelper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XcpServerResource.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XenServer56Resource.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XenServer56SP2Resource.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XenServer600Resource.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XenServer620Resource.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XenServer620SP1Resource.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XenServer650Resource.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XenServerConnectionPool.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/Xenserver625Resource.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XsHost.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/XsLocalNetwork.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xcp/XcpServerNetworkUsageCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56CheckOnHostCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56FenceCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56NetworkUsageCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xen56p1/XenServer56FP1FenceCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateVolumeCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCompleteCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageReceiveCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageSendCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xen620sp1/XenServer620SP1GetGPUStatsCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachIsoCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachOrDettachConfigDriveCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckConsoleProxyLoadCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckHealthCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckNetworkCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckOnHostCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckSshCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckVirtualMachineCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupNetworkRulesCmdWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixClusterVMMetaDataSyncCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateStoragePoolCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateVMSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteStoragePoolCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteVMSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDestroyCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetHostStatsCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetStorageStatsCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmDiskStatsCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmIpAddressCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmNetworkStatsCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmStatsCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVncPortCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVolumeStatsCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMaintainCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMigrateCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifySshKeysCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifyStoragePoolCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkElementCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesSystemVmCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateGreTunnelCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateTunnelCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDeleteFlowCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyBridgeCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyTunnelCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsFetchInterfaceCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetTagAndFlowCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetupBridgeCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPerformanceMonitorCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPingTestCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPlugNicCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrepareForMigrationCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrimaryStorageDownloadCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPvlanSetupCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixReadyCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootRouterCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixResizeVolumeCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRevertToVMSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixScaleVmCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSecurityGroupRulesCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStopCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStorageSubSystemCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUnPlugNicCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpdateHostPasswordCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpgradeSnapshotCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixWatchConsoleProxyLoadCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServerUtilitiesHelper.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/org/apache/cloudstack/hypervisor/xenserver/XenserverConfigs.java (100%) rename plugins/hypervisors/xenserver/src/{ => main/java}/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java (100%) rename plugins/hypervisors/xenserver/{ => src/main}/resources/META-INF/cloudstack/xenserver-compute/module.properties (100%) rename plugins/hypervisors/xenserver/{ => src/main}/resources/META-INF/cloudstack/xenserver-compute/spring-xenserver-compute-context.xml (100%) rename plugins/hypervisors/xenserver/{ => src/main}/resources/META-INF/cloudstack/xenserver-discoverer/module.properties (100%) rename plugins/hypervisors/xenserver/{ => src/main}/resources/META-INF/cloudstack/xenserver-discoverer/spring-xenserver-discoverer-context.xml (100%) rename plugins/hypervisors/xenserver/{test/com => src/test/java/com/cloud}/cloud/hypervisor/XenServerGuruTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/XcpOssResourceTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/XcpServerResourceTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/XenServer56FP1ResourceTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/XenServer56ResourceTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/XenServer56SP2ResourceTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/XenServer600ResourceTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/XenServer625ResourceTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/XenServer650ResourceTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XcpServerWrapperTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56FP1WrapperTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56WrapperTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620SP1WrapperTest.java (100%) rename plugins/hypervisors/xenserver/{test => src/test/java}/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620WrapperTest.java (100%) rename plugins/integrations/cloudian/src/{ => main/java}/org/apache/cloudstack/cloudian/CloudianConnector.java (100%) rename plugins/integrations/cloudian/src/{ => main/java}/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java (100%) rename plugins/integrations/cloudian/src/{ => main/java}/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java (100%) rename plugins/integrations/cloudian/src/{ => main/java}/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java (100%) rename plugins/integrations/cloudian/src/{ => main/java}/org/apache/cloudstack/cloudian/client/CloudianClient.java (100%) rename plugins/integrations/cloudian/src/{ => main/java}/org/apache/cloudstack/cloudian/client/CloudianGroup.java (100%) rename plugins/integrations/cloudian/src/{ => main/java}/org/apache/cloudstack/cloudian/client/CloudianUser.java (100%) rename plugins/integrations/cloudian/src/{ => main/java}/org/apache/cloudstack/cloudian/client/CloudianUtils.java (100%) rename plugins/integrations/cloudian/src/{ => main/java}/org/apache/cloudstack/cloudian/response/CloudianEnabledResponse.java (100%) rename plugins/integrations/cloudian/src/{ => main/java}/org/apache/cloudstack/cloudian/response/CloudianSsoLoginResponse.java (100%) rename plugins/integrations/cloudian/{ => src/main}/resources/META-INF/cloudstack/cloudian/module.properties (100%) rename plugins/integrations/cloudian/{ => src/main}/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml (100%) rename plugins/integrations/cloudian/{test => src/test/java}/org/apache/cloudstack/cloudian/CloudianClientTest.java (100%) rename plugins/integrations/prometheus/src/{ => main/java}/org/apache/cloudstack/metrics/PrometheusExporter.java (100%) rename plugins/integrations/prometheus/src/{ => main/java}/org/apache/cloudstack/metrics/PrometheusExporterImpl.java (100%) rename plugins/integrations/prometheus/src/{ => main/java}/org/apache/cloudstack/metrics/PrometheusExporterServer.java (100%) rename plugins/integrations/prometheus/src/{ => main/java}/org/apache/cloudstack/metrics/PrometheusExporterServerImpl.java (100%) rename plugins/integrations/prometheus/{ => src/main}/resources/META-INF/cloudstack/prometheus/module.properties (100%) rename plugins/integrations/prometheus/{ => src/main}/resources/META-INF/cloudstack/prometheus/spring-prometheus-context.xml (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/api/ListClustersMetricsCmd.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/api/ListHostsMetricsCmd.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/api/ListInfrastructureCmd.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/api/ListStoragePoolsMetricsCmd.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/api/ListVMsMetricsCmd.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/api/ListVolumesMetricsCmd.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/api/ListZonesMetricsCmd.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/metrics/MetricsService.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/metrics/MetricsServiceImpl.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/response/ClusterMetricsResponse.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/response/HostMetricsResponse.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/response/InfrastructureResponse.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/response/StoragePoolMetricsResponse.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/response/VmMetricsResponse.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/response/VolumeMetricsResponse.java (100%) rename plugins/metrics/src/{ => main/java}/org/apache/cloudstack/response/ZoneMetricsResponse.java (100%) rename plugins/metrics/{ => src/main}/resources/META-INF/cloudstack/metrics/module.properties (100%) rename plugins/metrics/{ => src/main}/resources/META-INF/cloudstack/metrics/spring-metrics-context.xml (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/BcfAnswer.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/BcfCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/CacheBcfTopologyCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/CreateBcfAttachmentCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/CreateBcfRouterCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/CreateBcfRouterInterfaceCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/CreateBcfSegmentCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/CreateBcfStaticNatCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/DeleteBcfAttachmentCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/DeleteBcfSegmentCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/DeleteBcfStaticNatCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/GetControllerDataAnswer.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/GetControllerDataCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/GetControllerHostsAnswer.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/GetControllerHostsCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/StartupBigSwitchBcfCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/SyncBcfTopologyCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/UpdateBcfAttachmentCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/agent/api/UpdateBcfRouterCommand.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/api/commands/AddBigSwitchBcfDeviceCmd.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/api/commands/BcfConstants.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/api/commands/DeleteBigSwitchBcfDeviceCmd.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/api/commands/ListBigSwitchBcfDevicesCmd.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/api/response/BigSwitchBcfDeviceResponse.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/BigSwitchBcfDeviceVO.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/AclData.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/AttachmentData.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/BigSwitchBcfApi.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/BigSwitchBcfApiException.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/BigSwitchBcfUtils.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/BigSwitchStatus.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/Capabilities.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/ControlClusterData.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/ControlClusterStatus.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/ControllerData.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/FloatingIpData.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/NetworkData.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/RouterData.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/RouterInterfaceData.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/TopologyData.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/bigswitch/TrustingProtocolSocketFactory.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/dao/BigSwitchBcfDao.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/dao/BigSwitchBcfDaoImpl.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/element/BigSwitchBcfElement.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/element/BigSwitchBcfElementService.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java (100%) rename plugins/network-elements/bigswitch/src/{ => main/java}/com/cloud/network/resource/BigSwitchBcfResource.java (100%) rename plugins/network-elements/bigswitch/{ => src/main}/resources/META-INF/cloudstack/bigswitch/module.properties (100%) rename plugins/network-elements/bigswitch/{ => src/main}/resources/META-INF/cloudstack/bigswitch/spring-bigswitch-context.xml (100%) rename plugins/network-elements/bigswitch/{test => src/test/java}/com/cloud/network/bigswitch/BigSwitchApiTest.java (100%) rename plugins/network-elements/bigswitch/{test => src/test/java}/com/cloud/network/bigswitch/BigSwitchBcfUtilsTest.java (100%) rename plugins/network-elements/bigswitch/{test => src/test/java}/com/cloud/network/resource/BigSwitchBcfResourceTest.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/agent/api/AssociateMacToNetworkAnswer.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/agent/api/AssociateMacToNetworkCommand.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/agent/api/CreateNetworkAnswer.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/agent/api/CreateNetworkCommand.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/agent/api/DeleteNetworkAnswer.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/agent/api/DeleteNetworkCommand.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/agent/api/DisassociateMacFromNetworkAnswer.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/agent/api/DisassociateMacFromNetworkCommand.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/agent/api/StartupBrocadeVcsCommand.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/api/commands/AddBrocadeVcsDeviceCmd.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/api/commands/DeleteBrocadeVcsDeviceCmd.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/api/commands/ListBrocadeVcsDeviceNetworksCmd.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/api/commands/ListBrocadeVcsDevicesCmd.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/api/response/BrocadeVcsDeviceResponse.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/network/BrocadeVcsDeviceVO.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/network/BrocadeVcsNetworkVlanMappingVO.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/network/brocade/BrocadeVcsApi.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/network/brocade/BrocadeVcsApiException.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/network/brocade/Constants.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/network/dao/BrocadeVcsDao.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/network/dao/BrocadeVcsDaoImpl.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDao.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDaoImpl.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/network/element/BrocadeVcsElement.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/network/element/BrocadeVcsElementService.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java (100%) rename plugins/network-elements/brocade-vcs/src/{ => main/java}/com/cloud/network/resource/BrocadeVcsResource.java (100%) rename plugins/network-elements/brocade-vcs/{ => src/main}/resources/BrocadeInterfaceSchema.xsd (100%) rename plugins/network-elements/brocade-vcs/{ => src/main}/resources/BrocadePortProfileSchema.xsd (100%) rename plugins/network-elements/brocade-vcs/{ => src/main}/resources/BrocadeShowVcsSchema.xsd (100%) rename plugins/network-elements/brocade-vcs/{ => src/main}/resources/META-INF/cloudstack/vcs/module.properties (100%) rename plugins/network-elements/brocade-vcs/{ => src/main}/resources/META-INF/cloudstack/vcs/spring-vcs-context.xml (100%) rename plugins/network-elements/brocade-vcs/{test => src/test/java}/com/cloud/network/brocade/BrocadeVcsApiTest.java (100%) rename plugins/network-elements/brocade-vcs/{test => src/test/java}/com/cloud/network/guru/BrocadeVcsGuestNetworkGuruTest.java (100%) rename plugins/network-elements/brocade-vcs/{test => src/test/java}/com/cloud/network/resource/BrocadeVcsResourceTest.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/api/response/CiscoAsa1000vResourceResponse.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/api/response/CiscoVnmcResourceResponse.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/cisco/CiscoAsa1000vDevice.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/cisco/CiscoAsa1000vDeviceVO.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/cisco/CiscoVnmcConnection.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/cisco/CiscoVnmcController.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/cisco/CiscoVnmcControllerVO.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/cisco/NetworkAsa1000vMap.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/cisco/NetworkAsa1000vMapVO.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/dao/CiscoAsa1000vDao.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/dao/CiscoVnmcDao.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/dao/CiscoVnmcDaoImpl.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/dao/NetworkAsa1000vMapDao.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/element/CiscoAsa1000vService.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/element/CiscoVnmcElement.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/element/CiscoVnmcElementService.java (100%) rename plugins/network-elements/cisco-vnmc/src/{ => main/java}/com/cloud/network/resource/CiscoVnmcResource.java (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/resources/META-INF/cloudstack/cisco-vnmc/module.properties (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/resources/META-INF/cloudstack/cisco-vnmc/spring-cisco-vnmc-context.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/assoc-asa1000v.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/associate-acl-policy-set.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/associate-dhcp-policy.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/associate-dhcp-server.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/associate-nat-policy-set.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/associate-route-policy.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-acl-policy-ref.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-acl-policy-set.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-acl-policy.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-acl-rule-for-dnat.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-acl-rule-for-pf.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-dhcp-policy.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-dnat-rule.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-edge-device-profile.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-edge-device-route-policy.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-edge-device-route.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-edge-firewall.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-edge-security-profile.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-egress-acl-rule.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-generic-egress-acl-rule.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-generic-ingress-acl-rule.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-ingress-acl-rule.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-ip-pool.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-nat-policy-ref.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-nat-policy-set.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-nat-policy.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-pf-rule.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-port-pool.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-source-nat-pool.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-source-nat-rule.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-tenant.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/create-vdc.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/delete-acl-policy-set.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/delete-acl-policy.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/delete-edge-firewall.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/delete-edge-security-profile.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/delete-nat-policy-set.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/delete-nat-policy.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/delete-rule.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/delete-tenant.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/delete-vdc.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/disassoc-asa1000v.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/list-acl-policies.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/list-children.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/list-nat-policies.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/list-policyrefs-in-policyset.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/list-tenants.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/list-unassigned-asa1000v.xml (100%) rename plugins/network-elements/cisco-vnmc/{ => src/main}/scripts/network/cisco/login.xml (100%) rename plugins/network-elements/cisco-vnmc/{test => src/test/java}/com/cloud/network/cisco/CiscoVnmcConnectionTest.java (100%) rename plugins/network-elements/cisco-vnmc/{test => src/test/java}/com/cloud/network/element/CiscoVnmcElementTest.java (100%) rename plugins/network-elements/cisco-vnmc/{test => src/test/java}/com/cloud/network/resource/CiscoVnmcResourceTest.java (100%) rename plugins/network-elements/dns-notifier/src/{ => main/java}/org/apache/cloudstack/network/element/DnsNotifier.java (100%) rename plugins/network-elements/dns-notifier/{ => src/main}/resources/components-example.xml (100%) rename plugins/network-elements/elastic-loadbalancer/src/{ => main/java}/com/cloud/network/ElasticLbVmMapVO.java (100%) rename plugins/network-elements/elastic-loadbalancer/src/{ => main/java}/com/cloud/network/element/ElasticLoadBalancerElement.java (100%) rename plugins/network-elements/elastic-loadbalancer/src/{ => main/java}/com/cloud/network/lb/ElasticLoadBalancerManager.java (100%) rename plugins/network-elements/elastic-loadbalancer/src/{ => main/java}/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java (100%) rename plugins/network-elements/elastic-loadbalancer/src/{ => main/java}/com/cloud/network/lb/LoadBalanceRuleHandler.java (100%) rename plugins/network-elements/elastic-loadbalancer/src/{ => main/java}/com/cloud/network/lb/dao/ElasticLbVmMapDao.java (100%) rename plugins/network-elements/elastic-loadbalancer/src/{ => main/java}/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java (100%) rename plugins/network-elements/elastic-loadbalancer/{ => src/main}/resources/META-INF/cloudstack/elb/module.properties (100%) rename plugins/network-elements/elastic-loadbalancer/{ => src/main}/resources/META-INF/cloudstack/elb/spring-elb-context.xml (100%) rename plugins/network-elements/elastic-loadbalancer/{test => src/test/java}/com/cloud/network/lb/ElasticLoadBalancerManagerImplTest.java (100%) rename plugins/network-elements/elastic-loadbalancer/{test => src/test/java}/com/cloud/network/lb/LoadBalanceRuleHandlerTest.java (100%) rename plugins/network-elements/f5/src/{ => main/java}/com/cloud/api/commands/AddExternalLoadBalancerCmd.java (100%) rename plugins/network-elements/f5/src/{ => main/java}/com/cloud/api/commands/AddF5LoadBalancerCmd.java (100%) rename plugins/network-elements/f5/src/{ => main/java}/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java (100%) rename plugins/network-elements/f5/src/{ => main/java}/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java (100%) rename plugins/network-elements/f5/src/{ => main/java}/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java (100%) rename plugins/network-elements/f5/src/{ => main/java}/com/cloud/api/commands/ListExternalLoadBalancersCmd.java (100%) rename plugins/network-elements/f5/src/{ => main/java}/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java (100%) rename plugins/network-elements/f5/src/{ => main/java}/com/cloud/api/commands/ListF5LoadBalancersCmd.java (100%) rename plugins/network-elements/f5/src/{ => main/java}/com/cloud/api/response/F5LoadBalancerResponse.java (100%) rename plugins/network-elements/f5/src/{ => main/java}/com/cloud/network/element/F5ExternalLoadBalancerElement.java (100%) rename plugins/network-elements/f5/src/{ => main/java}/com/cloud/network/element/F5ExternalLoadBalancerElementService.java (100%) rename plugins/network-elements/f5/src/{ => main/java}/com/cloud/network/resource/F5BigIpResource.java (100%) rename plugins/network-elements/f5/{ => src/main}/resources/META-INF/cloudstack/f5/module.properties (100%) rename plugins/network-elements/f5/{ => src/main}/resources/META-INF/cloudstack/f5/spring-f5-context.xml (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/api/AddGloboDnsHostCmd.java (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/commands/CreateOrUpdateDomainCommand.java (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/commands/CreateOrUpdateRecordAndReverseCommand.java (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/commands/RemoveDomainCommand.java (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/commands/RemoveRecordCommand.java (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/commands/SignInCommand.java (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/element/GloboDnsElement.java (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/element/GloboDnsElementService.java (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/resource/GloboDnsResource.java (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/response/GloboDnsDomainListResponse.java (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/response/GloboDnsDomainResponse.java (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/response/GloboDnsExportResponse.java (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/response/GloboDnsRecordListResponse.java (100%) rename plugins/network-elements/globodns/src/{ => main/java}/com/globo/globodns/cloudstack/response/GloboDnsRecordResponse.java (100%) rename plugins/network-elements/globodns/{ => src/main}/resources/META-INF/cloudstack/globodns/module.properties (100%) rename plugins/network-elements/globodns/{ => src/main}/resources/META-INF/cloudstack/globodns/spring-globodns-context.xml (100%) rename plugins/network-elements/globodns/{test => src/test/java}/com/globo/globodns/cloudstack/element/GloboDnsElementTest.java (100%) rename plugins/network-elements/globodns/{test => src/test/java}/com/globo/globodns/cloudstack/resource/GloboDnsResourceTest.java (100%) rename plugins/network-elements/globodns/{ => src}/test/resources/db.properties (100%) rename plugins/network-elements/globodns/{ => src}/test/resources/log4j.properties (100%) rename plugins/network-elements/internal-loadbalancer/src/{ => main/java}/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java (100%) rename plugins/network-elements/internal-loadbalancer/src/{ => main/java}/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java (100%) rename plugins/network-elements/internal-loadbalancer/src/{ => main/java}/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java (100%) rename plugins/network-elements/internal-loadbalancer/{ => src/main}/resources/META-INF/cloudstack/core/spring-internallb-core-context.xml (100%) rename plugins/network-elements/internal-loadbalancer/{test => src/test/java}/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java (100%) rename plugins/network-elements/internal-loadbalancer/{test => src/test/java}/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java (100%) rename plugins/network-elements/internal-loadbalancer/{test => src/test/java}/org/apache/cloudstack/internallbelement/InternalLbElementTest.java (100%) rename plugins/network-elements/internal-loadbalancer/{test => src/test/java}/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java (100%) rename plugins/network-elements/internal-loadbalancer/{test => src/test/java}/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java (100%) rename plugins/network-elements/internal-loadbalancer/{test => src/test/java}/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java (100%) rename plugins/network-elements/internal-loadbalancer/{ => src}/test/resources/lb_element.xml (100%) rename plugins/network-elements/internal-loadbalancer/{ => src}/test/resources/lb_mgr.xml (100%) rename plugins/network-elements/internal-loadbalancer/{ => src}/test/resources/lb_svc.xml (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ContrailElement.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ContrailGuru.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ContrailManager.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ContrailVpcElementImpl.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/DBSyncGeneric.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/EventUtils.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ManagementNetworkGuru.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ModelDatabase.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ServerDBSync.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ServerDBSyncImpl.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ServerEventHandler.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ServerEventHandlerImpl.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ServiceManager.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/management/ServiceVirtualMachine.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/model/FloatingIpModel.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/model/FloatingIpPoolModel.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/model/InstanceIpModel.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/model/ModelController.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/model/ModelObject.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/model/ModelObjectBase.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/model/NetworkPolicyModel.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/model/ServiceInstanceModel.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java (100%) rename plugins/network-elements/juniper-contrail/src/{ => main/java}/org/apache/cloudstack/network/contrail/model/VirtualNetworkModel.java (100%) rename plugins/network-elements/juniper-contrail/{ => src/main}/resources/META-INF/cloudstack/contrail/module.properties (100%) rename plugins/network-elements/juniper-contrail/{ => src/main}/resources/META-INF/cloudstack/contrail/spring-contrail-context.xml (100%) rename plugins/network-elements/juniper-contrail/{ => src/main}/resources/META-INF/cloudstack/system/spring-contrail-system-context-inheritable.xml (100%) rename plugins/network-elements/juniper-contrail/{test => src/test/java}/org/apache/cloudstack/network/contrail/management/ApiConnectorMockito.java (100%) rename plugins/network-elements/juniper-contrail/{test => src/test/java}/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java (100%) rename plugins/network-elements/juniper-contrail/{test => src/test/java}/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java (100%) rename plugins/network-elements/juniper-contrail/{test => src/test/java}/org/apache/cloudstack/network/contrail/management/MockAccountManager.java (100%) rename plugins/network-elements/juniper-contrail/{test => src/test/java}/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java (100%) rename plugins/network-elements/juniper-contrail/{test => src/test/java}/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java (100%) rename plugins/network-elements/juniper-contrail/{test => src/test/java}/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java (100%) rename plugins/network-elements/juniper-contrail/{test => src/test/java}/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java (100%) rename plugins/network-elements/juniper-contrail/{test => src/test/java}/org/apache/cloudstack/network/contrail/management/TestDbSetup.java (100%) rename plugins/network-elements/juniper-contrail/{test => src/test/java}/org/apache/cloudstack/network/contrail/model/InstanceIpModelTest.java (100%) rename plugins/network-elements/juniper-contrail/{test => src/test/java}/org/apache/cloudstack/network/contrail/model/VMInterfaceModelTest.java (100%) rename plugins/network-elements/juniper-contrail/{test => src/test/java}/org/apache/cloudstack/network/contrail/model/VirtualMachineModelTest.java (100%) rename plugins/network-elements/juniper-contrail/{test => src/test/java}/org/apache/cloudstack/network/contrail/model/VirtualNetworkModelTest.java (100%) rename plugins/network-elements/juniper-contrail/{ => src}/test/resources/commonContext.xml (100%) rename plugins/network-elements/juniper-contrail/{ => src}/test/resources/contrail.properties (100%) rename plugins/network-elements/juniper-contrail/{ => src}/test/resources/db.properties (100%) rename plugins/network-elements/juniper-contrail/{ => src}/test/resources/log4j.properties (100%) rename plugins/network-elements/juniper-contrail/{ => src}/test/resources/mysql_db_start.sh (100%) rename plugins/network-elements/juniper-contrail/{ => src}/test/resources/mysql_db_stop.sh (100%) rename plugins/network-elements/juniper-contrail/{ => src}/test/resources/providerContext.xml (100%) rename plugins/network-elements/juniper-contrail/{ => src}/test/resources/publicNetworkContext.xml (100%) rename plugins/network-elements/juniper-srx/src/{ => main/java}/com/cloud/api/commands/AddExternalFirewallCmd.java (100%) rename plugins/network-elements/juniper-srx/src/{ => main/java}/com/cloud/api/commands/AddSrxFirewallCmd.java (100%) rename plugins/network-elements/juniper-srx/src/{ => main/java}/com/cloud/api/commands/ConfigureSrxFirewallCmd.java (100%) rename plugins/network-elements/juniper-srx/src/{ => main/java}/com/cloud/api/commands/DeleteExternalFirewallCmd.java (100%) rename plugins/network-elements/juniper-srx/src/{ => main/java}/com/cloud/api/commands/DeleteSrxFirewallCmd.java (100%) rename plugins/network-elements/juniper-srx/src/{ => main/java}/com/cloud/api/commands/ListExternalFirewallsCmd.java (100%) rename plugins/network-elements/juniper-srx/src/{ => main/java}/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java (100%) rename plugins/network-elements/juniper-srx/src/{ => main/java}/com/cloud/api/commands/ListSrxFirewallsCmd.java (100%) rename plugins/network-elements/juniper-srx/src/{ => main/java}/com/cloud/api/response/SrxFirewallResponse.java (100%) rename plugins/network-elements/juniper-srx/src/{ => main/java}/com/cloud/network/element/JuniperSRXExternalFirewallElement.java (100%) rename plugins/network-elements/juniper-srx/src/{ => main/java}/com/cloud/network/element/JuniperSRXFirewallElementService.java (100%) rename plugins/network-elements/juniper-srx/src/{ => main/java}/com/cloud/network/resource/JuniperSrxResource.java (100%) rename plugins/network-elements/juniper-srx/{ => src/main}/resources/META-INF/cloudstack/srx/module.properties (100%) rename plugins/network-elements/juniper-srx/{ => src/main}/resources/META-INF/cloudstack/srx/spring-srx-context.xml (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/commands/DeleteNetscalerControlCenterCmd.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/commands/DeleteServicePackageOfferingCmd.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/commands/DeployNetscalerVpxCmd.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/commands/ListNetscalerControlCenterCmd.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/commands/ListRegisteredServicePackageCmd.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/commands/RegisterNetscalerControlCenterCmd.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/commands/RegisterServicePackageCmd.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/commands/StopNetScalerVMCmd.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/response/NetScalerServicePackageResponse.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/response/NetscalerControlCenterResponse.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/api/response/NetscalerLoadBalancerResponse.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/NetScalerControlCenterVO.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/NetScalerPodVO.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/NetScalerServicePackageVO.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/dao/NetScalerControlCenterDao.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/dao/NetScalerControlCenterDaoImpl.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/dao/NetScalerPodDao.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/dao/NetScalerPodDaoImpl.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/dao/NetScalerServicePackageDao.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/dao/NetScalerServicePackageDaoImpl.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/element/NetscalerElement.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/element/NetscalerLoadBalancerElementService.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/resource/NetScalerControlCenterResource.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/resource/NetscalerResource.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/vm/NetScalerVMManager.java (100%) rename plugins/network-elements/netscaler/src/{ => main/java}/com/cloud/network/vm/NetScalerVMManagerImpl.java (100%) rename plugins/network-elements/netscaler/{ => src/main}/resources/META-INF/cloudstack/netscaler/module.properties (100%) rename plugins/network-elements/netscaler/{ => src/main}/resources/META-INF/cloudstack/netscaler/spring-netscaler-context.xml (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/CmdBuilder.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/PingNuageVspCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/StartupVspCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/element/ApplyAclRuleVspCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/element/ApplyStaticNatVspCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/element/ExtraDhcpOptionsVspCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/element/ImplementVspCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/element/ShutDownVpcVspCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/element/ShutDownVspCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/guru/DeallocateVmVspCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/guru/ImplementNetworkVspCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/guru/ReserveVmInterfaceVspCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/guru/TrashNetworkVspCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/guru/UpdateDhcpOptionVspCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/manager/CleanUpDomainCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/manager/EntityExistsCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/manager/GetApiDefaultsAnswer.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/manager/GetApiDefaultsCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/manager/ImplementNetworkVspAnswer.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/manager/ListVspDomainTemplatesAnswer.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/manager/ListVspDomainTemplatesCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/manager/SupportedApiVersionCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/manager/UpdateNuageVspDeviceCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/sync/SyncDomainAnswer.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/sync/SyncDomainCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/sync/SyncNuageVspCmsIdAnswer.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/agent/api/sync/SyncNuageVspCmsIdCommand.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/commands/AddNuageVspDeviceCmd.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/commands/AssociateNuageVspDomainTemplateCmd.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/commands/DeleteNuageVspDeviceCmd.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/commands/DisableNuageUnderlayVlanIpRangeCmd.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/commands/EnableNuageUnderlayVlanIpRangeCmd.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/commands/ListNuageUnderlayVlanIpRangesCmd.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/commands/ListNuageVspDevicesCmd.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/commands/ListNuageVspDomainTemplatesCmd.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/commands/ListNuageVspGlobalDomainTemplateCmd.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/commands/UpdateNuageVspDeviceCmd.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/commands/VspConstants.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/response/NuageVlanIpRangeResponse.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/response/NuageVspDeviceResponse.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/response/NuageVspDomainTemplateResponse.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/api/response/NuageVspResourceResponse.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/NuageVspDeviceVO.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/dao/NuageVspDao.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/dao/NuageVspDaoImpl.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/element/NuageVspElement.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/guru/NuageVspGuestNetworkGuru.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/manager/AbstractListener.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/manager/NuageVspManager.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/manager/NuageVspManagerImpl.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/resource/NuageVspRequestWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/resource/NuageVspResource.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/resource/NuageVspResourceConfiguration.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/resource/VspStatisticsMBean.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/resource/VspStatisticsMBeanImpl.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspApiSupportCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspApplyAclRulesCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspApplyStaticNatCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspCleanupDomainCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspDeallocateVmInterfaceCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspEntityExistsCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspGetApiDefaultsCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspGuruImplementNetworkCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspGuruTrashNetworkCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspImplementNetworkCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspListDomainTemplatesCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspMaintainCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspReadyCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspReserveVmInterfaceCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspShutdownNetworkCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspShutdownVpcCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspSyncCmsIdCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspSyncDomainCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/NuageVspUpdateDhcpOptionsCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/network/vsp/resource/wrapper/UpdateNuageVspDeviceCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/util/NuageVspEntityBuilder.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java}/com/cloud/util/NuageVspUtil.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java/com}/com/cloud/network/vsp/resource/wrapper/NuageVspCheckHealthCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/{ => main/java/com}/com/cloud/network/vsp/resource/wrapper/NuageVspExtraDhcpOptionsCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/{ => src/main}/resources/META-INF/cloudstack/vsp/module.properties (100%) rename plugins/network-elements/nuage-vsp/{ => src/main}/resources/META-INF/cloudstack/vsp/spring-vsp-context.xml (100%) rename plugins/network-elements/nuage-vsp/{test => src/test/java}/com/cloud/NuageTest.java (100%) rename plugins/network-elements/nuage-vsp/{test => src/test/java}/com/cloud/agent/api/CommandsTest.java (100%) rename plugins/network-elements/nuage-vsp/{test => src/test/java}/com/cloud/network/element/NuageVspElementTest.java (100%) rename plugins/network-elements/nuage-vsp/{test => src/test/java}/com/cloud/network/guru/NuageVspGuestNetworkGuruTest.java (100%) rename plugins/network-elements/nuage-vsp/{test => src/test/java}/com/cloud/network/manager/NuageVspManagerTest.java (100%) rename plugins/network-elements/nuage-vsp/{test => src/test/java}/com/cloud/network/resource/NuageVspResourceTest.java (100%) rename plugins/network-elements/nuage-vsp/{test => src/test/java}/com/cloud/util/NuageVspEntityBuilderTest.java (100%) rename plugins/network-elements/nuage-vsp/{test => src/test/java}/com/cloud/util/NuageVspUtilTest.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsCreateGreTunnelAnswer.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsCreateGreTunnelCommand.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsCreateTunnelAnswer.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsCreateTunnelCommand.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsDeleteFlowCommand.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsDestroyBridgeCommand.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsDestroyTunnelCommand.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsFetchInterfaceAnswer.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsFetchInterfaceCommand.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsSetTagAndFlowAnswer.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsSetTagAndFlowCommand.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsSetupBridgeCommand.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/agent/api/StartupOvsCommand.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/element/OvsElement.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/element/OvsElementService.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/guru/OvsGuestNetworkGuru.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/GreTunnelException.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/OvsNetworkTopologyGuru.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/OvsTunnelManager.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/OvsTunnelManagerImpl.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/dao/OvsTunnel.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/dao/OvsTunnelInterfaceDao.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/dao/OvsTunnelInterfaceDaoImpl.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/dao/OvsTunnelNetworkDao.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDao.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java (100%) rename plugins/network-elements/ovs/src/{ => main/java}/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoVO.java (100%) rename plugins/network-elements/ovs/{ => src/main}/resources/META-INF/cloudstack/ovs/module.properties (100%) rename plugins/network-elements/ovs/{ => src/main}/resources/META-INF/cloudstack/ovs/spring-ovs-context.xml (100%) rename plugins/network-elements/palo-alto/src/{ => main/java}/com/cloud/api/commands/AddPaloAltoFirewallCmd.java (100%) rename plugins/network-elements/palo-alto/src/{ => main/java}/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java (100%) rename plugins/network-elements/palo-alto/src/{ => main/java}/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java (100%) rename plugins/network-elements/palo-alto/src/{ => main/java}/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java (100%) rename plugins/network-elements/palo-alto/src/{ => main/java}/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java (100%) rename plugins/network-elements/palo-alto/src/{ => main/java}/com/cloud/api/response/PaloAltoFirewallResponse.java (100%) rename plugins/network-elements/palo-alto/src/{ => main/java}/com/cloud/network/element/PaloAltoExternalFirewallElement.java (100%) rename plugins/network-elements/palo-alto/src/{ => main/java}/com/cloud/network/element/PaloAltoFirewallElementService.java (100%) rename plugins/network-elements/palo-alto/src/{ => main/java}/com/cloud/network/resource/PaloAltoResource.java (100%) rename plugins/network-elements/palo-alto/src/{ => main/java}/com/cloud/network/utils/HttpClientWrapper.java (100%) rename plugins/network-elements/palo-alto/{ => src/main}/resources/META-INF/cloudstack/paloalto/module.properties (100%) rename plugins/network-elements/palo-alto/{ => src/main}/resources/META-INF/cloudstack/paloalto/spring-paloalto-context.xml (100%) rename plugins/network-elements/palo-alto/{test => src/test/java}/com/cloud/network/resource/MockablePaloAltoResource.java (100%) rename plugins/network-elements/palo-alto/{test => src/test/java}/com/cloud/network/resource/PaloAltoResourceTest.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/api/commands/AddSspCmd.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/api/commands/DeleteSspCmd.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/api/response/SspResponse.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/dao/SspCredentialDao.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/dao/SspCredentialDaoImpl.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/dao/SspCredentialVO.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/dao/SspTenantDao.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/dao/SspTenantDaoImpl.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/dao/SspTenantVO.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/dao/SspUuidDao.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/dao/SspUuidVO.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/element/SspClient.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/element/SspElement.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/element/SspManager.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/element/SspService.java (100%) rename plugins/network-elements/stratosphere-ssp/src/{ => main/java}/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java (100%) rename plugins/network-elements/stratosphere-ssp/{ => src/main}/resources/META-INF/cloudstack/ssp/module.properties (100%) rename plugins/network-elements/stratosphere-ssp/{ => src/main}/resources/META-INF/cloudstack/ssp/spring-ssp-context.xml (100%) rename plugins/network-elements/stratosphere-ssp/{test => src/test/java}/org/apache/cloudstack/network/element/SspClientTest.java (100%) rename plugins/network-elements/stratosphere-ssp/{test => src/test/java}/org/apache/cloudstack/network/element/SspElementTest.java (100%) rename plugins/network-elements/vxlan/src/{ => main/java}/com/cloud/network/guru/VxlanGuestNetworkGuru.java (100%) rename plugins/network-elements/vxlan/{ => src/main}/resources/META-INF/cloudstack/vxlan/module.properties (100%) rename plugins/network-elements/vxlan/{ => src/main}/resources/META-INF/cloudstack/vxlan/spring-vxlan-context.xml (100%) rename plugins/network-elements/vxlan/{test => src/test/java}/com/cloud/network/guru/VxlanGuestNetworkGuruTest.java (100%) rename plugins/outofbandmanagement-drivers/ipmitool/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolOutOfBandManagementDriver.java (100%) rename plugins/outofbandmanagement-drivers/ipmitool/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapper.java (100%) rename plugins/outofbandmanagement-drivers/ipmitool/{ => src/main}/resources/META-INF/cloudstack/ipmitool/module.properties (100%) rename plugins/outofbandmanagement-drivers/ipmitool/{ => src/main}/resources/META-INF/cloudstack/ipmitool/spring-ipmitool-context.xml (100%) rename plugins/outofbandmanagement-drivers/ipmitool/{test => src/test/java}/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapperTest.java (100%) rename plugins/outofbandmanagement-drivers/nested-cloudstack/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriver.java (100%) rename plugins/outofbandmanagement-drivers/nested-cloudstack/{ => src/main}/resources/META-INF/cloudstack/nested-cloudstack/module.properties (100%) rename plugins/outofbandmanagement-drivers/nested-cloudstack/{ => src/main}/resources/META-INF/cloudstack/nested-cloudstack/spring-nested-cloudstack-context.xml (100%) rename plugins/outofbandmanagement-drivers/nested-cloudstack/{test => src/test/java}/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriverTest.java (100%) rename plugins/storage-allocators/random/src/{ => main/java}/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java (100%) rename plugins/storage/image/default/src/{ => main/java}/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java (100%) rename plugins/storage/image/default/src/{ => main/java}/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackImageStoreLifeCycleImpl.java (100%) rename plugins/storage/image/default/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/CloudStackImageStoreProviderImpl.java (100%) rename plugins/storage/image/default/{ => src/main}/resources/META-INF/cloudstack/storage-image-default/module.properties (100%) rename plugins/storage/image/default/{ => src/main}/resources/META-INF/cloudstack/storage-image-default/spring-storage-image-default-context.xml (100%) rename plugins/storage/image/s3/src/{ => main/java}/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java (100%) rename plugins/storage/image/s3/src/{ => main/java}/org/apache/cloudstack/storage/datastore/lifecycle/S3ImageStoreLifeCycleImpl.java (100%) rename plugins/storage/image/s3/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/S3ImageStoreProviderImpl.java (100%) rename plugins/storage/image/s3/{ => src/main}/resources/META-INF/cloudstack/storage-image-s3/module.properties (100%) rename plugins/storage/image/s3/{ => src/main}/resources/META-INF/cloudstack/storage-image-s3/spring-storage-image-s3-context.xml (100%) rename plugins/storage/image/sample/src/{ => main/java}/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java (100%) rename plugins/storage/image/sample/src/{ => main/java}/org/apache/cloudstack/storage/datastore/lifecycle/SampleImageStoreLifeCycleImpl.java (100%) rename plugins/storage/image/sample/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/SampleImageStoreProviderImpl.java (100%) rename plugins/storage/image/swift/src/{ => main/java}/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java (100%) rename plugins/storage/image/swift/src/{ => main/java}/org/apache/cloudstack/storage/datastore/lifecycle/SwiftImageStoreLifeCycleImpl.java (100%) rename plugins/storage/image/swift/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/SwiftImageStoreProviderImpl.java (100%) rename plugins/storage/image/swift/{ => src/main}/resources/META-INF/cloudstack/storage-image-swift/module.properties (100%) rename plugins/storage/image/swift/{ => src/main}/resources/META-INF/cloudstack/storage-image-swift/spring-storage-image-swift-context.xml (100%) mode change 100755 => 100644 plugins/storage/volume/cloudbyte/pom.xml rename plugins/storage/volume/cloudbyte/src/{ => main/java}/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java (100%) rename plugins/storage/volume/cloudbyte/src/{ => main/java}/org/apache/cloudstack/storage/datastore/lifecycle/ElastistorPrimaryDataStoreLifeCycle.java (100%) rename plugins/storage/volume/cloudbyte/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/ElastistorHostListener.java (100%) rename plugins/storage/volume/cloudbyte/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/ElastistorPrimaryDataStoreProvider.java (100%) rename plugins/storage/volume/cloudbyte/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java (100%) rename plugins/storage/volume/cloudbyte/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiService.java (100%) rename plugins/storage/volume/cloudbyte/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiServiceImpl.java (100%) rename plugins/storage/volume/cloudbyte/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/ListElastistorInterfaceCmd.java (100%) rename plugins/storage/volume/cloudbyte/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/ListElastistorInterfaceResponse.java (100%) rename plugins/storage/volume/cloudbyte/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/ListElastistorPoolCmd.java (100%) rename plugins/storage/volume/cloudbyte/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/ListElastistorPoolResponse.java (100%) rename plugins/storage/volume/cloudbyte/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/ListElastistorVolumeCmd.java (100%) rename plugins/storage/volume/cloudbyte/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/ListElastistorVolumeResponse.java (100%) rename plugins/storage/volume/cloudbyte/{ => src/main}/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties (100%) rename plugins/storage/volume/cloudbyte/{ => src/main}/resources/META-INF/cloudstack/storage-volume-cloudbyte/spring-storage-volume-cloudbyte-context.xml (100%) rename plugins/storage/volume/default/src/{ => main/java}/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java (100%) rename plugins/storage/volume/default/src/{ => main/java}/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java (100%) rename plugins/storage/volume/default/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/CloudStackPrimaryDataStoreProviderImpl.java (100%) rename plugins/storage/volume/default/{ => src/main}/resources/META-INF/cloudstack/storage-volume-default/module.properties (100%) rename plugins/storage/volume/default/{ => src/main}/resources/META-INF/cloudstack/storage-volume-default/spring-storage-volume-default-context.xml (100%) rename plugins/storage/volume/default/{test => src/test/java}/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImplTest.java (100%) rename plugins/storage/volume/nexenta/src/{ => main/java}/org/apache/cloudstack/storage/datastore/driver/NexentaPrimaryDataStoreDriver.java (100%) rename plugins/storage/volume/nexenta/src/{ => main/java}/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java (100%) rename plugins/storage/volume/nexenta/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/NexentaHostListener.java (100%) rename plugins/storage/volume/nexenta/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/NexentaPrimaryDataStoreProvider.java (100%) rename plugins/storage/volume/nexenta/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java (100%) rename plugins/storage/volume/nexenta/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/NexentaNmsUrl.java (100%) rename plugins/storage/volume/nexenta/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/NexentaStorAppliance.java (100%) rename plugins/storage/volume/nexenta/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/NexentaUtil.java (100%) rename plugins/storage/volume/nexenta/{ => src/main}/resources/META-INF.cloudstack.storage-volume-solidfire/module.properties (100%) rename plugins/storage/volume/nexenta/{ => src/main}/resources/META-INF.cloudstack.storage-volume-solidfire/spring-storage-volume-nexenta-context.xml (100%) rename plugins/storage/volume/nexenta/{test => src/test/java}/org/apache/cloudstack/storage/datastore/util/NexentaStorApplianceTest.java (100%) rename plugins/storage/volume/nexenta/{test => src/test/java}/org/apache/cloudstack/storage/datastore/util/NexentaUtilTest.java (100%) rename plugins/storage/volume/sample/src/{ => main/java}/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java (100%) rename plugins/storage/volume/sample/src/{ => main/java}/org/apache/cloudstack/storage/datastore/lifecycle/SamplePrimaryDataStoreLifeCycleImpl.java (100%) rename plugins/storage/volume/sample/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/SamplePrimaryDatastoreProviderImpl.java (100%) rename plugins/storage/volume/solidfire/src/{ => main/java}/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java (100%) rename plugins/storage/volume/solidfire/src/{ => main/java}/org/apache/cloudstack/storage/datastore/driver/SolidFireSharedPrimaryDataStoreDriver.java (100%) rename plugins/storage/volume/solidfire/src/{ => main/java}/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java (100%) rename plugins/storage/volume/solidfire/src/{ => main/java}/org/apache/cloudstack/storage/datastore/lifecycle/SolidFireSharedPrimaryDataStoreLifeCycle.java (100%) rename plugins/storage/volume/solidfire/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/SolidFireHostListener.java (100%) rename plugins/storage/volume/solidfire/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/SolidFirePrimaryDataStoreProvider.java (100%) rename plugins/storage/volume/solidfire/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/SolidFireSharedHostListener.java (100%) rename plugins/storage/volume/solidfire/src/{ => main/java}/org/apache/cloudstack/storage/datastore/provider/SolidFireSharedPrimaryDataStoreProvider.java (100%) rename plugins/storage/volume/solidfire/src/{ => main/java}/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java (100%) rename plugins/storage/volume/solidfire/{ => src/main}/resources/META-INF/cloudstack/storage-volume-solidfire/module.properties (100%) rename plugins/storage/volume/solidfire/{ => src/main}/resources/META-INF/cloudstack/storage-volume-solidfire/spring-storage-volume-solidfire-context.xml (100%) rename plugins/storage/volume/solidfire/{test => src/test/java}/org/apache/cloudstack/storage/test/AopTestAdvice.java (100%) rename plugins/storage/volume/solidfire/{test => src/test/java}/org/apache/cloudstack/storage/test/ChildTestConfiguration.java (100%) rename plugins/storage/volume/solidfire/{test => src/test/java}/org/apache/cloudstack/storage/test/TestConfiguration.java (100%) rename plugins/storage/volume/solidfire/{test => src/test/java}/org/apache/cloudstack/storage/test/VolumeTest.java (100%) rename plugins/storage/volume/solidfire/{ => src}/test/resource/storageContext.xml (100%) rename plugins/user-authenticators/ldap/src/{org/apache/cloudstack => main/java/org/apache/cloudstack/api}/api/command/LinkAccountToLdapCmd.java (100%) rename plugins/user-authenticators/ldap/src/{org/apache/cloudstack => main/java/org/apache/cloudstack/api}/api/response/LinkAccountToLdapResponse.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/command/LDAPConfigCmd.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/command/LDAPRemoveCmd.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/command/LdapImportUsersCmd.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/command/LdapListUsersCmd.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/command/LdapUserSearchCmd.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/response/LDAPConfigResponse.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/response/LDAPRemoveResponse.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/response/LdapConfigurationResponse.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/response/LdapUserResponse.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/api/response/LinkDomainToLdapResponse.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/LdapAuthenticator.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/LdapConfiguration.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/LdapConfigurationVO.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/LdapContextFactory.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/LdapManager.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/LdapManagerImpl.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/LdapTrustMapVO.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/LdapUser.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/LdapUserManager.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/LdapUserManagerFactory.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/LdapUtils.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryException.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/dao/LdapConfigurationDao.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/dao/LdapTrustMapDao.java (100%) rename plugins/user-authenticators/ldap/src/{ => main/java}/org/apache/cloudstack/ldap/dao/LdapTrustMapDaoImpl.java (100%) rename plugins/user-authenticators/ldap/{ => src/main}/resources/META-INF/cloudstack/ldap/module.properties (100%) rename plugins/user-authenticators/ldap/{ => src/main}/resources/META-INF/cloudstack/ldap/spring-ldap-context.xml (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/ADLdapUserManagerImplSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/BasicNamingEnumerationImpl.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapAddConfigurationCmdSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapAuthenticatorSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationDaoImplSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationResponseSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationVOSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapContextFactorySpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapCreateAccountCmdSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapDeleteConfigurationCmdSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapListConfigurationCmdSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapListUsersCmdSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapManagerImplSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapSearchUserCmdSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapUserManagerFactorySpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapUserResponseSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapUserSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LdapUtilsSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/LinkDomainToLdapCmdSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryExceptionSpec.groovy (100%) rename plugins/user-authenticators/ldap/{ => src}/test/groovy/org/apache/cloudstack/ldap/OpenLdapUserManagerSpec.groovy (100%) rename plugins/user-authenticators/ldap/{test => src/test/java}/org/apache/cloudstack/api/command/LdapConfigurationChanger.java (100%) rename plugins/user-authenticators/ldap/{test => src/test/java}/org/apache/cloudstack/api/command/LdapCreateAccountCmdTest.java (100%) rename plugins/user-authenticators/ldap/{test => src/test/java}/org/apache/cloudstack/api/command/LdapImportUsersCmdTest.java (100%) rename plugins/user-authenticators/ldap/{test => src/test/java}/org/apache/cloudstack/api/command/LinkAccountToLdapCmdTest.java (100%) rename plugins/user-authenticators/ldap/{test => src/test/java}/org/apache/cloudstack/api/command/LinkDomainToLdapCmdTest.java (100%) rename plugins/user-authenticators/ldap/{test => src/test/java}/org/apache/cloudstack/ldap/LdapConfigurationTest.java (100%) rename plugins/user-authenticators/ldap/{ => src}/test/resources/cloudstack.org.ldif (100%) rename plugins/user-authenticators/md5/src/{ => main/java}/com/cloud/server/auth/MD5UserAuthenticator.java (100%) rename plugins/user-authenticators/md5/{ => src/main}/resources/META-INF/cloudstack/md5/module.properties (100%) rename plugins/user-authenticators/md5/{ => src/main}/resources/META-INF/cloudstack/md5/spring-md5-context.xml (100%) rename plugins/user-authenticators/md5/{test => src/test/java}/com/cloud/server/auth/MD5UserAuthenticatorTest.java (100%) rename plugins/user-authenticators/pbkdf2/src/{ => main/java}/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java (100%) rename plugins/user-authenticators/pbkdf2/{ => src/main}/resources/META-INF/cloudstack/pbkdf2/module.properties (100%) rename plugins/user-authenticators/pbkdf2/{ => src/main}/resources/META-INF/cloudstack/pbkdf2/spring-pbkdf2-context.xml (100%) rename plugins/user-authenticators/pbkdf2/{test => src/test/java}/org/apache/cloudstack/server/auth/PBKD2UserAuthenticatorTest.java (100%) rename plugins/user-authenticators/plain-text/src/{ => main/java}/com/cloud/server/auth/PlainTextUserAuthenticator.java (100%) rename plugins/user-authenticators/plain-text/{ => src/main}/resources/META-INF/cloudstack/plaintext/module.properties (100%) rename plugins/user-authenticators/plain-text/{ => src/main}/resources/META-INF/cloudstack/plaintext/spring-plaintext-context.xml (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/api/command/AuthorizeSAMLSSOCmd.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/api/command/GetServiceProviderMetaDataCmd.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/api/command/ListIdpsCmd.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/api/command/ListSamlAuthorizationCmd.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/api/response/IdpResponse.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/api/response/SAMLMetaDataResponse.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/api/response/SamlAuthorizationResponse.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/api/response/SamlUserAccountResponse.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/saml/SAML2AuthManager.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/saml/SAML2UserAuthenticator.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/saml/SAMLPluginConstants.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/saml/SAMLProviderMetadata.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/saml/SAMLTokenDao.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/saml/SAMLTokenDaoImpl.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/saml/SAMLTokenVO.java (100%) rename plugins/user-authenticators/saml2/src/{ => main/java}/org/apache/cloudstack/saml/SAMLUtils.java (100%) rename plugins/user-authenticators/saml2/{ => src/main}/resources/META-INF/cloudstack/saml2/module.properties (100%) rename plugins/user-authenticators/saml2/{ => src/main}/resources/META-INF/cloudstack/saml2/spring-saml2-context.xml (100%) rename plugins/user-authenticators/saml2/{test => src/test/java}/org/apache/cloudstack/GetServiceProviderMetaDataCmdTest.java (100%) rename plugins/user-authenticators/saml2/{test => src/test/java}/org/apache/cloudstack/SAML2AuthManagerImplTest.java (100%) rename plugins/user-authenticators/saml2/{test => src/test/java}/org/apache/cloudstack/SAML2UserAuthenticatorTest.java (100%) rename plugins/user-authenticators/saml2/{test => src/test/java}/org/apache/cloudstack/SAMLUtilsTest.java (100%) rename plugins/user-authenticators/saml2/{test => src/test/java}/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java (100%) rename plugins/user-authenticators/saml2/{test => src/test/java}/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java (100%) rename plugins/user-authenticators/saml2/{test => src/test/java}/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmdTest.java (100%) rename plugins/user-authenticators/saml2/{test => src/test/java}/org/apache/cloudstack/saml/SAML2AuthManagerImplTest.java (100%) rename plugins/user-authenticators/sha256salted/src/{ => main/java}/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java (100%) rename plugins/user-authenticators/sha256salted/{ => src/main}/resources/META-INF/cloudstack/sha256salted/module.properties (100%) rename plugins/user-authenticators/sha256salted/{ => src/main}/resources/META-INF/cloudstack/sha256salted/spring-sha256salted-context.xml (100%) rename plugins/user-authenticators/sha256salted/{test/src => src/test/java}/com/cloud/server/auth/test/AuthenticatorTest.java (99%) rename server/src/{ => main/java}/com/cloud/account/SecurityManager.java (100%) rename server/src/{ => main/java}/com/cloud/acl/AffinityGroupAccessChecker.java (100%) rename server/src/{ => main/java}/com/cloud/acl/DomainChecker.java (100%) rename server/src/{ => main/java}/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java (100%) rename server/src/{ => main/java}/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java (100%) rename server/src/{ => main/java}/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java (100%) rename server/src/{ => main/java}/com/cloud/agent/manager/allocator/impl/TestingAllocator.java (100%) rename server/src/{ => main/java}/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java (100%) rename server/src/{ => main/java}/com/cloud/agent/manager/authn/AgentAuthnException.java (100%) rename server/src/{ => main/java}/com/cloud/agent/manager/authn/AgentAuthorizer.java (100%) rename server/src/{ => main/java}/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java (100%) rename server/src/{ => main/java}/com/cloud/alert/AlertManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/alert/ClusterAlertAdapter.java (100%) rename server/src/{ => main/java}/com/cloud/alert/ConsoleProxyAlertAdapter.java (100%) rename server/src/{ => main/java}/com/cloud/alert/SecondaryStorageVmAlertAdapter.java (100%) rename server/src/{ => main/java}/com/cloud/api/ApiAsyncJobDispatcher.java (100%) rename server/src/{ => main/java}/com/cloud/api/ApiDBUtils.java (100%) rename server/src/{ => main/java}/com/cloud/api/ApiDispatcher.java (100%) rename server/src/{ => main/java}/com/cloud/api/ApiGsonHelper.java (100%) rename server/src/{ => main/java}/com/cloud/api/ApiResponseGsonHelper.java (100%) rename server/src/{ => main/java}/com/cloud/api/ApiResponseHelper.java (100%) rename server/src/{ => main/java}/com/cloud/api/ApiSerializerHelper.java (100%) rename server/src/{ => main/java}/com/cloud/api/ApiServer.java (100%) rename server/src/{ => main/java}/com/cloud/api/ApiServlet.java (100%) rename server/src/{ => main/java}/com/cloud/api/EncodedStringTypeAdapter.java (100%) rename server/src/{ => main/java}/com/cloud/api/ResponseObjectTypeAdapter.java (100%) rename server/src/{ => main/java}/com/cloud/api/SerializationContext.java (100%) rename server/src/{ => main/java}/com/cloud/api/StringMapTypeAdapter.java (100%) rename server/src/{ => main/java}/com/cloud/api/auth/APIAuthenticationManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java (100%) rename server/src/{ => main/java}/com/cloud/api/auth/DefaultLogoutAPIAuthenticatorCmd.java (100%) rename server/src/{ => main/java}/com/cloud/api/dispatch/CommandCreationWorker.java (100%) rename server/src/{ => main/java}/com/cloud/api/dispatch/DispatchChain.java (100%) rename server/src/{ => main/java}/com/cloud/api/dispatch/DispatchChainFactory.java (100%) rename server/src/{ => main/java}/com/cloud/api/dispatch/DispatchTask.java (100%) rename server/src/{ => main/java}/com/cloud/api/dispatch/DispatchWorker.java (100%) rename server/src/{ => main/java}/com/cloud/api/dispatch/ParamGenericValidationWorker.java (100%) rename server/src/{ => main/java}/com/cloud/api/dispatch/ParamProcessWorker.java (100%) rename server/src/{ => main/java}/com/cloud/api/dispatch/ParamUnpackWorker.java (100%) rename server/src/{ => main/java}/com/cloud/api/dispatch/SpecificCmdValidationWorker.java (100%) rename server/src/{ => main/java}/com/cloud/api/doc/Alert.java (100%) rename server/src/{ => main/java}/com/cloud/api/doc/ApiXmlDocReader.java (100%) rename server/src/{ => main/java}/com/cloud/api/doc/ApiXmlDocWriter.java (100%) rename server/src/{ => main/java}/com/cloud/api/doc/Argument.java (100%) rename server/src/{ => main/java}/com/cloud/api/doc/Command.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/MutualExclusiveIdsManagerBase.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/QueryManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/ViewResponseHelper.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/AccountJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/AccountJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/AffinityGroupJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/AsyncJobJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/AsyncJobJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/DataCenterJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/DiskOfferingJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/DomainJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/DomainJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/DomainRouterJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/GenericDaoBaseWithTagInformation.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/HostJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/HostJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/HostTagDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/HostTagDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/ImageStoreJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/InstanceGroupJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/ProjectAccountJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/ProjectInvitationJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/ProjectJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/ProjectJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/ResourceTagJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/SecurityGroupJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/ServiceOfferingJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/StoragePoolJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/TemplateJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/TemplateJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/UserAccountJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/UserVmJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/UserVmJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/VolumeJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/dao/VolumeJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/AccountJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/AffinityGroupJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/AsyncJobJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/BaseViewVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/BaseViewWithTagInformationVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/ControlledViewEntity.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/DataCenterJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/DiskOfferingJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/DomainJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/DomainRouterJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/EventJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/HostJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/HostTagVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/ImageStoreJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/InstanceGroupJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/ProjectAccountJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/ProjectInvitationJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/ProjectJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/ResourceTagJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/SecurityGroupJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/ServiceOfferingJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/StoragePoolJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/TemplateJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/UserAccountJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/UserVmJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/query/vo/VolumeJoinVO.java (100%) rename server/src/{ => main/java}/com/cloud/api/response/ApiResponseSerializer.java (100%) rename server/src/{ => main/java}/com/cloud/api/response/EmptyFieldExclusionStrategy.java (100%) rename server/src/{ => main/java}/com/cloud/api/response/SecurityGroupResultObject.java (100%) rename server/src/{ => main/java}/com/cloud/api/response/SecurityGroupRuleResultObject.java (100%) rename server/src/{ => main/java}/com/cloud/async/AsyncJobResult.java (100%) rename server/src/{ => main/java}/com/cloud/capacity/CapacityManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/capacity/ComputeCapacityListener.java (100%) rename server/src/{ => main/java}/com/cloud/capacity/StorageCapacityListener.java (100%) rename server/src/{com => main/java/com/cloud}/cloud/network/NetworkMigrationManager.java (100%) rename server/src/{com => main/java/com/cloud}/cloud/network/NetworkMigrationManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/configuration/Config.java (100%) rename server/src/{ => main/java}/com/cloud/configuration/ConfigurationManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/configuration/ZoneConfig.java (100%) rename server/src/{ => main/java}/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java (100%) rename server/src/{ => main/java}/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java (100%) rename server/src/{ => main/java}/com/cloud/consoleproxy/AgentHook.java (100%) rename server/src/{ => main/java}/com/cloud/consoleproxy/AgentHookBase.java (100%) rename server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyAlertEventArgs.java (100%) rename server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java (100%) rename server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyListener.java (100%) rename server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyManagementState.java (100%) rename server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyManager.java (100%) rename server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyService.java (100%) rename server/src/{ => main/java}/com/cloud/consoleproxy/StaticConsoleProxyManager.java (100%) rename server/src/{ => main/java}/com/cloud/dc/DedicatedResourceVO.java (100%) rename server/src/{ => main/java}/com/cloud/dc/dao/DedicatedResourceDao.java (100%) rename server/src/{ => main/java}/com/cloud/dc/dao/DedicatedResourceDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/deploy/DeploymentPlanningManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/deploy/FirstFitPlanner.java (100%) rename server/src/{ => main/java}/com/cloud/deploy/PlannerHostReservationVO.java (100%) rename server/src/{ => main/java}/com/cloud/deploy/dao/PlannerHostReservationDao.java (100%) rename server/src/{ => main/java}/com/cloud/deploy/dao/PlannerHostReservationDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/event/ActionEventInterceptor.java (100%) rename server/src/{ => main/java}/com/cloud/event/ActionEventUtils.java (100%) rename server/src/{ => main/java}/com/cloud/event/AlertGenerator.java (100%) rename server/src/{ => main/java}/com/cloud/event/dao/EventJoinDao.java (100%) rename server/src/{ => main/java}/com/cloud/event/dao/EventJoinDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/ha/AbstractInvestigatorImpl.java (100%) rename server/src/{ => main/java}/com/cloud/ha/CheckOnAgentInvestigator.java (100%) rename server/src/{ => main/java}/com/cloud/ha/HaWorkVO.java (100%) rename server/src/{ => main/java}/com/cloud/ha/HighAvailabilityManagerExtImpl.java (100%) rename server/src/{ => main/java}/com/cloud/ha/HighAvailabilityManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/ha/KVMFencer.java (100%) rename server/src/{ => main/java}/com/cloud/ha/ManagementIPSystemVMInvestigator.java (100%) rename server/src/{ => main/java}/com/cloud/ha/RecreatableFencer.java (100%) rename server/src/{ => main/java}/com/cloud/ha/UserVmDomRInvestigator.java (100%) rename server/src/{ => main/java}/com/cloud/ha/XenServerInvestigator.java (100%) rename server/src/{ => main/java}/com/cloud/ha/dao/HighAvailabilityDao.java (100%) rename server/src/{ => main/java}/com/cloud/ha/dao/HighAvailabilityDaoImpl.java (100%) rename server/src/{ => main/java}/com/cloud/hypervisor/CloudZonesStartupProcessor.java (100%) rename server/src/{ => main/java}/com/cloud/hypervisor/HypervisorGuruBase.java (100%) rename server/src/{ => main/java}/com/cloud/hypervisor/HypervisorGuruManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/hypervisor/KVMGuru.java (100%) rename server/src/{ => main/java}/com/cloud/hypervisor/LXCGuru.java (100%) rename server/src/{ => main/java}/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java (100%) rename server/src/{ => main/java}/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java (100%) rename server/src/{ => main/java}/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java (100%) rename server/src/{ => main/java}/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java (100%) rename server/src/{ => main/java}/com/cloud/metadata/ResourceMetaDataManager.java (100%) rename server/src/{ => main/java}/com/cloud/metadata/ResourceMetaDataManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/ExternalDeviceUsageManager.java (100%) rename server/src/{ => main/java}/com/cloud/network/ExternalDeviceUsageManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/ExternalFirewallDeviceManager.java (100%) rename server/src/{ => main/java}/com/cloud/network/ExternalFirewallDeviceManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/ExternalIpAddressAllocator.java (100%) rename server/src/{ => main/java}/com/cloud/network/ExternalLoadBalancerDeviceManager.java (100%) rename server/src/{ => main/java}/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/ExternalNetworkDeviceManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/IpAddrAllocator.java (100%) rename server/src/{ => main/java}/com/cloud/network/IpAddressManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/Ipv6AddressManager.java (100%) rename server/src/{ => main/java}/com/cloud/network/Ipv6AddressManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/NetworkModelImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/NetworkServiceImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/NetworkUsageManager.java (100%) rename server/src/{ => main/java}/com/cloud/network/NetworkUsageManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/PortProfileManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/SshKeysDistriMonitor.java (100%) rename server/src/{ => main/java}/com/cloud/network/StorageNetworkManager.java (100%) rename server/src/{ => main/java}/com/cloud/network/StorageNetworkManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/as/AutoScaleManager.java (100%) rename server/src/{ => main/java}/com/cloud/network/as/AutoScaleManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/element/CloudZonesNetworkElement.java (100%) rename server/src/{ => main/java}/com/cloud/network/element/ConfigDriveNetworkElement.java (100%) rename server/src/{ => main/java}/com/cloud/network/element/SecurityGroupElement.java (100%) rename server/src/{ => main/java}/com/cloud/network/element/VirtualRouterElement.java (100%) rename server/src/{ => main/java}/com/cloud/network/element/VpcVirtualRouterElement.java (100%) rename server/src/{ => main/java}/com/cloud/network/firewall/FirewallManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/guru/ControlNetworkGuru.java (100%) rename server/src/{ => main/java}/com/cloud/network/guru/DirectNetworkGuru.java (100%) rename server/src/{ => main/java}/com/cloud/network/guru/DirectPodBasedNetworkGuru.java (100%) rename server/src/{ => main/java}/com/cloud/network/guru/ExternalGuestNetworkGuru.java (100%) rename server/src/{ => main/java}/com/cloud/network/guru/GuestNetworkGuru.java (100%) rename server/src/{ => main/java}/com/cloud/network/guru/PodBasedNetworkGuru.java (100%) rename server/src/{ => main/java}/com/cloud/network/guru/PrivateNetworkGuru.java (100%) rename server/src/{ => main/java}/com/cloud/network/guru/PublicNetworkGuru.java (100%) rename server/src/{ => main/java}/com/cloud/network/guru/StorageNetworkGuru.java (100%) rename server/src/{ => main/java}/com/cloud/network/lb/LBHealthCheckManager.java (100%) rename server/src/{ => main/java}/com/cloud/network/lb/LBHealthCheckManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/router/CommandSetupHelper.java (100%) rename server/src/{ => main/java}/com/cloud/network/router/NetworkHelper.java (100%) rename server/src/{ => main/java}/com/cloud/network/router/NetworkHelperImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/router/NicProfileHelper.java (100%) rename server/src/{ => main/java}/com/cloud/network/router/NicProfileHelperImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/router/RouterControlHelper.java (100%) rename server/src/{ => main/java}/com/cloud/network/router/VirtualNetworkApplianceManager.java (100%) rename server/src/{ => main/java}/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/router/VpcNetworkHelperImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java (100%) rename server/src/{ => main/java}/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/AdvancedVpnRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/BasicVpnRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/DhcpEntryRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/DhcpPvlanRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/DhcpSubNetRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/FirewallRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/IpAssociationRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/LoadBalancingRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/NetworkAclsRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/NicPlugInOutRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/PasswordToRouterRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/PrivateGatewayRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/RuleApplier.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/RuleApplierWrapper.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/RulesManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/SshKeyToRouterRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/StaticNatImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/StaticNatRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/StaticRoutesRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/UserdataPwdRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/UserdataToRouterRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/VirtualNetworkApplianceFactory.java (100%) rename server/src/{ => main/java}/com/cloud/network/rules/VpcIpAssociationRules.java (100%) rename server/src/{ => main/java}/com/cloud/network/security/LocalSecurityGroupWorkQueue.java (100%) rename server/src/{ => main/java}/com/cloud/network/security/RuleUpdateLog.java (100%) rename server/src/{ => main/java}/com/cloud/network/security/SecurityGroupListener.java (100%) rename server/src/{ => main/java}/com/cloud/network/security/SecurityGroupManager.java (100%) rename server/src/{ => main/java}/com/cloud/network/security/SecurityGroupManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/security/SecurityGroupManagerImpl2.java (100%) rename server/src/{ => main/java}/com/cloud/network/security/SecurityGroupManagerMBean.java (100%) rename server/src/{ => main/java}/com/cloud/network/security/SecurityGroupWorkQueue.java (100%) rename server/src/{ => main/java}/com/cloud/network/security/SecurityGroupWorkTracker.java (100%) rename server/src/{ => main/java}/com/cloud/network/security/SecurityManagerMBeanImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/vpc/NetworkACLManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/vpc/NetworkACLServiceImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/vpc/PrivateGatewayProfile.java (100%) rename server/src/{ => main/java}/com/cloud/network/vpc/PrivateIpAddress.java (100%) rename server/src/{ => main/java}/com/cloud/network/vpc/VpcManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/vpc/VpcPrivateGatewayTransactionCallable.java (100%) rename server/src/{ => main/java}/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/network/vpn/Site2SiteVpnManager.java (100%) rename server/src/{ => main/java}/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/projects/ProjectManager.java (100%) rename server/src/{ => main/java}/com/cloud/projects/ProjectManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/resource/DiscovererBase.java (100%) rename server/src/{ => main/java}/com/cloud/resource/DummyHostDiscoverer.java (100%) rename server/src/{ => main/java}/com/cloud/resource/DummyHostServerResource.java (100%) rename server/src/{ => main/java}/com/cloud/resource/ResourceManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/resourcelimit/ResourceLimitManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/server/ConfigurationServer.java (100%) rename server/src/{ => main/java}/com/cloud/server/ConfigurationServerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/server/Criteria.java (100%) rename server/src/{ => main/java}/com/cloud/server/LockMasterListener.java (100%) rename server/src/{ => main/java}/com/cloud/server/ManagementServer.java (100%) rename server/src/{ => main/java}/com/cloud/server/ManagementServerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/server/StatsCollector.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/BaremetalTemplateResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/NwDeviceDhcpResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/NwDevicePxeServerResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/PxePingResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/netapp/AssociateLunCmdResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/netapp/CreateLunCmdResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/netapp/CreateVolumeOnFilerCmdResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/netapp/CreateVolumePoolCmdResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/netapp/DeleteLUNCmdResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/netapp/DeleteVolumeOnFilerCmdResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/netapp/DeleteVolumePoolCmdResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/netapp/DissociateLunCmdResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/netapp/ListLunsCmdResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/netapp/ListVolumePoolsCmdResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/netapp/ListVolumesOnFilerCmdResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/api/response/netapp/ModifyVolumePoolCmdResponse.java (100%) rename server/src/{ => main/java}/com/cloud/server/auth/UserAuthenticator.java (100%) rename server/src/{ => main/java}/com/cloud/servlet/CloudStartupServlet.java (100%) rename server/src/{ => main/java}/com/cloud/servlet/ConsoleProxyClientParam.java (100%) rename server/src/{ => main/java}/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java (100%) rename server/src/{ => main/java}/com/cloud/servlet/ConsoleProxyServlet.java (100%) rename server/src/{ => main/java}/com/cloud/storage/CreateSnapshotPayload.java (100%) rename server/src/{ => main/java}/com/cloud/storage/ImageStoreDetailsUtil.java (100%) rename server/src/{ => main/java}/com/cloud/storage/ImageStoreUploadMonitor.java (100%) rename server/src/{ => main/java}/com/cloud/storage/ImageStoreUploadMonitorImpl.java (100%) rename server/src/{ => main/java}/com/cloud/storage/LocalStoragePoolListener.java (100%) rename server/src/{ => main/java}/com/cloud/storage/OCFS2Manager.java (100%) rename server/src/{ => main/java}/com/cloud/storage/OCFS2ManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/storage/RegisterVolumePayload.java (100%) rename server/src/{ => main/java}/com/cloud/storage/ResizeVolumePayload.java (100%) rename server/src/{ => main/java}/com/cloud/storage/StorageManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/storage/StoragePoolAutomation.java (100%) rename server/src/{ => main/java}/com/cloud/storage/StoragePoolAutomationImpl.java (100%) rename server/src/{ => main/java}/com/cloud/storage/TemplateProfile.java (100%) rename server/src/{ => main/java}/com/cloud/storage/VolumeApiServiceImpl.java (100%) rename server/src/{ => main/java}/com/cloud/storage/download/DownloadAbandonedState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/download/DownloadActiveState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/download/DownloadCompleteState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/download/DownloadErrorState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/download/DownloadInProgressState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/download/DownloadInactiveState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/download/DownloadListener.java (100%) rename server/src/{ => main/java}/com/cloud/storage/download/DownloadMonitor.java (100%) rename server/src/{ => main/java}/com/cloud/storage/download/DownloadMonitorImpl.java (100%) rename server/src/{ => main/java}/com/cloud/storage/download/DownloadState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/download/NotDownloadedState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/listener/SnapshotStateListener.java (100%) rename server/src/{ => main/java}/com/cloud/storage/listener/StoragePoolMonitor.java (100%) rename server/src/{ => main/java}/com/cloud/storage/listener/StorageSyncListener.java (100%) rename server/src/{ => main/java}/com/cloud/storage/listener/VolumeStateListener.java (100%) rename server/src/{ => main/java}/com/cloud/storage/monitor/StorageHostMonitor.java (100%) rename server/src/{ => main/java}/com/cloud/storage/resource/DummySecondaryStorageResource.java (100%) rename server/src/{ => main/java}/com/cloud/storage/secondary/SecStorageVmAlertEventArgs.java (100%) rename server/src/{ => main/java}/com/cloud/storage/secondary/SecondaryStorageListener.java (100%) rename server/src/{ => main/java}/com/cloud/storage/secondary/SecondaryStorageVmAllocator.java (100%) rename server/src/{ => main/java}/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java (100%) rename server/src/{ => main/java}/com/cloud/storage/secondary/SecondaryStorageVmManager.java (100%) rename server/src/{ => main/java}/com/cloud/storage/snapshot/SnapshotManager.java (100%) rename server/src/{ => main/java}/com/cloud/storage/snapshot/SnapshotManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/storage/snapshot/SnapshotScheduler.java (100%) rename server/src/{ => main/java}/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/storage/upload/NotUploadedState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/upload/UploadAbandonedState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/upload/UploadActiveState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/upload/UploadCompleteState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/upload/UploadErrorState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/upload/UploadInProgressState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/upload/UploadInactiveState.java (100%) rename server/src/{ => main/java}/com/cloud/storage/upload/UploadListener.java (100%) rename server/src/{ => main/java}/com/cloud/storage/upload/UploadMonitor.java (100%) rename server/src/{ => main/java}/com/cloud/storage/upload/UploadMonitorImpl.java (100%) rename server/src/{ => main/java}/com/cloud/storage/upload/UploadState.java (100%) rename server/src/{ => main/java}/com/cloud/tags/TaggedResourceManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/template/HypervisorTemplateAdapter.java (100%) rename server/src/{ => main/java}/com/cloud/template/TemplateAdapter.java (100%) rename server/src/{ => main/java}/com/cloud/template/TemplateAdapterBase.java (100%) rename server/src/{ => main/java}/com/cloud/template/TemplateManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/test/DatabaseConfig.java (100%) rename server/src/{ => main/java}/com/cloud/test/IPRangeConfig.java (100%) rename server/src/{ => main/java}/com/cloud/test/PodZoneConfig.java (100%) rename server/src/{ => main/java}/com/cloud/test/TestAppender.java (100%) rename server/src/{ => main/java}/com/cloud/usage/UsageServiceImpl.java (100%) rename server/src/{ => main/java}/com/cloud/user/AccountManager.java (100%) rename server/src/{ => main/java}/com/cloud/user/AccountManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/user/DomainManager.java (100%) rename server/src/{ => main/java}/com/cloud/user/DomainManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/uuididentity/UUIDManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/vm/SystemVmLoadScanHandler.java (100%) rename server/src/{ => main/java}/com/cloud/vm/SystemVmLoadScanner.java (100%) rename server/src/{ => main/java}/com/cloud/vm/UserVmManager.java (100%) rename server/src/{ => main/java}/com/cloud/vm/UserVmManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/vm/UserVmStateListener.java (100%) rename server/src/{ => main/java}/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java (100%) rename server/src/{ => main/java}/com/cloud/vm/snapshot/VmWorkCreateVMSnapshot.java (100%) rename server/src/{ => main/java}/com/cloud/vm/snapshot/VmWorkDeleteAllVMSnapshots.java (100%) rename server/src/{ => main/java}/com/cloud/vm/snapshot/VmWorkDeleteVMSnapshot.java (100%) rename server/src/{ => main/java}/com/cloud/vm/snapshot/VmWorkRevertToVMSnapshot.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/acl/RoleManagerImpl.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/annotation/AnnotationManagerImpl.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ca/CAManagerImpl.java (100%) rename server/src/{org/apache => main/java/org/apache/cloudstack}/cloudstack/direct/download/DirectDownloadManagerImpl.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/HAManager.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/HAManagerImpl.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/HAResourceCounter.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/provider/ActivityCheckerInterface.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/provider/HACheckerException.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/provider/HAFenceException.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/provider/HAProvider.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/provider/HARecoveryException.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/provider/HealthCheckerInterface.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/provider/HostHAProvider.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/provider/host/HAAbstractHostProvider.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/task/ActivityCheckTask.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/task/BaseHATask.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/task/FenceTask.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/task/HealthCheckTask.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/ha/task/RecoveryTask.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/network/ssl/CertServiceImpl.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/network/topology/BasicNetworkTopology.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/network/topology/NetworkTopology.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/network/topology/NetworkTopologyContext.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImpl.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/outofbandmanagement/PowerOperationTask.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/poll/BackgroundPollManagerImpl.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/region/RegionAccount.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/region/RegionDomain.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/region/RegionManager.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/region/RegionManagerImpl.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/region/RegionServiceImpl.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/region/RegionServiceProvider.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/region/RegionUser.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/region/RegionsApiUtil.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java (100%) rename server/src/{ => main/java}/org/apache/cloudstack/region/gslb/GslbServiceProvider.java (100%) rename server/src/{ => main/java}/org/cloud/network/router/deployment/RouterDeploymentDefinition.java (100%) rename server/src/{ => main/java}/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java (100%) rename server/src/{ => main/java}/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-alert-adapter-backend/module.properties (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-alert-adapter-backend/spring-server-alert-adapter-backend-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-alert-adapter-compute/module.properties (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-alert-adapter-compute/spring-server-alert-adapter-compute-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-alert-adapter-storage/module.properties (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-alert-adapter-storage/spring-server-alert-adapter-storage-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-allocator/module.properties (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-allocator/spring-server-allocator-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-api/module.properties (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-api/spring-server-api-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-compute/module.properties (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-discoverer/module.properties (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-discoverer/spring-server-discoverer-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-fencer/module.properties (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-fencer/spring-server-fencer-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-investigator/module.properties (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-investigator/spring-server-investigator-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-network/module.properties (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-planner/module.properties (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-planner/spring-server-planner-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-storage/module.properties (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-storage/spring-server-storage-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-template-adapter/module.properties (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/server-template-adapter/spring-server-template-adapter-context.xml (100%) rename server/{ => src/main}/resources/META-INF/cloudstack/system/spring-server-system-context.xml (100%) rename server/{ => src/main}/resources/com/cloud/upgrade/databaseCreatorContext.xml (100%) rename server/{ => src/main}/scripts/vmops-fix-mysql-config (100%) rename server/{ => src}/test/async-job-component.xml (100%) rename server/{test => src/test/java}/com/cloud/alert/AlertControlsUnitTest.java (100%) rename server/{test => src/test/java}/com/cloud/alert/MockAlertManagerImpl.java (100%) rename server/{test => src/test/java}/com/cloud/api/APITest.java (100%) rename server/{test => src/test/java}/com/cloud/api/ApiResponseHelperTest.java (100%) rename server/{test => src/test/java}/com/cloud/api/ApiServletTest.java (100%) rename server/{test => src/test/java}/com/cloud/api/ListPerfTest.java (100%) rename server/{test => src/test/java}/com/cloud/api/LoginResponse.java (100%) rename server/{test => src/test/java}/com/cloud/api/dispatch/CommandCreationWorkerTest.java (100%) rename server/{test => src/test/java}/com/cloud/api/dispatch/DispatchChainFactoryTest.java (100%) rename server/{test => src/test/java}/com/cloud/api/dispatch/ParamGenericValidationWorkerTest.java (100%) rename server/{test => src/test/java}/com/cloud/api/dispatch/ParamProcessWorkerTest.java (100%) rename server/{test => src/test/java}/com/cloud/api/dispatch/SpecificCmdValidationWorkerTest.java (100%) rename server/{test => src/test/java}/com/cloud/api/query/MutualExclusiveIdsManagerBaseTest.java (100%) rename server/{test => src/test/java}/com/cloud/api/query/dao/GenericDaoBaseWithTagInformationBaseTest.java (100%) rename server/{test => src/test/java}/com/cloud/api/query/dao/SecurityGroupJoinDaoImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/api/query/dao/TemplateJoinDaoImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/api/query/dao/VolumeJoinDaoImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/capacity/CapacityManagerTest.java (100%) rename server/{test => src/test/java}/com/cloud/configuration/ConfigurationManagerTest.java (100%) rename server/{test => src/test/java}/com/cloud/configuration/ValidateIpRangeTest.java (100%) rename server/{test => src/test/java}/com/cloud/consoleproxy/ConsoleProxyManagerTest.java (100%) rename server/{test => src/test/java}/com/cloud/event/ActionEventUtilsTest.java (100%) rename server/{test => src/test/java}/com/cloud/event/EventControlsUnitTest.java (100%) rename server/{test => src/test/java}/com/cloud/ha/HighAvailabilityManagerImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/ha/KVMFencerTest.java (100%) rename server/{test => src/test/java}/com/cloud/keystore/KeystoreTest.java (100%) rename server/{test => src/test/java}/com/cloud/metadata/ResourceMetaDataManagerTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/CreatePrivateNetworkTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/DedicateGuestVlanRangesTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/ExternalLoadBalancerDeviceManagerImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/IpAddressManagerTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/MockFirewallManagerImpl.java (100%) rename server/{test => src/test/java}/com/cloud/network/MockNetworkModelImpl.java (100%) rename server/{test => src/test/java}/com/cloud/network/NetworkManagerTestComponentLibrary.java (100%) rename server/{test => src/test/java}/com/cloud/network/NetworkModelTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/UpdatePhysicalNetworkTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/dao/NetworkDaoTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/element/ConfigDriveNetworkElementTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/element/VirtualRouterElementTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/element/VpcVirtualRouterElementTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/firewall/FirewallManagerTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/lb/AssignLoadBalancerTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/lb/UpdateLoadBalancerTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/router/NetworkHelperImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/router/RouterControlHelperTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/security/SecurityGroupManagerImpl2Test.java (100%) rename server/{test => src/test/java}/com/cloud/network/security/SecurityGroupManagerImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java (100%) rename server/{test => src/test/java}/com/cloud/network/security/SecurityGroupQueueTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/vpc/VpcManagerImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java (100%) rename server/{test => src/test/java}/com/cloud/network/vpn/RemoteAccessVpnTest.java (100%) rename server/{test => src/test/java}/com/cloud/projects/MockProjectManagerImpl.java (100%) rename server/{test => src/test/java}/com/cloud/resource/MockResourceManagerImpl.java (100%) rename server/{test => src/test/java}/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/server/ConfigurationServerImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/server/ManagementServerImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/servlet/ConsoleProxyServletTest.java (100%) rename server/{test => src/test/java}/com/cloud/snapshot/SnapshotDaoTest.java (100%) rename server/{test => src/test/java}/com/cloud/snapshot/SnapshotDaoTestConfiguration.java (100%) rename server/{test => src/test/java}/com/cloud/storage/ImageStoreDetailsUtilTest.java (100%) rename server/{test => src/test/java}/com/cloud/storage/VolumeApiServiceImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/storage/dao/StoragePoolDaoTest.java (100%) rename server/{test => src/test/java}/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java (100%) rename server/{test => src/test/java}/com/cloud/storage/listener/StoragePoolMonitorTest.java (100%) rename server/{test => src/test/java}/com/cloud/storage/snapshot/SnapshotManagerTest.java (100%) rename server/{test => src/test/java}/com/cloud/template/HypervisorTemplateAdapterTest.java (100%) rename server/{test => src/test/java}/com/cloud/template/TemplateManagerImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/user/AccountManagerImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/user/AccountManagerImplVolumeDeleteEventTest.java (100%) rename server/{test => src/test/java}/com/cloud/user/AccountManagetImplTestBase.java (100%) rename server/{test => src/test/java}/com/cloud/user/DomainManagerImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/user/MockAccountManagerImpl.java (100%) rename server/{test => src/test/java}/com/cloud/user/MockDomainManagerImpl.java (100%) rename server/{test => src/test/java}/com/cloud/user/MockUsageEventDao.java (100%) rename server/{test => src/test/java}/com/cloud/vm/DeploymentPlanningManagerImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/vm/FirstFitPlannerTest.java (100%) rename server/{test => src/test/java}/com/cloud/vm/UserVmManagerTest.java (100%) rename server/{test => src/test/java}/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java (100%) rename server/{test => src/test/java}/com/cloud/vm/dao/UserVmDaoImplTest.java (100%) rename server/{test => src/test/java}/com/cloud/vm/dao/UserVmDaoTestConfiguration.java (100%) rename server/{test => src/test/java}/com/cloud/vm/snapshot/VMSnapshotManagerTest.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/MockConfigurationManagerImpl.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/MockNetworkManagerImpl.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/MockNetworkModelImpl.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/MockResourceLimitManagerImpl.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/NetworkACLManagerTest.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/NetworkACLServiceTest.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/Site2SiteVpnTest.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/VpcApiUnitTest.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/VpcTestConfiguration.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/dao/MockConfigurationDaoImpl.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/dao/MockNetworkDaoImpl.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/dao/MockVpcDaoImpl.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java (100%) rename server/{test => src/test/java}/com/cloud/vpc/dao/MockVpcVirtualRouterElement.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/affinity/AffinityApiUnitTest.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/affinity/AffinityGroupServiceImplTest.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/ca/CABackgroundTaskTest.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/ca/CAManagerImplTest.java (100%) rename server/{test/org/apache => src/test/java/org/apache/cloudstack}/cloudstack/direct/download/DirectDownloadManagerImplTest.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/network/lb/ApplicationLoadBalancerTest.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/network/ssl/CertServiceTest.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceTest.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/poll/BackgroundPollManagerImplTest.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/privategw/AclOnPrivateGwTest.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/region/RegionManagerTest.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java (100%) rename server/{test => src/test/java}/org/apache/cloudstack/service/ServiceOfferingVOTest.java (100%) rename server/{test => src/test/java}/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java (100%) rename server/{test => src/test/java}/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java (100%) rename server/{test => src/test/java}/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java (100%) rename server/{ => src}/test/resources/CloneSettingDaoTestContext.xml (100%) rename server/{ => src}/test/resources/SecurityGroupManagerTestContext.xml (100%) rename server/{ => src}/test/resources/SnapshotDaoTestContext.xml (100%) rename server/{ => src}/test/resources/StoragePoolDaoTestContext.xml (100%) rename server/{ => src}/test/resources/UserVMDaoTestContext.xml (100%) rename server/{ => src}/test/resources/VpcApiUnitTestContext.xml (100%) rename server/{ => src}/test/resources/VpcTestContext.xml (100%) rename server/{ => src}/test/resources/appLoadBalancer.xml (100%) rename server/{ => src}/test/resources/certs/bad_format_cert.crt (100%) rename server/{ => src}/test/resources/certs/dsa_self_signed.key (100%) rename server/{ => src}/test/resources/certs/expired_cert.crt (100%) rename server/{ => src}/test/resources/certs/non_root.crt (100%) rename server/{ => src}/test/resources/certs/non_root.csr (100%) rename server/{ => src}/test/resources/certs/non_root.key (100%) rename server/{ => src}/test/resources/certs/non_x509_pem.crt (100%) rename server/{ => src}/test/resources/certs/root_chain.crt (100%) rename server/{ => src}/test/resources/certs/root_chain.csr (100%) rename server/{ => src}/test/resources/certs/root_chain.key (100%) rename server/{ => src}/test/resources/certs/rsa_ca_signed.crt (100%) rename server/{ => src}/test/resources/certs/rsa_ca_signed.csr (100%) rename server/{ => src}/test/resources/certs/rsa_ca_signed.key (100%) rename server/{ => src}/test/resources/certs/rsa_self_signed.crt (100%) rename server/{ => src}/test/resources/certs/rsa_self_signed.csr (100%) rename server/{ => src}/test/resources/certs/rsa_self_signed.key (100%) rename server/{ => src}/test/resources/certs/rsa_self_signed_with_pwd.crt (100%) rename server/{ => src}/test/resources/certs/rsa_self_signed_with_pwd.csr (100%) rename server/{ => src}/test/resources/certs/rsa_self_signed_with_pwd.key (100%) rename server/{ => src}/test/resources/cleanup.sql (100%) rename server/{ => src}/test/resources/createNetworkOffering.xml (100%) rename server/{ => src}/test/resources/db.properties (100%) rename server/{ => src}/test/resources/fake.sql (100%) rename server/{ => src}/test/resources/network-mgr-component.xml (100%) rename server/{ => src}/test/resources/testContext.xml (100%) rename server/{ => src}/test/sync-queue-component.xml (100%) mode change 100755 => 100644 services/console-proxy-rdp/rdpconsole/README.txt mode change 100755 => 100644 services/console-proxy-rdp/rdpconsole/pom.xml rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/AjaxFIFOImageCache.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/AuthenticationException.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxy.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyAuthenticationResult.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyBaseServerFactoryImpl.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyClient.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyClientBase.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyClientListener.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyClientParam.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyClientStatsCollector.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyCmdHandler.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyGCThread.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyLoggerFactory.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyMonitor.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyRdpClient.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyResourceHandler.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyServerFactory.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyThumbnailHandler.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/ConsoleProxyVncClient.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/InputEventType.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/rdp/KeysymToKeycode.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/rdp/RdpBufferedImageCanvas.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/util/ITileScanListener.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/util/ImageHelper.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/util/Logger.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/util/LoggerFactory.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/util/RawHTTP.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/util/Region.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/util/RegionClassifier.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/util/TileInfo.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/util/TileTracker.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/BufferedImageCanvas.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/FrameBufferCanvas.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/FrameBufferUpdateListener.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/PaintNotificationListener.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/RfbConstants.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/VncClient.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/VncClientPacketSender.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/VncScreenDescription.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/VncServerPacketReceiver.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/packet/client/ClientPacket.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/packet/client/FramebufferUpdateRequestPacket.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/packet/client/KeyboardEventPacket.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/packet/client/MouseEventPacket.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/packet/client/SetEncodingsPacket.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/packet/client/SetPixelFormatPacket.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/packet/server/AbstractRect.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/packet/server/CopyRect.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/packet/server/FrameBufferSizeChangeRequest.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/packet/server/FramebufferUpdatePacket.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/packet/server/RawRect.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/packet/server/Rect.java (100%) rename services/console-proxy/server/src/{ => main/java}/com/cloud/consoleproxy/vnc/packet/server/ServerCutText.java (100%) rename services/console-proxy/server/{test => src/test/java}/com/cloud/consoleproxy/ConsoleProxyRdpClientTest.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/AddAccountToIAMGroupCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/AddIAMPermissionToIAMPolicyCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/AttachIAMPolicyToAccountCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/AttachIAMPolicyToIAMGroupCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/CreateIAMGroupCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/CreateIAMPolicyCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/DeleteIAMGroupCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/DeleteIAMPolicyCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/ListIAMGroupsCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/ListIAMPoliciesCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/RemoveAccountFromIAMGroupCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/RemoveIAMPermissionFromIAMPolicyCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/RemoveIAMPolicyFromAccountCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/command/iam/RemoveIAMPolicyFromIAMGroupCmd.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/response/iam/IAMGroupResponse.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/response/iam/IAMPermissionResponse.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/api/response/iam/IAMPolicyResponse.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/iam/IAMApiService.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/iam/IAMApiServiceImpl.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/iam/RoleBasedEntityAccessChecker.java (100%) rename services/iam/plugin/src/{ => main/java}/org/apache/cloudstack/iam/RoleBasedEntityQuerySelector.java (100%) rename services/iam/plugin/{ => src/main}/resources/META-INF/cloudstack/iam-access-checkers/module.properties (100%) rename services/iam/plugin/{ => src/main}/resources/META-INF/cloudstack/iam-access-checkers/spring-iam-access-checkers-context.xml (100%) rename services/iam/plugin/{test => src/test/java}/org/apache/cloudstack/iam/test/IAMApiServiceTest.java (100%) rename services/iam/plugin/{ => src}/test/resources/db.properties (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/api/IAMGroup.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/api/IAMPolicy.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/api/IAMPolicyPermission.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/api/IAMService.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/IAMAccountPolicyMapVO.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/IAMGroupAccountMapVO.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/IAMGroupPolicyMapVO.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/IAMGroupVO.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/IAMPolicyPermissionVO.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/IAMPolicyVO.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/IAMServiceImpl.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/dao/IAMAccountPolicyMapDao.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/dao/IAMAccountPolicyMapDaoImpl.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/dao/IAMGroupAccountMapDao.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/dao/IAMGroupAccountMapDaoImpl.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/dao/IAMGroupDao.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/dao/IAMGroupDaoImpl.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/dao/IAMGroupPolicyMapDao.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/dao/IAMGroupPolicyMapDaoImpl.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/dao/IAMPolicyDao.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/dao/IAMPolicyDaoImpl.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/dao/IAMPolicyPermissionDao.java (100%) rename services/iam/server/src/{ => main/java}/org/apache/cloudstack/iam/server/dao/IAMPolicyPermissionDaoImpl.java (100%) rename services/iam/server/{ => src/main}/resources/META-INF/cloudstack/core/spring-iam-server-context.xml (100%) rename services/iam/server/{test => src/test/java}/org/apache/cloudstack/iam/IAMServiceUnitTest.java (100%) rename services/iam/server/{ => src}/test/resources/db.properties (100%) rename services/secondary-storage/controller/src/{ => main/java}/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java (100%) rename services/secondary-storage/controller/src/{ => main/java}/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java (100%) rename services/secondary-storage/controller/{ => src/main}/resources/META-INF/cloudstack/core/spring-services-secondary-storage-controller-core-context.xml (100%) rename services/secondary-storage/controller/{test => src/test/java}/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerTest.java (100%) rename services/secondary-storage/server/src/{ => main/java}/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java (100%) rename services/secondary-storage/server/src/{ => main/java}/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResource.java (100%) rename services/secondary-storage/server/src/{ => main/java}/org/apache/cloudstack/storage/resource/LocalSecondaryStorageResource.java (100%) rename services/secondary-storage/server/src/{ => main/java}/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java (100%) rename services/secondary-storage/server/src/{ => main/java}/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java (100%) rename services/secondary-storage/server/src/{ => main/java}/org/apache/cloudstack/storage/resource/SecondaryStorageResource.java (100%) rename services/secondary-storage/server/src/{ => main/java}/org/apache/cloudstack/storage/resource/SecondaryStorageResourceHandler.java (100%) rename services/secondary-storage/server/src/{ => main/java}/org/apache/cloudstack/storage/template/DownloadManager.java (100%) rename services/secondary-storage/server/src/{ => main/java}/org/apache/cloudstack/storage/template/DownloadManagerImpl.java (100%) rename services/secondary-storage/server/src/{ => main/java}/org/apache/cloudstack/storage/template/UploadEntity.java (100%) rename services/secondary-storage/server/src/{ => main/java}/org/apache/cloudstack/storage/template/UploadManager.java (100%) rename services/secondary-storage/server/src/{ => main/java}/org/apache/cloudstack/storage/template/UploadManagerImpl.java (100%) rename services/secondary-storage/server/{ => src/main}/resources/META-INF/cloudstack/secondary-storage-discoverer/module.properties (100%) rename services/secondary-storage/server/{ => src/main}/resources/META-INF/cloudstack/secondary-storage-discoverer/spring-secondary-storage-discoverer-context.xml (100%) rename services/secondary-storage/server/{test => src/test/java}/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResourceTest.java (100%) rename services/secondary-storage/server/{test => src/test/java}/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResourceTest.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/sample/UserCloudAPIExecutor.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/longrun/BuildGuestNetwork.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/longrun/GuestNetwork.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/longrun/PerformanceWithAPI.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/longrun/User.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/longrun/VirtualMachine.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/regression/ApiCommand.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/regression/ConfigTest.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/regression/DelegatedAdminTest.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/regression/Deploy.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/regression/EventsApiTest.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/regression/HA.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/regression/LoadBalancingTest.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/regression/PortForwardingTest.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/regression/SanityTest.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/regression/Test.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/regression/TestCase.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/regression/TestCaseEngine.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/regression/VMApiTest.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/stress/SshTest.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/stress/StressTestDirectAttach.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/stress/TestClientWithAPI.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/stress/WgetTest.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/ui/AbstractSeleniumTestCase.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/ui/AddAndDeleteAISO.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/ui/AddAndDeleteATemplate.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/ui/UIScenarioTest.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/utils/ConsoleProxy.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/utils/IpSqlGenerator.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/utils/ProxyLoadTemp.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/utils/SignEC2.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/utils/SignRequest.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/utils/SqlDataGenerator.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/utils/SubmitCert.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/utils/TestClient.java (100%) rename test/{src => src-not-used/main/java}/com/cloud/test/utils/UtilsForTest.java (100%) rename tools/wix-cloudstack-maven-plugin/src/{ => main/java}/org/apache/cloudstack/wix/HeatMojo.java (100%) rename usage/src/{com => main/java/com/cloud}/cloud/usage/parser/VMSanpshotOnPrimaryParser.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/StorageTypes.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/UsageAlertManagerImpl.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/UsageManager.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/UsageManagerImpl.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/UsageSanityChecker.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/UsageServer.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/parser/IPAddressUsageParser.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/parser/LoadBalancerUsageParser.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/parser/NetworkOfferingUsageParser.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/parser/NetworkUsageParser.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/parser/PortForwardingUsageParser.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/parser/SecurityGroupUsageParser.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/parser/StorageUsageParser.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/parser/UsageParser.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/parser/VMInstanceUsageParser.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/parser/VMSnapshotUsageParser.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/parser/VPNUserUsageParser.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/parser/VmDiskUsageParser.java (100%) rename usage/src/{ => main/java}/com/cloud/usage/parser/VolumeUsageParser.java (100%) rename usage/{ => src/main}/resources/usageApplicationContext.xml (100%) rename usage/{test => src/test/java}/com/cloud/usage/UsageManagerTest.java (100%) rename usage/{test => src/test/java}/com/cloud/usage/UsageManagerTestConfiguration.java (100%) rename usage/{test => src/test/java}/com/cloud/usage/UsageSanityCheckerIT.java (100%) rename usage/{test => src/test/java}/com/cloud/usage/UsageSanityCheckerTest.java (100%) rename usage/{ => src}/test/resources/UsageManagerTestContext.xml (100%) rename usage/{ => src}/test/resources/cloud1.xml (100%) rename usage/{ => src}/test/resources/cloud2.xml (100%) rename usage/{ => src}/test/resources/cloud3.xml (100%) rename usage/{ => src}/test/resources/cloud_usage1.xml (100%) rename usage/{ => src}/test/resources/cloud_usage2.xml (100%) rename usage/{ => src}/test/resources/cloud_usage3.xml (100%) rename usage/{ => src}/test/resources/db.properties (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/BaseMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/ClusterMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/CustomFieldConstants.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/CustomFieldsManagerMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/DatacenterMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/DatastoreFile.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/DatastoreMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/DiskControllerType.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/DistributedVirtualSwitchMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/FeatureKeyConstants.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/HostDatastoreBrowserMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/HostFirewallSystemMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/HostMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/HostNetworkSystemMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/HostStorageSystemMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/HostVirtualNicType.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/LicenseAssignmentManagerMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/LicenseManagerMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/NetworkDetails.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/NetworkMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/PerfCounterInfoMapper.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/PerfManagerMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/ScsiDiskControllerType.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/TaskMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/VersioningContants.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/VirtualDiskManagerMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/VirtualEthernetCardType.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/VirtualMachineDiskInfoBuilder.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/VirtualSwitchType.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/VmdkAdapterType.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/VmwareHostType.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHostNetworkSummary.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHostResourceSummary.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/util/VmwareClient.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/util/VmwareContext.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/util/VmwareContextPool.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java (100%) rename vmware-base/src/{ => main/java}/com/cloud/hypervisor/vmware/util/VmwareHelper.java (100%) rename vmware-base/{test => src/test/java}/com/cloud/hypervisor/vmware/mo/DatastoreMOTest.java (100%) rename vmware-base/{test => src/test/java}/com/cloud/hypervisor/vmware/mo/HypervisorHostHelperTest.java (100%) rename vmware-base/{test => src/test/java}/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java (100%) rename vmware-base/{test => src/test/java}/com/cloud/hypervisor/vmware/mo/VirtualMachineMOTest.java (100%) rename vmware-base/{test => src/test/java}/com/cloud/hypervisor/vmware/mo/VmwareMOTest.java (100%) rename vmware-base/{test => src/test/java}/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java (100%) rename vmware-base/{test => src/test/java}/com/cloud/hypervisor/vmware/util/VmwareContextTest.java (100%) diff --git a/LICENSE b/LICENSE index 0dcb45c61893..48d852652c33 100644 --- a/LICENSE +++ b/LICENSE @@ -612,13 +612,13 @@ Within the ui/lib/qunit directory qunit.css from http://docs.jquery.com/QUnit qunit.js from http://docs.jquery.com/QUnit -Within the utils/src/com/cloud/utils/db directory +Within the utils/src/main/java/com/cloud/utils/db directory licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) Copyright (c) 2004 Clinton Begin from Clinton Begin http://code.google.com/p/mybatis/ ScriptRunner.java from http://code.google.com/p/mybatis/ -Within the utils/src/org/apache/commons/httpclient/contrib/ssl directory +Within the utils/src/main/java/org/apache/commons/httpclient/contrib/ssl directory licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) Copyright (c) 2007 The Apache Software Foundation from The Apache Software Foundation http://www.apache.org/ diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/main/java/com/cloud/agent/Agent.java similarity index 100% rename from agent/src/com/cloud/agent/Agent.java rename to agent/src/main/java/com/cloud/agent/Agent.java diff --git a/agent/src/com/cloud/agent/AgentShell.java b/agent/src/main/java/com/cloud/agent/AgentShell.java similarity index 100% rename from agent/src/com/cloud/agent/AgentShell.java rename to agent/src/main/java/com/cloud/agent/AgentShell.java diff --git a/agent/src/com/cloud/agent/IAgentShell.java b/agent/src/main/java/com/cloud/agent/IAgentShell.java similarity index 100% rename from agent/src/com/cloud/agent/IAgentShell.java rename to agent/src/main/java/com/cloud/agent/IAgentShell.java diff --git a/agent/src/com/cloud/agent/direct/download/DirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloader.java similarity index 100% rename from agent/src/com/cloud/agent/direct/download/DirectTemplateDownloader.java rename to agent/src/main/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloader.java diff --git a/agent/src/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java b/agent/src/main/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloaderImpl.java similarity index 100% rename from agent/src/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java rename to agent/src/main/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloaderImpl.java diff --git a/agent/src/com/cloud/agent/direct/download/HttpDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/agent/direct/download/HttpDirectTemplateDownloader.java similarity index 100% rename from agent/src/com/cloud/agent/direct/download/HttpDirectTemplateDownloader.java rename to agent/src/main/java/com/cloud/agent/agent/direct/download/HttpDirectTemplateDownloader.java diff --git a/agent/src/com/cloud/agent/direct/download/HttpsDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/agent/direct/download/HttpsDirectTemplateDownloader.java similarity index 100% rename from agent/src/com/cloud/agent/direct/download/HttpsDirectTemplateDownloader.java rename to agent/src/main/java/com/cloud/agent/agent/direct/download/HttpsDirectTemplateDownloader.java diff --git a/agent/src/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/agent/direct/download/MetalinkDirectTemplateDownloader.java similarity index 100% rename from agent/src/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java rename to agent/src/main/java/com/cloud/agent/agent/direct/download/MetalinkDirectTemplateDownloader.java diff --git a/agent/src/com/cloud/agent/direct/download/NfsDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/agent/direct/download/NfsDirectTemplateDownloader.java similarity index 100% rename from agent/src/com/cloud/agent/direct/download/NfsDirectTemplateDownloader.java rename to agent/src/main/java/com/cloud/agent/agent/direct/download/NfsDirectTemplateDownloader.java diff --git a/agent/src/com/cloud/agent/dao/StorageComponent.java b/agent/src/main/java/com/cloud/agent/dao/StorageComponent.java similarity index 100% rename from agent/src/com/cloud/agent/dao/StorageComponent.java rename to agent/src/main/java/com/cloud/agent/dao/StorageComponent.java diff --git a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java b/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java similarity index 100% rename from agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java rename to agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java diff --git a/agent/src/com/cloud/agent/dhcp/DhcpProtocolParserServer.java b/agent/src/main/java/com/cloud/agent/dhcp/DhcpProtocolParserServer.java similarity index 100% rename from agent/src/com/cloud/agent/dhcp/DhcpProtocolParserServer.java rename to agent/src/main/java/com/cloud/agent/dhcp/DhcpProtocolParserServer.java diff --git a/agent/src/com/cloud/agent/dhcp/DhcpSnooper.java b/agent/src/main/java/com/cloud/agent/dhcp/DhcpSnooper.java similarity index 100% rename from agent/src/com/cloud/agent/dhcp/DhcpSnooper.java rename to agent/src/main/java/com/cloud/agent/dhcp/DhcpSnooper.java diff --git a/agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java b/agent/src/main/java/com/cloud/agent/dhcp/FakeDhcpSnooper.java similarity index 100% rename from agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java rename to agent/src/main/java/com/cloud/agent/dhcp/FakeDhcpSnooper.java diff --git a/agent/src/com/cloud/agent/mockvm/MockVm.java b/agent/src/main/java/com/cloud/agent/mockvm/MockVm.java similarity index 100% rename from agent/src/com/cloud/agent/mockvm/MockVm.java rename to agent/src/main/java/com/cloud/agent/mockvm/MockVm.java diff --git a/agent/src/com/cloud/agent/mockvm/MockVmMgr.java b/agent/src/main/java/com/cloud/agent/mockvm/MockVmMgr.java similarity index 100% rename from agent/src/com/cloud/agent/mockvm/MockVmMgr.java rename to agent/src/main/java/com/cloud/agent/mockvm/MockVmMgr.java diff --git a/agent/src/com/cloud/agent/mockvm/VmMgr.java b/agent/src/main/java/com/cloud/agent/mockvm/VmMgr.java similarity index 100% rename from agent/src/com/cloud/agent/mockvm/VmMgr.java rename to agent/src/main/java/com/cloud/agent/mockvm/VmMgr.java diff --git a/agent/src/com/cloud/agent/resource/DummyResource.java b/agent/src/main/java/com/cloud/agent/resource/DummyResource.java similarity index 100% rename from agent/src/com/cloud/agent/resource/DummyResource.java rename to agent/src/main/java/com/cloud/agent/resource/DummyResource.java diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyAuthenticationResult.java b/agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyAuthenticationResult.java similarity index 100% rename from agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyAuthenticationResult.java rename to agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyAuthenticationResult.java diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java similarity index 100% rename from agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java rename to agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java diff --git a/agent/src/com/cloud/agent/vmdata/VmDataServer.java b/agent/src/main/java/com/cloud/agent/vmdata/VmDataServer.java similarity index 100% rename from agent/src/com/cloud/agent/vmdata/VmDataServer.java rename to agent/src/main/java/com/cloud/agent/vmdata/VmDataServer.java diff --git a/agent/test/com/cloud/agent/AgentShellTest.java b/agent/src/test/java/com/cloud/agent/AgentShellTest.java similarity index 100% rename from agent/test/com/cloud/agent/AgentShellTest.java rename to agent/src/test/java/com/cloud/agent/AgentShellTest.java diff --git a/agent/test/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/agent/src/test/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloaderImplTest.java similarity index 100% rename from agent/test/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java rename to agent/src/test/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloaderImplTest.java diff --git a/agent/test/com/cloud/agent/dao/impl/PropertiesStorageTest.java b/agent/src/test/java/com/cloud/agent/dao/impl/PropertiesStorageTest.java similarity index 100% rename from agent/test/com/cloud/agent/dao/impl/PropertiesStorageTest.java rename to agent/src/test/java/com/cloud/agent/dao/impl/PropertiesStorageTest.java diff --git a/api/src/com/cloud/agent/api/Answer.java b/api/src/main/java/com/cloud/agent/api/Answer.java similarity index 100% rename from api/src/com/cloud/agent/api/Answer.java rename to api/src/main/java/com/cloud/agent/api/Answer.java diff --git a/api/src/com/cloud/agent/api/BadCommand.java b/api/src/main/java/com/cloud/agent/api/BadCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/BadCommand.java rename to api/src/main/java/com/cloud/agent/api/BadCommand.java diff --git a/api/src/com/cloud/agent/api/Command.java b/api/src/main/java/com/cloud/agent/api/Command.java similarity index 100% rename from api/src/com/cloud/agent/api/Command.java rename to api/src/main/java/com/cloud/agent/api/Command.java diff --git a/api/src/com/cloud/agent/api/HostVmStateReportEntry.java b/api/src/main/java/com/cloud/agent/api/HostVmStateReportEntry.java similarity index 100% rename from api/src/com/cloud/agent/api/HostVmStateReportEntry.java rename to api/src/main/java/com/cloud/agent/api/HostVmStateReportEntry.java diff --git a/api/src/com/cloud/agent/api/LogLevel.java b/api/src/main/java/com/cloud/agent/api/LogLevel.java similarity index 100% rename from api/src/com/cloud/agent/api/LogLevel.java rename to api/src/main/java/com/cloud/agent/api/LogLevel.java diff --git a/api/src/com/cloud/agent/api/PvlanSetupCommand.java b/api/src/main/java/com/cloud/agent/api/PvlanSetupCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/PvlanSetupCommand.java rename to api/src/main/java/com/cloud/agent/api/PvlanSetupCommand.java diff --git a/api/src/com/cloud/agent/api/StoragePoolInfo.java b/api/src/main/java/com/cloud/agent/api/StoragePoolInfo.java similarity index 100% rename from api/src/com/cloud/agent/api/StoragePoolInfo.java rename to api/src/main/java/com/cloud/agent/api/StoragePoolInfo.java diff --git a/api/src/com/cloud/agent/api/UnsupportedAnswer.java b/api/src/main/java/com/cloud/agent/api/UnsupportedAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/UnsupportedAnswer.java rename to api/src/main/java/com/cloud/agent/api/UnsupportedAnswer.java diff --git a/api/src/com/cloud/agent/api/VgpuTypesInfo.java b/api/src/main/java/com/cloud/agent/api/VgpuTypesInfo.java similarity index 100% rename from api/src/com/cloud/agent/api/VgpuTypesInfo.java rename to api/src/main/java/com/cloud/agent/api/VgpuTypesInfo.java diff --git a/api/src/com/cloud/agent/api/storage/OVFHelper.java b/api/src/main/java/com/cloud/agent/api/api/storage/OVFHelper.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/OVFHelper.java rename to api/src/main/java/com/cloud/agent/api/api/storage/OVFHelper.java diff --git a/api/src/com/cloud/agent/api/to/DatadiskTO.java b/api/src/main/java/com/cloud/agent/api/api/to/DatadiskTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/DatadiskTO.java rename to api/src/main/java/com/cloud/agent/api/api/to/DatadiskTO.java diff --git a/api/src/com/cloud/agent/api/storage/CopyTemplateToPrimaryStorageAnswer.java b/api/src/main/java/com/cloud/agent/api/storage/CopyTemplateToPrimaryStorageAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/CopyTemplateToPrimaryStorageAnswer.java rename to api/src/main/java/com/cloud/agent/api/storage/CopyTemplateToPrimaryStorageAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/CreateVolumeOVACommand.java b/api/src/main/java/com/cloud/agent/api/storage/CreateVolumeOVACommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/CreateVolumeOVACommand.java rename to api/src/main/java/com/cloud/agent/api/storage/CreateVolumeOVACommand.java diff --git a/api/src/com/cloud/agent/api/storage/PasswordAuth.java b/api/src/main/java/com/cloud/agent/api/storage/PasswordAuth.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/PasswordAuth.java rename to api/src/main/java/com/cloud/agent/api/storage/PasswordAuth.java diff --git a/api/src/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java b/api/src/main/java/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java rename to api/src/main/java/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java diff --git a/api/src/com/cloud/agent/api/to/DataObjectType.java b/api/src/main/java/com/cloud/agent/api/to/DataObjectType.java similarity index 100% rename from api/src/com/cloud/agent/api/to/DataObjectType.java rename to api/src/main/java/com/cloud/agent/api/to/DataObjectType.java diff --git a/api/src/com/cloud/agent/api/to/DataStoreTO.java b/api/src/main/java/com/cloud/agent/api/to/DataStoreTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/DataStoreTO.java rename to api/src/main/java/com/cloud/agent/api/to/DataStoreTO.java diff --git a/api/src/com/cloud/agent/api/to/DataTO.java b/api/src/main/java/com/cloud/agent/api/to/DataTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/DataTO.java rename to api/src/main/java/com/cloud/agent/api/to/DataTO.java diff --git a/api/src/com/cloud/agent/api/to/DhcpTO.java b/api/src/main/java/com/cloud/agent/api/to/DhcpTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/DhcpTO.java rename to api/src/main/java/com/cloud/agent/api/to/DhcpTO.java diff --git a/api/src/com/cloud/agent/api/to/DiskTO.java b/api/src/main/java/com/cloud/agent/api/to/DiskTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/DiskTO.java rename to api/src/main/java/com/cloud/agent/api/to/DiskTO.java diff --git a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java b/api/src/main/java/com/cloud/agent/api/to/FirewallRuleTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/FirewallRuleTO.java rename to api/src/main/java/com/cloud/agent/api/to/FirewallRuleTO.java diff --git a/api/src/com/cloud/agent/api/to/GPUDeviceTO.java b/api/src/main/java/com/cloud/agent/api/to/GPUDeviceTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/GPUDeviceTO.java rename to api/src/main/java/com/cloud/agent/api/to/GPUDeviceTO.java diff --git a/api/src/com/cloud/agent/api/to/HostTO.java b/api/src/main/java/com/cloud/agent/api/to/HostTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/HostTO.java rename to api/src/main/java/com/cloud/agent/api/to/HostTO.java diff --git a/api/src/com/cloud/agent/api/to/IpAddressTO.java b/api/src/main/java/com/cloud/agent/api/to/IpAddressTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/IpAddressTO.java rename to api/src/main/java/com/cloud/agent/api/to/IpAddressTO.java diff --git a/api/src/com/cloud/agent/api/to/LoadBalancerTO.java b/api/src/main/java/com/cloud/agent/api/to/LoadBalancerTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/LoadBalancerTO.java rename to api/src/main/java/com/cloud/agent/api/to/LoadBalancerTO.java diff --git a/api/src/com/cloud/agent/api/to/MonitorServiceTO.java b/api/src/main/java/com/cloud/agent/api/to/MonitorServiceTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/MonitorServiceTO.java rename to api/src/main/java/com/cloud/agent/api/to/MonitorServiceTO.java diff --git a/api/src/com/cloud/agent/api/to/NetworkACLTO.java b/api/src/main/java/com/cloud/agent/api/to/NetworkACLTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/NetworkACLTO.java rename to api/src/main/java/com/cloud/agent/api/to/NetworkACLTO.java diff --git a/api/src/com/cloud/agent/api/to/NetworkTO.java b/api/src/main/java/com/cloud/agent/api/to/NetworkTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/NetworkTO.java rename to api/src/main/java/com/cloud/agent/api/to/NetworkTO.java diff --git a/api/src/com/cloud/agent/api/to/NfsTO.java b/api/src/main/java/com/cloud/agent/api/to/NfsTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/NfsTO.java rename to api/src/main/java/com/cloud/agent/api/to/NfsTO.java diff --git a/api/src/com/cloud/agent/api/to/NicTO.java b/api/src/main/java/com/cloud/agent/api/to/NicTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/NicTO.java rename to api/src/main/java/com/cloud/agent/api/to/NicTO.java diff --git a/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java b/api/src/main/java/com/cloud/agent/api/to/PortForwardingRuleTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java rename to api/src/main/java/com/cloud/agent/api/to/PortForwardingRuleTO.java diff --git a/api/src/com/cloud/agent/api/to/S3TO.java b/api/src/main/java/com/cloud/agent/api/to/S3TO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/S3TO.java rename to api/src/main/java/com/cloud/agent/api/to/S3TO.java diff --git a/api/src/com/cloud/agent/api/to/StaticNatRuleTO.java b/api/src/main/java/com/cloud/agent/api/to/StaticNatRuleTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/StaticNatRuleTO.java rename to api/src/main/java/com/cloud/agent/api/to/StaticNatRuleTO.java diff --git a/api/src/com/cloud/agent/api/to/StorageFilerTO.java b/api/src/main/java/com/cloud/agent/api/to/StorageFilerTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/StorageFilerTO.java rename to api/src/main/java/com/cloud/agent/api/to/StorageFilerTO.java diff --git a/api/src/com/cloud/agent/api/to/SwiftTO.java b/api/src/main/java/com/cloud/agent/api/to/SwiftTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/SwiftTO.java rename to api/src/main/java/com/cloud/agent/api/to/SwiftTO.java diff --git a/api/src/com/cloud/agent/api/to/TemplateTO.java b/api/src/main/java/com/cloud/agent/api/to/TemplateTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/TemplateTO.java rename to api/src/main/java/com/cloud/agent/api/to/TemplateTO.java diff --git a/api/src/com/cloud/agent/api/to/VirtualMachineTO.java b/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/VirtualMachineTO.java rename to api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java diff --git a/api/src/com/cloud/agent/api/to/VolumeTO.java b/api/src/main/java/com/cloud/agent/api/to/VolumeTO.java similarity index 100% rename from api/src/com/cloud/agent/api/to/VolumeTO.java rename to api/src/main/java/com/cloud/agent/api/to/VolumeTO.java diff --git a/api/src/com/cloud/agent/manager/allocator/HostAllocator.java b/api/src/main/java/com/cloud/agent/manager/allocator/HostAllocator.java similarity index 100% rename from api/src/com/cloud/agent/manager/allocator/HostAllocator.java rename to api/src/main/java/com/cloud/agent/manager/allocator/HostAllocator.java diff --git a/api/src/com/cloud/agent/manager/allocator/PodAllocator.java b/api/src/main/java/com/cloud/agent/manager/allocator/PodAllocator.java similarity index 100% rename from api/src/com/cloud/agent/manager/allocator/PodAllocator.java rename to api/src/main/java/com/cloud/agent/manager/allocator/PodAllocator.java diff --git a/api/src/com/cloud/alert/Alert.java b/api/src/main/java/com/cloud/alert/Alert.java similarity index 100% rename from api/src/com/cloud/alert/Alert.java rename to api/src/main/java/com/cloud/alert/Alert.java diff --git a/api/src/com/cloud/alert/AlertAdapter.java b/api/src/main/java/com/cloud/alert/AlertAdapter.java similarity index 100% rename from api/src/com/cloud/alert/AlertAdapter.java rename to api/src/main/java/com/cloud/alert/AlertAdapter.java diff --git a/api/src/com/cloud/api/commands/.gitignore b/api/src/main/java/com/cloud/api/commands/.gitignore similarity index 100% rename from api/src/com/cloud/api/commands/.gitignore rename to api/src/main/java/com/cloud/api/commands/.gitignore diff --git a/api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java b/api/src/main/java/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java similarity index 100% rename from api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java rename to api/src/main/java/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java diff --git a/api/src/com/cloud/capacity/Capacity.java b/api/src/main/java/com/cloud/capacity/Capacity.java similarity index 100% rename from api/src/com/cloud/capacity/Capacity.java rename to api/src/main/java/com/cloud/capacity/Capacity.java diff --git a/api/src/com/cloud/capacity/CapacityState.java b/api/src/main/java/com/cloud/capacity/CapacityState.java similarity index 100% rename from api/src/com/cloud/capacity/CapacityState.java rename to api/src/main/java/com/cloud/capacity/CapacityState.java diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/main/java/com/cloud/configuration/ConfigurationService.java similarity index 100% rename from api/src/com/cloud/configuration/ConfigurationService.java rename to api/src/main/java/com/cloud/configuration/ConfigurationService.java diff --git a/api/src/com/cloud/configuration/Resource.java b/api/src/main/java/com/cloud/configuration/Resource.java similarity index 100% rename from api/src/com/cloud/configuration/Resource.java rename to api/src/main/java/com/cloud/configuration/Resource.java diff --git a/api/src/com/cloud/configuration/ResourceCount.java b/api/src/main/java/com/cloud/configuration/ResourceCount.java similarity index 100% rename from api/src/com/cloud/configuration/ResourceCount.java rename to api/src/main/java/com/cloud/configuration/ResourceCount.java diff --git a/api/src/com/cloud/configuration/ResourceLimit.java b/api/src/main/java/com/cloud/configuration/ResourceLimit.java similarity index 100% rename from api/src/com/cloud/configuration/ResourceLimit.java rename to api/src/main/java/com/cloud/configuration/ResourceLimit.java diff --git a/api/src/com/cloud/consoleproxy/ConsoleProxyAllocator.java b/api/src/main/java/com/cloud/consoleproxy/ConsoleProxyAllocator.java similarity index 100% rename from api/src/com/cloud/consoleproxy/ConsoleProxyAllocator.java rename to api/src/main/java/com/cloud/consoleproxy/ConsoleProxyAllocator.java diff --git a/api/src/com/cloud/dc/DataCenter.java b/api/src/main/java/com/cloud/dc/DataCenter.java similarity index 100% rename from api/src/com/cloud/dc/DataCenter.java rename to api/src/main/java/com/cloud/dc/DataCenter.java diff --git a/api/src/com/cloud/dc/DedicatedResources.java b/api/src/main/java/com/cloud/dc/DedicatedResources.java similarity index 100% rename from api/src/com/cloud/dc/DedicatedResources.java rename to api/src/main/java/com/cloud/dc/DedicatedResources.java diff --git a/api/src/com/cloud/dc/Pod.java b/api/src/main/java/com/cloud/dc/Pod.java similarity index 100% rename from api/src/com/cloud/dc/Pod.java rename to api/src/main/java/com/cloud/dc/Pod.java diff --git a/api/src/com/cloud/dc/StorageNetworkIpRange.java b/api/src/main/java/com/cloud/dc/StorageNetworkIpRange.java similarity index 100% rename from api/src/com/cloud/dc/StorageNetworkIpRange.java rename to api/src/main/java/com/cloud/dc/StorageNetworkIpRange.java diff --git a/api/src/com/cloud/dc/Vlan.java b/api/src/main/java/com/cloud/dc/Vlan.java similarity index 100% rename from api/src/com/cloud/dc/Vlan.java rename to api/src/main/java/com/cloud/dc/Vlan.java diff --git a/api/src/com/cloud/deploy/DataCenterDeployment.java b/api/src/main/java/com/cloud/deploy/DataCenterDeployment.java similarity index 100% rename from api/src/com/cloud/deploy/DataCenterDeployment.java rename to api/src/main/java/com/cloud/deploy/DataCenterDeployment.java diff --git a/api/src/com/cloud/deploy/DeployDestination.java b/api/src/main/java/com/cloud/deploy/DeployDestination.java similarity index 100% rename from api/src/com/cloud/deploy/DeployDestination.java rename to api/src/main/java/com/cloud/deploy/DeployDestination.java diff --git a/api/src/com/cloud/deploy/DeploymentClusterPlanner.java b/api/src/main/java/com/cloud/deploy/DeploymentClusterPlanner.java similarity index 100% rename from api/src/com/cloud/deploy/DeploymentClusterPlanner.java rename to api/src/main/java/com/cloud/deploy/DeploymentClusterPlanner.java diff --git a/api/src/com/cloud/deploy/DeploymentPlan.java b/api/src/main/java/com/cloud/deploy/DeploymentPlan.java similarity index 100% rename from api/src/com/cloud/deploy/DeploymentPlan.java rename to api/src/main/java/com/cloud/deploy/DeploymentPlan.java diff --git a/api/src/com/cloud/deploy/DeploymentPlanner.java b/api/src/main/java/com/cloud/deploy/DeploymentPlanner.java similarity index 100% rename from api/src/com/cloud/deploy/DeploymentPlanner.java rename to api/src/main/java/com/cloud/deploy/DeploymentPlanner.java diff --git a/api/src/com/cloud/deploy/HAPlanner.java b/api/src/main/java/com/cloud/deploy/HAPlanner.java similarity index 100% rename from api/src/com/cloud/deploy/HAPlanner.java rename to api/src/main/java/com/cloud/deploy/HAPlanner.java diff --git a/api/src/com/cloud/domain/Domain.java b/api/src/main/java/com/cloud/domain/Domain.java similarity index 100% rename from api/src/com/cloud/domain/Domain.java rename to api/src/main/java/com/cloud/domain/Domain.java diff --git a/api/src/com/cloud/domain/PartOf.java b/api/src/main/java/com/cloud/domain/PartOf.java similarity index 100% rename from api/src/com/cloud/domain/PartOf.java rename to api/src/main/java/com/cloud/domain/PartOf.java diff --git a/api/src/com/cloud/event/ActionEvent.java b/api/src/main/java/com/cloud/event/ActionEvent.java similarity index 100% rename from api/src/com/cloud/event/ActionEvent.java rename to api/src/main/java/com/cloud/event/ActionEvent.java diff --git a/api/src/com/cloud/event/ActionEvents.java b/api/src/main/java/com/cloud/event/ActionEvents.java similarity index 100% rename from api/src/com/cloud/event/ActionEvents.java rename to api/src/main/java/com/cloud/event/ActionEvents.java diff --git a/api/src/com/cloud/event/Event.java b/api/src/main/java/com/cloud/event/Event.java similarity index 100% rename from api/src/com/cloud/event/Event.java rename to api/src/main/java/com/cloud/event/Event.java diff --git a/api/src/com/cloud/event/EventCategory.java b/api/src/main/java/com/cloud/event/EventCategory.java similarity index 100% rename from api/src/com/cloud/event/EventCategory.java rename to api/src/main/java/com/cloud/event/EventCategory.java diff --git a/api/src/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java similarity index 100% rename from api/src/com/cloud/event/EventTypes.java rename to api/src/main/java/com/cloud/event/EventTypes.java diff --git a/api/src/com/cloud/event/UsageEvent.java b/api/src/main/java/com/cloud/event/UsageEvent.java similarity index 100% rename from api/src/com/cloud/event/UsageEvent.java rename to api/src/main/java/com/cloud/event/UsageEvent.java diff --git a/api/src/com/cloud/exception/AccountLimitException.java b/api/src/main/java/com/cloud/exception/AccountLimitException.java similarity index 100% rename from api/src/com/cloud/exception/AccountLimitException.java rename to api/src/main/java/com/cloud/exception/AccountLimitException.java diff --git a/api/src/com/cloud/exception/AffinityConflictException.java b/api/src/main/java/com/cloud/exception/AffinityConflictException.java similarity index 100% rename from api/src/com/cloud/exception/AffinityConflictException.java rename to api/src/main/java/com/cloud/exception/AffinityConflictException.java diff --git a/api/src/com/cloud/exception/AgentControlChannelException.java b/api/src/main/java/com/cloud/exception/AgentControlChannelException.java similarity index 100% rename from api/src/com/cloud/exception/AgentControlChannelException.java rename to api/src/main/java/com/cloud/exception/AgentControlChannelException.java diff --git a/api/src/com/cloud/exception/AgentUnavailableException.java b/api/src/main/java/com/cloud/exception/AgentUnavailableException.java similarity index 100% rename from api/src/com/cloud/exception/AgentUnavailableException.java rename to api/src/main/java/com/cloud/exception/AgentUnavailableException.java diff --git a/api/src/com/cloud/exception/CloudAuthenticationException.java b/api/src/main/java/com/cloud/exception/CloudAuthenticationException.java similarity index 100% rename from api/src/com/cloud/exception/CloudAuthenticationException.java rename to api/src/main/java/com/cloud/exception/CloudAuthenticationException.java diff --git a/api/src/com/cloud/exception/CloudException.java b/api/src/main/java/com/cloud/exception/CloudException.java similarity index 100% rename from api/src/com/cloud/exception/CloudException.java rename to api/src/main/java/com/cloud/exception/CloudException.java diff --git a/api/src/com/cloud/exception/ConcurrentOperationException.java b/api/src/main/java/com/cloud/exception/ConcurrentOperationException.java similarity index 100% rename from api/src/com/cloud/exception/ConcurrentOperationException.java rename to api/src/main/java/com/cloud/exception/ConcurrentOperationException.java diff --git a/api/src/com/cloud/exception/ConflictingNetworkSettingsException.java b/api/src/main/java/com/cloud/exception/ConflictingNetworkSettingsException.java similarity index 100% rename from api/src/com/cloud/exception/ConflictingNetworkSettingsException.java rename to api/src/main/java/com/cloud/exception/ConflictingNetworkSettingsException.java diff --git a/api/src/com/cloud/exception/ConnectionException.java b/api/src/main/java/com/cloud/exception/ConnectionException.java similarity index 100% rename from api/src/com/cloud/exception/ConnectionException.java rename to api/src/main/java/com/cloud/exception/ConnectionException.java diff --git a/api/src/com/cloud/exception/DiscoveredWithErrorException.java b/api/src/main/java/com/cloud/exception/DiscoveredWithErrorException.java similarity index 100% rename from api/src/com/cloud/exception/DiscoveredWithErrorException.java rename to api/src/main/java/com/cloud/exception/DiscoveredWithErrorException.java diff --git a/api/src/com/cloud/exception/DiscoveryException.java b/api/src/main/java/com/cloud/exception/DiscoveryException.java similarity index 100% rename from api/src/com/cloud/exception/DiscoveryException.java rename to api/src/main/java/com/cloud/exception/DiscoveryException.java diff --git a/api/src/com/cloud/exception/HAStateException.java b/api/src/main/java/com/cloud/exception/HAStateException.java similarity index 100% rename from api/src/com/cloud/exception/HAStateException.java rename to api/src/main/java/com/cloud/exception/HAStateException.java diff --git a/api/src/com/cloud/exception/InsufficientAddressCapacityException.java b/api/src/main/java/com/cloud/exception/InsufficientAddressCapacityException.java similarity index 100% rename from api/src/com/cloud/exception/InsufficientAddressCapacityException.java rename to api/src/main/java/com/cloud/exception/InsufficientAddressCapacityException.java diff --git a/api/src/com/cloud/exception/InsufficientCapacityException.java b/api/src/main/java/com/cloud/exception/InsufficientCapacityException.java similarity index 100% rename from api/src/com/cloud/exception/InsufficientCapacityException.java rename to api/src/main/java/com/cloud/exception/InsufficientCapacityException.java diff --git a/api/src/com/cloud/exception/InsufficientNetworkCapacityException.java b/api/src/main/java/com/cloud/exception/InsufficientNetworkCapacityException.java similarity index 100% rename from api/src/com/cloud/exception/InsufficientNetworkCapacityException.java rename to api/src/main/java/com/cloud/exception/InsufficientNetworkCapacityException.java diff --git a/api/src/com/cloud/exception/InsufficientServerCapacityException.java b/api/src/main/java/com/cloud/exception/InsufficientServerCapacityException.java similarity index 100% rename from api/src/com/cloud/exception/InsufficientServerCapacityException.java rename to api/src/main/java/com/cloud/exception/InsufficientServerCapacityException.java diff --git a/api/src/com/cloud/exception/InsufficientStorageCapacityException.java b/api/src/main/java/com/cloud/exception/InsufficientStorageCapacityException.java similarity index 100% rename from api/src/com/cloud/exception/InsufficientStorageCapacityException.java rename to api/src/main/java/com/cloud/exception/InsufficientStorageCapacityException.java diff --git a/api/src/com/cloud/exception/InsufficientVirtualNetworkCapacityException.java b/api/src/main/java/com/cloud/exception/InsufficientVirtualNetworkCapacityException.java similarity index 100% rename from api/src/com/cloud/exception/InsufficientVirtualNetworkCapacityException.java rename to api/src/main/java/com/cloud/exception/InsufficientVirtualNetworkCapacityException.java diff --git a/api/src/com/cloud/exception/InternalErrorException.java b/api/src/main/java/com/cloud/exception/InternalErrorException.java similarity index 100% rename from api/src/com/cloud/exception/InternalErrorException.java rename to api/src/main/java/com/cloud/exception/InternalErrorException.java diff --git a/api/src/com/cloud/exception/InvalidParameterValueException.java b/api/src/main/java/com/cloud/exception/InvalidParameterValueException.java similarity index 100% rename from api/src/com/cloud/exception/InvalidParameterValueException.java rename to api/src/main/java/com/cloud/exception/InvalidParameterValueException.java diff --git a/api/src/com/cloud/exception/ManagementServerException.java b/api/src/main/java/com/cloud/exception/ManagementServerException.java similarity index 100% rename from api/src/com/cloud/exception/ManagementServerException.java rename to api/src/main/java/com/cloud/exception/ManagementServerException.java diff --git a/api/src/com/cloud/exception/NetworkRuleConflictException.java b/api/src/main/java/com/cloud/exception/NetworkRuleConflictException.java similarity index 100% rename from api/src/com/cloud/exception/NetworkRuleConflictException.java rename to api/src/main/java/com/cloud/exception/NetworkRuleConflictException.java diff --git a/api/src/com/cloud/exception/OperationTimedoutException.java b/api/src/main/java/com/cloud/exception/OperationTimedoutException.java similarity index 100% rename from api/src/com/cloud/exception/OperationTimedoutException.java rename to api/src/main/java/com/cloud/exception/OperationTimedoutException.java diff --git a/api/src/com/cloud/exception/PermissionDeniedException.java b/api/src/main/java/com/cloud/exception/PermissionDeniedException.java similarity index 100% rename from api/src/com/cloud/exception/PermissionDeniedException.java rename to api/src/main/java/com/cloud/exception/PermissionDeniedException.java diff --git a/api/src/com/cloud/exception/RequestLimitException.java b/api/src/main/java/com/cloud/exception/RequestLimitException.java similarity index 100% rename from api/src/com/cloud/exception/RequestLimitException.java rename to api/src/main/java/com/cloud/exception/RequestLimitException.java diff --git a/api/src/com/cloud/exception/ResourceAllocationException.java b/api/src/main/java/com/cloud/exception/ResourceAllocationException.java similarity index 100% rename from api/src/com/cloud/exception/ResourceAllocationException.java rename to api/src/main/java/com/cloud/exception/ResourceAllocationException.java diff --git a/api/src/com/cloud/exception/ResourceInUseException.java b/api/src/main/java/com/cloud/exception/ResourceInUseException.java similarity index 100% rename from api/src/com/cloud/exception/ResourceInUseException.java rename to api/src/main/java/com/cloud/exception/ResourceInUseException.java diff --git a/api/src/com/cloud/exception/ResourceUnavailableException.java b/api/src/main/java/com/cloud/exception/ResourceUnavailableException.java similarity index 100% rename from api/src/com/cloud/exception/ResourceUnavailableException.java rename to api/src/main/java/com/cloud/exception/ResourceUnavailableException.java diff --git a/api/src/com/cloud/exception/StorageConflictException.java b/api/src/main/java/com/cloud/exception/StorageConflictException.java similarity index 100% rename from api/src/com/cloud/exception/StorageConflictException.java rename to api/src/main/java/com/cloud/exception/StorageConflictException.java diff --git a/api/src/com/cloud/exception/StorageUnavailableException.java b/api/src/main/java/com/cloud/exception/StorageUnavailableException.java similarity index 100% rename from api/src/com/cloud/exception/StorageUnavailableException.java rename to api/src/main/java/com/cloud/exception/StorageUnavailableException.java diff --git a/api/src/com/cloud/exception/UnsupportedServiceException.java b/api/src/main/java/com/cloud/exception/UnsupportedServiceException.java similarity index 100% rename from api/src/com/cloud/exception/UnsupportedServiceException.java rename to api/src/main/java/com/cloud/exception/UnsupportedServiceException.java diff --git a/api/src/com/cloud/exception/VirtualMachineMigrationException.java b/api/src/main/java/com/cloud/exception/VirtualMachineMigrationException.java similarity index 100% rename from api/src/com/cloud/exception/VirtualMachineMigrationException.java rename to api/src/main/java/com/cloud/exception/VirtualMachineMigrationException.java diff --git a/api/src/com/cloud/gpu/GPU.java b/api/src/main/java/com/cloud/gpu/GPU.java similarity index 100% rename from api/src/com/cloud/gpu/GPU.java rename to api/src/main/java/com/cloud/gpu/GPU.java diff --git a/api/src/com/cloud/ha/FenceBuilder.java b/api/src/main/java/com/cloud/ha/FenceBuilder.java similarity index 100% rename from api/src/com/cloud/ha/FenceBuilder.java rename to api/src/main/java/com/cloud/ha/FenceBuilder.java diff --git a/api/src/com/cloud/ha/Investigator.java b/api/src/main/java/com/cloud/ha/Investigator.java similarity index 100% rename from api/src/com/cloud/ha/Investigator.java rename to api/src/main/java/com/cloud/ha/Investigator.java diff --git a/api/src/com/cloud/host/Host.java b/api/src/main/java/com/cloud/host/Host.java similarity index 100% rename from api/src/com/cloud/host/Host.java rename to api/src/main/java/com/cloud/host/Host.java diff --git a/api/src/com/cloud/host/HostEnvironment.java b/api/src/main/java/com/cloud/host/HostEnvironment.java similarity index 100% rename from api/src/com/cloud/host/HostEnvironment.java rename to api/src/main/java/com/cloud/host/HostEnvironment.java diff --git a/api/src/com/cloud/host/HostStats.java b/api/src/main/java/com/cloud/host/HostStats.java similarity index 100% rename from api/src/com/cloud/host/HostStats.java rename to api/src/main/java/com/cloud/host/HostStats.java diff --git a/api/src/com/cloud/host/Status.java b/api/src/main/java/com/cloud/host/Status.java similarity index 100% rename from api/src/com/cloud/host/Status.java rename to api/src/main/java/com/cloud/host/Status.java diff --git a/api/src/com/cloud/hypervisor/Hypervisor.java b/api/src/main/java/com/cloud/hypervisor/Hypervisor.java similarity index 100% rename from api/src/com/cloud/hypervisor/Hypervisor.java rename to api/src/main/java/com/cloud/hypervisor/Hypervisor.java diff --git a/api/src/com/cloud/hypervisor/HypervisorCapabilities.java b/api/src/main/java/com/cloud/hypervisor/HypervisorCapabilities.java similarity index 100% rename from api/src/com/cloud/hypervisor/HypervisorCapabilities.java rename to api/src/main/java/com/cloud/hypervisor/HypervisorCapabilities.java diff --git a/api/src/com/cloud/hypervisor/HypervisorGuru.java b/api/src/main/java/com/cloud/hypervisor/HypervisorGuru.java similarity index 100% rename from api/src/com/cloud/hypervisor/HypervisorGuru.java rename to api/src/main/java/com/cloud/hypervisor/HypervisorGuru.java diff --git a/api/src/com/cloud/info/ConsoleProxyLoadInfo.java b/api/src/main/java/com/cloud/info/ConsoleProxyLoadInfo.java similarity index 100% rename from api/src/com/cloud/info/ConsoleProxyLoadInfo.java rename to api/src/main/java/com/cloud/info/ConsoleProxyLoadInfo.java diff --git a/api/src/com/cloud/info/RunningHostCountInfo.java b/api/src/main/java/com/cloud/info/RunningHostCountInfo.java similarity index 100% rename from api/src/com/cloud/info/RunningHostCountInfo.java rename to api/src/main/java/com/cloud/info/RunningHostCountInfo.java diff --git a/api/src/com/cloud/network/GuestVlan.java b/api/src/main/java/com/cloud/network/GuestVlan.java similarity index 100% rename from api/src/com/cloud/network/GuestVlan.java rename to api/src/main/java/com/cloud/network/GuestVlan.java diff --git a/api/src/com/cloud/network/IpAddress.java b/api/src/main/java/com/cloud/network/IpAddress.java similarity index 100% rename from api/src/com/cloud/network/IpAddress.java rename to api/src/main/java/com/cloud/network/IpAddress.java diff --git a/api/src/com/cloud/network/MonitoringService.java b/api/src/main/java/com/cloud/network/MonitoringService.java similarity index 100% rename from api/src/com/cloud/network/MonitoringService.java rename to api/src/main/java/com/cloud/network/MonitoringService.java diff --git a/api/src/com/cloud/network/Network.java b/api/src/main/java/com/cloud/network/Network.java similarity index 100% rename from api/src/com/cloud/network/Network.java rename to api/src/main/java/com/cloud/network/Network.java diff --git a/api/src/com/cloud/network/NetworkMigrationResponder.java b/api/src/main/java/com/cloud/network/NetworkMigrationResponder.java similarity index 100% rename from api/src/com/cloud/network/NetworkMigrationResponder.java rename to api/src/main/java/com/cloud/network/NetworkMigrationResponder.java diff --git a/api/src/com/cloud/network/NetworkModel.java b/api/src/main/java/com/cloud/network/NetworkModel.java similarity index 100% rename from api/src/com/cloud/network/NetworkModel.java rename to api/src/main/java/com/cloud/network/NetworkModel.java diff --git a/api/src/com/cloud/network/NetworkProfile.java b/api/src/main/java/com/cloud/network/NetworkProfile.java similarity index 100% rename from api/src/com/cloud/network/NetworkProfile.java rename to api/src/main/java/com/cloud/network/NetworkProfile.java diff --git a/api/src/com/cloud/network/NetworkRuleApplier.java b/api/src/main/java/com/cloud/network/NetworkRuleApplier.java similarity index 100% rename from api/src/com/cloud/network/NetworkRuleApplier.java rename to api/src/main/java/com/cloud/network/NetworkRuleApplier.java diff --git a/api/src/com/cloud/network/NetworkService.java b/api/src/main/java/com/cloud/network/NetworkService.java similarity index 100% rename from api/src/com/cloud/network/NetworkService.java rename to api/src/main/java/com/cloud/network/NetworkService.java diff --git a/api/src/com/cloud/network/NetworkUsageService.java b/api/src/main/java/com/cloud/network/NetworkUsageService.java similarity index 100% rename from api/src/com/cloud/network/NetworkUsageService.java rename to api/src/main/java/com/cloud/network/NetworkUsageService.java diff --git a/api/src/com/cloud/network/Networks.java b/api/src/main/java/com/cloud/network/Networks.java similarity index 100% rename from api/src/com/cloud/network/Networks.java rename to api/src/main/java/com/cloud/network/Networks.java diff --git a/api/src/com/cloud/network/OvsProvider.java b/api/src/main/java/com/cloud/network/OvsProvider.java similarity index 100% rename from api/src/com/cloud/network/OvsProvider.java rename to api/src/main/java/com/cloud/network/OvsProvider.java diff --git a/api/src/com/cloud/network/PhysicalNetwork.java b/api/src/main/java/com/cloud/network/PhysicalNetwork.java similarity index 100% rename from api/src/com/cloud/network/PhysicalNetwork.java rename to api/src/main/java/com/cloud/network/PhysicalNetwork.java diff --git a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java b/api/src/main/java/com/cloud/network/PhysicalNetworkServiceProvider.java similarity index 100% rename from api/src/com/cloud/network/PhysicalNetworkServiceProvider.java rename to api/src/main/java/com/cloud/network/PhysicalNetworkServiceProvider.java diff --git a/api/src/com/cloud/network/PhysicalNetworkSetupInfo.java b/api/src/main/java/com/cloud/network/PhysicalNetworkSetupInfo.java similarity index 100% rename from api/src/com/cloud/network/PhysicalNetworkSetupInfo.java rename to api/src/main/java/com/cloud/network/PhysicalNetworkSetupInfo.java diff --git a/api/src/com/cloud/network/PhysicalNetworkTrafficType.java b/api/src/main/java/com/cloud/network/PhysicalNetworkTrafficType.java similarity index 100% rename from api/src/com/cloud/network/PhysicalNetworkTrafficType.java rename to api/src/main/java/com/cloud/network/PhysicalNetworkTrafficType.java diff --git a/api/src/com/cloud/network/PublicIpAddress.java b/api/src/main/java/com/cloud/network/PublicIpAddress.java similarity index 100% rename from api/src/com/cloud/network/PublicIpAddress.java rename to api/src/main/java/com/cloud/network/PublicIpAddress.java diff --git a/api/src/com/cloud/network/RemoteAccessVpn.java b/api/src/main/java/com/cloud/network/RemoteAccessVpn.java similarity index 100% rename from api/src/com/cloud/network/RemoteAccessVpn.java rename to api/src/main/java/com/cloud/network/RemoteAccessVpn.java diff --git a/api/src/com/cloud/network/Site2SiteCustomerGateway.java b/api/src/main/java/com/cloud/network/Site2SiteCustomerGateway.java similarity index 100% rename from api/src/com/cloud/network/Site2SiteCustomerGateway.java rename to api/src/main/java/com/cloud/network/Site2SiteCustomerGateway.java diff --git a/api/src/com/cloud/network/Site2SiteVpnConnection.java b/api/src/main/java/com/cloud/network/Site2SiteVpnConnection.java similarity index 100% rename from api/src/com/cloud/network/Site2SiteVpnConnection.java rename to api/src/main/java/com/cloud/network/Site2SiteVpnConnection.java diff --git a/api/src/com/cloud/network/Site2SiteVpnGateway.java b/api/src/main/java/com/cloud/network/Site2SiteVpnGateway.java similarity index 100% rename from api/src/com/cloud/network/Site2SiteVpnGateway.java rename to api/src/main/java/com/cloud/network/Site2SiteVpnGateway.java diff --git a/api/src/com/cloud/network/StorageNetworkService.java b/api/src/main/java/com/cloud/network/StorageNetworkService.java similarity index 100% rename from api/src/com/cloud/network/StorageNetworkService.java rename to api/src/main/java/com/cloud/network/StorageNetworkService.java diff --git a/api/src/com/cloud/network/TrafficLabel.java b/api/src/main/java/com/cloud/network/TrafficLabel.java similarity index 100% rename from api/src/com/cloud/network/TrafficLabel.java rename to api/src/main/java/com/cloud/network/TrafficLabel.java diff --git a/api/src/com/cloud/network/UserIpv6Address.java b/api/src/main/java/com/cloud/network/UserIpv6Address.java similarity index 100% rename from api/src/com/cloud/network/UserIpv6Address.java rename to api/src/main/java/com/cloud/network/UserIpv6Address.java diff --git a/api/src/com/cloud/network/VirtualNetworkApplianceService.java b/api/src/main/java/com/cloud/network/VirtualNetworkApplianceService.java similarity index 100% rename from api/src/com/cloud/network/VirtualNetworkApplianceService.java rename to api/src/main/java/com/cloud/network/VirtualNetworkApplianceService.java diff --git a/api/src/com/cloud/network/VirtualRouterProvider.java b/api/src/main/java/com/cloud/network/VirtualRouterProvider.java similarity index 100% rename from api/src/com/cloud/network/VirtualRouterProvider.java rename to api/src/main/java/com/cloud/network/VirtualRouterProvider.java diff --git a/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java b/api/src/main/java/com/cloud/network/VpcVirtualNetworkApplianceService.java similarity index 100% rename from api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java rename to api/src/main/java/com/cloud/network/VpcVirtualNetworkApplianceService.java diff --git a/api/src/com/cloud/network/VpnUser.java b/api/src/main/java/com/cloud/network/VpnUser.java similarity index 100% rename from api/src/com/cloud/network/VpnUser.java rename to api/src/main/java/com/cloud/network/VpnUser.java diff --git a/api/src/com/cloud/network/as/AutoScaleCounter.java b/api/src/main/java/com/cloud/network/as/AutoScaleCounter.java similarity index 100% rename from api/src/com/cloud/network/as/AutoScaleCounter.java rename to api/src/main/java/com/cloud/network/as/AutoScaleCounter.java diff --git a/api/src/com/cloud/network/as/AutoScalePolicy.java b/api/src/main/java/com/cloud/network/as/AutoScalePolicy.java similarity index 100% rename from api/src/com/cloud/network/as/AutoScalePolicy.java rename to api/src/main/java/com/cloud/network/as/AutoScalePolicy.java diff --git a/api/src/com/cloud/network/as/AutoScaleService.java b/api/src/main/java/com/cloud/network/as/AutoScaleService.java similarity index 100% rename from api/src/com/cloud/network/as/AutoScaleService.java rename to api/src/main/java/com/cloud/network/as/AutoScaleService.java diff --git a/api/src/com/cloud/network/as/AutoScaleVmGroup.java b/api/src/main/java/com/cloud/network/as/AutoScaleVmGroup.java similarity index 100% rename from api/src/com/cloud/network/as/AutoScaleVmGroup.java rename to api/src/main/java/com/cloud/network/as/AutoScaleVmGroup.java diff --git a/api/src/com/cloud/network/as/AutoScaleVmProfile.java b/api/src/main/java/com/cloud/network/as/AutoScaleVmProfile.java similarity index 100% rename from api/src/com/cloud/network/as/AutoScaleVmProfile.java rename to api/src/main/java/com/cloud/network/as/AutoScaleVmProfile.java diff --git a/api/src/com/cloud/network/as/Condition.java b/api/src/main/java/com/cloud/network/as/Condition.java similarity index 100% rename from api/src/com/cloud/network/as/Condition.java rename to api/src/main/java/com/cloud/network/as/Condition.java diff --git a/api/src/com/cloud/network/as/Counter.java b/api/src/main/java/com/cloud/network/as/Counter.java similarity index 100% rename from api/src/com/cloud/network/as/Counter.java rename to api/src/main/java/com/cloud/network/as/Counter.java diff --git a/api/src/com/cloud/network/element/AggregatedCommandExecutor.java b/api/src/main/java/com/cloud/network/element/AggregatedCommandExecutor.java similarity index 100% rename from api/src/com/cloud/network/element/AggregatedCommandExecutor.java rename to api/src/main/java/com/cloud/network/element/AggregatedCommandExecutor.java diff --git a/api/src/com/cloud/network/element/ConnectivityProvider.java b/api/src/main/java/com/cloud/network/element/ConnectivityProvider.java similarity index 100% rename from api/src/com/cloud/network/element/ConnectivityProvider.java rename to api/src/main/java/com/cloud/network/element/ConnectivityProvider.java diff --git a/api/src/com/cloud/network/element/DhcpServiceProvider.java b/api/src/main/java/com/cloud/network/element/DhcpServiceProvider.java similarity index 100% rename from api/src/com/cloud/network/element/DhcpServiceProvider.java rename to api/src/main/java/com/cloud/network/element/DhcpServiceProvider.java diff --git a/api/src/com/cloud/network/element/DnsServiceProvider.java b/api/src/main/java/com/cloud/network/element/DnsServiceProvider.java similarity index 100% rename from api/src/com/cloud/network/element/DnsServiceProvider.java rename to api/src/main/java/com/cloud/network/element/DnsServiceProvider.java diff --git a/api/src/com/cloud/network/element/FirewallServiceProvider.java b/api/src/main/java/com/cloud/network/element/FirewallServiceProvider.java similarity index 100% rename from api/src/com/cloud/network/element/FirewallServiceProvider.java rename to api/src/main/java/com/cloud/network/element/FirewallServiceProvider.java diff --git a/api/src/com/cloud/network/element/IpDeployer.java b/api/src/main/java/com/cloud/network/element/IpDeployer.java similarity index 100% rename from api/src/com/cloud/network/element/IpDeployer.java rename to api/src/main/java/com/cloud/network/element/IpDeployer.java diff --git a/api/src/com/cloud/network/element/IpDeployingRequester.java b/api/src/main/java/com/cloud/network/element/IpDeployingRequester.java similarity index 100% rename from api/src/com/cloud/network/element/IpDeployingRequester.java rename to api/src/main/java/com/cloud/network/element/IpDeployingRequester.java diff --git a/api/src/com/cloud/network/element/LoadBalancingServiceProvider.java b/api/src/main/java/com/cloud/network/element/LoadBalancingServiceProvider.java similarity index 100% rename from api/src/com/cloud/network/element/LoadBalancingServiceProvider.java rename to api/src/main/java/com/cloud/network/element/LoadBalancingServiceProvider.java diff --git a/api/src/com/cloud/network/element/NetworkACLServiceProvider.java b/api/src/main/java/com/cloud/network/element/NetworkACLServiceProvider.java similarity index 100% rename from api/src/com/cloud/network/element/NetworkACLServiceProvider.java rename to api/src/main/java/com/cloud/network/element/NetworkACLServiceProvider.java diff --git a/api/src/com/cloud/network/element/NetworkElement.java b/api/src/main/java/com/cloud/network/element/NetworkElement.java similarity index 100% rename from api/src/com/cloud/network/element/NetworkElement.java rename to api/src/main/java/com/cloud/network/element/NetworkElement.java diff --git a/api/src/com/cloud/network/element/PortForwardingServiceProvider.java b/api/src/main/java/com/cloud/network/element/PortForwardingServiceProvider.java similarity index 100% rename from api/src/com/cloud/network/element/PortForwardingServiceProvider.java rename to api/src/main/java/com/cloud/network/element/PortForwardingServiceProvider.java diff --git a/api/src/com/cloud/network/element/RedundantResource.java b/api/src/main/java/com/cloud/network/element/RedundantResource.java similarity index 100% rename from api/src/com/cloud/network/element/RedundantResource.java rename to api/src/main/java/com/cloud/network/element/RedundantResource.java diff --git a/api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java b/api/src/main/java/com/cloud/network/element/RemoteAccessVPNServiceProvider.java similarity index 100% rename from api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java rename to api/src/main/java/com/cloud/network/element/RemoteAccessVPNServiceProvider.java diff --git a/api/src/com/cloud/network/element/Site2SiteVpnServiceProvider.java b/api/src/main/java/com/cloud/network/element/Site2SiteVpnServiceProvider.java similarity index 100% rename from api/src/com/cloud/network/element/Site2SiteVpnServiceProvider.java rename to api/src/main/java/com/cloud/network/element/Site2SiteVpnServiceProvider.java diff --git a/api/src/com/cloud/network/element/SourceNatServiceProvider.java b/api/src/main/java/com/cloud/network/element/SourceNatServiceProvider.java similarity index 100% rename from api/src/com/cloud/network/element/SourceNatServiceProvider.java rename to api/src/main/java/com/cloud/network/element/SourceNatServiceProvider.java diff --git a/api/src/com/cloud/network/element/StaticNatServiceProvider.java b/api/src/main/java/com/cloud/network/element/StaticNatServiceProvider.java similarity index 100% rename from api/src/com/cloud/network/element/StaticNatServiceProvider.java rename to api/src/main/java/com/cloud/network/element/StaticNatServiceProvider.java diff --git a/api/src/com/cloud/network/element/UserDataServiceProvider.java b/api/src/main/java/com/cloud/network/element/UserDataServiceProvider.java similarity index 100% rename from api/src/com/cloud/network/element/UserDataServiceProvider.java rename to api/src/main/java/com/cloud/network/element/UserDataServiceProvider.java diff --git a/api/src/com/cloud/network/element/VirtualRouterElementService.java b/api/src/main/java/com/cloud/network/element/VirtualRouterElementService.java similarity index 100% rename from api/src/com/cloud/network/element/VirtualRouterElementService.java rename to api/src/main/java/com/cloud/network/element/VirtualRouterElementService.java diff --git a/api/src/com/cloud/network/element/VpcProvider.java b/api/src/main/java/com/cloud/network/element/VpcProvider.java similarity index 100% rename from api/src/com/cloud/network/element/VpcProvider.java rename to api/src/main/java/com/cloud/network/element/VpcProvider.java diff --git a/api/src/com/cloud/network/firewall/FirewallService.java b/api/src/main/java/com/cloud/network/firewall/FirewallService.java similarity index 100% rename from api/src/com/cloud/network/firewall/FirewallService.java rename to api/src/main/java/com/cloud/network/firewall/FirewallService.java diff --git a/api/src/com/cloud/network/guru/NetworkGuru.java b/api/src/main/java/com/cloud/network/guru/NetworkGuru.java similarity index 100% rename from api/src/com/cloud/network/guru/NetworkGuru.java rename to api/src/main/java/com/cloud/network/guru/NetworkGuru.java diff --git a/api/src/com/cloud/network/guru/NetworkGuruAdditionalFunctions.java b/api/src/main/java/com/cloud/network/guru/NetworkGuruAdditionalFunctions.java similarity index 100% rename from api/src/com/cloud/network/guru/NetworkGuruAdditionalFunctions.java rename to api/src/main/java/com/cloud/network/guru/NetworkGuruAdditionalFunctions.java diff --git a/api/src/com/cloud/network/lb/LoadBalancingRule.java b/api/src/main/java/com/cloud/network/lb/LoadBalancingRule.java similarity index 100% rename from api/src/com/cloud/network/lb/LoadBalancingRule.java rename to api/src/main/java/com/cloud/network/lb/LoadBalancingRule.java diff --git a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java b/api/src/main/java/com/cloud/network/lb/LoadBalancingRulesService.java similarity index 100% rename from api/src/com/cloud/network/lb/LoadBalancingRulesService.java rename to api/src/main/java/com/cloud/network/lb/LoadBalancingRulesService.java diff --git a/api/src/com/cloud/network/router/VirtualRouter.java b/api/src/main/java/com/cloud/network/router/VirtualRouter.java similarity index 100% rename from api/src/com/cloud/network/router/VirtualRouter.java rename to api/src/main/java/com/cloud/network/router/VirtualRouter.java diff --git a/api/src/com/cloud/network/rules/FirewallRule.java b/api/src/main/java/com/cloud/network/rules/FirewallRule.java similarity index 100% rename from api/src/com/cloud/network/rules/FirewallRule.java rename to api/src/main/java/com/cloud/network/rules/FirewallRule.java diff --git a/api/src/com/cloud/network/rules/HealthCheckPolicy.java b/api/src/main/java/com/cloud/network/rules/HealthCheckPolicy.java similarity index 100% rename from api/src/com/cloud/network/rules/HealthCheckPolicy.java rename to api/src/main/java/com/cloud/network/rules/HealthCheckPolicy.java diff --git a/api/src/com/cloud/network/rules/LbStickinessMethod.java b/api/src/main/java/com/cloud/network/rules/LbStickinessMethod.java similarity index 100% rename from api/src/com/cloud/network/rules/LbStickinessMethod.java rename to api/src/main/java/com/cloud/network/rules/LbStickinessMethod.java diff --git a/api/src/com/cloud/network/rules/LoadBalancer.java b/api/src/main/java/com/cloud/network/rules/LoadBalancer.java similarity index 100% rename from api/src/com/cloud/network/rules/LoadBalancer.java rename to api/src/main/java/com/cloud/network/rules/LoadBalancer.java diff --git a/api/src/com/cloud/network/rules/LoadBalancerContainer.java b/api/src/main/java/com/cloud/network/rules/LoadBalancerContainer.java similarity index 100% rename from api/src/com/cloud/network/rules/LoadBalancerContainer.java rename to api/src/main/java/com/cloud/network/rules/LoadBalancerContainer.java diff --git a/api/src/com/cloud/network/rules/PortForwardingRule.java b/api/src/main/java/com/cloud/network/rules/PortForwardingRule.java similarity index 100% rename from api/src/com/cloud/network/rules/PortForwardingRule.java rename to api/src/main/java/com/cloud/network/rules/PortForwardingRule.java diff --git a/api/src/com/cloud/network/rules/RulesService.java b/api/src/main/java/com/cloud/network/rules/RulesService.java similarity index 100% rename from api/src/com/cloud/network/rules/RulesService.java rename to api/src/main/java/com/cloud/network/rules/RulesService.java diff --git a/api/src/com/cloud/network/rules/StaticNat.java b/api/src/main/java/com/cloud/network/rules/StaticNat.java similarity index 100% rename from api/src/com/cloud/network/rules/StaticNat.java rename to api/src/main/java/com/cloud/network/rules/StaticNat.java diff --git a/api/src/com/cloud/network/rules/StaticNatRule.java b/api/src/main/java/com/cloud/network/rules/StaticNatRule.java similarity index 100% rename from api/src/com/cloud/network/rules/StaticNatRule.java rename to api/src/main/java/com/cloud/network/rules/StaticNatRule.java diff --git a/api/src/com/cloud/network/rules/StickinessPolicy.java b/api/src/main/java/com/cloud/network/rules/StickinessPolicy.java similarity index 100% rename from api/src/com/cloud/network/rules/StickinessPolicy.java rename to api/src/main/java/com/cloud/network/rules/StickinessPolicy.java diff --git a/api/src/com/cloud/network/security/SecurityGroup.java b/api/src/main/java/com/cloud/network/security/SecurityGroup.java similarity index 100% rename from api/src/com/cloud/network/security/SecurityGroup.java rename to api/src/main/java/com/cloud/network/security/SecurityGroup.java diff --git a/api/src/com/cloud/network/security/SecurityGroupRules.java b/api/src/main/java/com/cloud/network/security/SecurityGroupRules.java similarity index 100% rename from api/src/com/cloud/network/security/SecurityGroupRules.java rename to api/src/main/java/com/cloud/network/security/SecurityGroupRules.java diff --git a/api/src/com/cloud/network/security/SecurityGroupService.java b/api/src/main/java/com/cloud/network/security/SecurityGroupService.java similarity index 100% rename from api/src/com/cloud/network/security/SecurityGroupService.java rename to api/src/main/java/com/cloud/network/security/SecurityGroupService.java diff --git a/api/src/com/cloud/network/security/SecurityRule.java b/api/src/main/java/com/cloud/network/security/SecurityRule.java similarity index 100% rename from api/src/com/cloud/network/security/SecurityRule.java rename to api/src/main/java/com/cloud/network/security/SecurityRule.java diff --git a/api/src/com/cloud/network/vpc/NetworkACL.java b/api/src/main/java/com/cloud/network/vpc/NetworkACL.java similarity index 100% rename from api/src/com/cloud/network/vpc/NetworkACL.java rename to api/src/main/java/com/cloud/network/vpc/NetworkACL.java diff --git a/api/src/com/cloud/network/vpc/NetworkACLItem.java b/api/src/main/java/com/cloud/network/vpc/NetworkACLItem.java similarity index 100% rename from api/src/com/cloud/network/vpc/NetworkACLItem.java rename to api/src/main/java/com/cloud/network/vpc/NetworkACLItem.java diff --git a/api/src/com/cloud/network/vpc/NetworkACLService.java b/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java similarity index 100% rename from api/src/com/cloud/network/vpc/NetworkACLService.java rename to api/src/main/java/com/cloud/network/vpc/NetworkACLService.java diff --git a/api/src/com/cloud/network/vpc/PrivateGateway.java b/api/src/main/java/com/cloud/network/vpc/PrivateGateway.java similarity index 100% rename from api/src/com/cloud/network/vpc/PrivateGateway.java rename to api/src/main/java/com/cloud/network/vpc/PrivateGateway.java diff --git a/api/src/com/cloud/network/vpc/PrivateIp.java b/api/src/main/java/com/cloud/network/vpc/PrivateIp.java similarity index 100% rename from api/src/com/cloud/network/vpc/PrivateIp.java rename to api/src/main/java/com/cloud/network/vpc/PrivateIp.java diff --git a/api/src/com/cloud/network/vpc/StaticRoute.java b/api/src/main/java/com/cloud/network/vpc/StaticRoute.java similarity index 100% rename from api/src/com/cloud/network/vpc/StaticRoute.java rename to api/src/main/java/com/cloud/network/vpc/StaticRoute.java diff --git a/api/src/com/cloud/network/vpc/StaticRouteProfile.java b/api/src/main/java/com/cloud/network/vpc/StaticRouteProfile.java similarity index 100% rename from api/src/com/cloud/network/vpc/StaticRouteProfile.java rename to api/src/main/java/com/cloud/network/vpc/StaticRouteProfile.java diff --git a/api/src/com/cloud/network/vpc/Vpc.java b/api/src/main/java/com/cloud/network/vpc/Vpc.java similarity index 100% rename from api/src/com/cloud/network/vpc/Vpc.java rename to api/src/main/java/com/cloud/network/vpc/Vpc.java diff --git a/api/src/com/cloud/network/vpc/VpcGateway.java b/api/src/main/java/com/cloud/network/vpc/VpcGateway.java similarity index 100% rename from api/src/com/cloud/network/vpc/VpcGateway.java rename to api/src/main/java/com/cloud/network/vpc/VpcGateway.java diff --git a/api/src/com/cloud/network/vpc/VpcOffering.java b/api/src/main/java/com/cloud/network/vpc/VpcOffering.java similarity index 100% rename from api/src/com/cloud/network/vpc/VpcOffering.java rename to api/src/main/java/com/cloud/network/vpc/VpcOffering.java diff --git a/api/src/com/cloud/network/vpc/VpcProvisioningService.java b/api/src/main/java/com/cloud/network/vpc/VpcProvisioningService.java similarity index 100% rename from api/src/com/cloud/network/vpc/VpcProvisioningService.java rename to api/src/main/java/com/cloud/network/vpc/VpcProvisioningService.java diff --git a/api/src/com/cloud/network/vpc/VpcService.java b/api/src/main/java/com/cloud/network/vpc/VpcService.java similarity index 100% rename from api/src/com/cloud/network/vpc/VpcService.java rename to api/src/main/java/com/cloud/network/vpc/VpcService.java diff --git a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java b/api/src/main/java/com/cloud/network/vpn/RemoteAccessVpnService.java similarity index 100% rename from api/src/com/cloud/network/vpn/RemoteAccessVpnService.java rename to api/src/main/java/com/cloud/network/vpn/RemoteAccessVpnService.java diff --git a/api/src/com/cloud/network/vpn/Site2SiteVpnService.java b/api/src/main/java/com/cloud/network/vpn/Site2SiteVpnService.java similarity index 100% rename from api/src/com/cloud/network/vpn/Site2SiteVpnService.java rename to api/src/main/java/com/cloud/network/vpn/Site2SiteVpnService.java diff --git a/api/src/com/cloud/offering/DiskOffering.java b/api/src/main/java/com/cloud/offering/DiskOffering.java similarity index 100% rename from api/src/com/cloud/offering/DiskOffering.java rename to api/src/main/java/com/cloud/offering/DiskOffering.java diff --git a/api/src/com/cloud/offering/DiskOfferingInfo.java b/api/src/main/java/com/cloud/offering/DiskOfferingInfo.java similarity index 100% rename from api/src/com/cloud/offering/DiskOfferingInfo.java rename to api/src/main/java/com/cloud/offering/DiskOfferingInfo.java diff --git a/api/src/com/cloud/offering/NetworkOffering.java b/api/src/main/java/com/cloud/offering/NetworkOffering.java similarity index 100% rename from api/src/com/cloud/offering/NetworkOffering.java rename to api/src/main/java/com/cloud/offering/NetworkOffering.java diff --git a/api/src/com/cloud/offering/OfferingManager.java b/api/src/main/java/com/cloud/offering/OfferingManager.java similarity index 100% rename from api/src/com/cloud/offering/OfferingManager.java rename to api/src/main/java/com/cloud/offering/OfferingManager.java diff --git a/api/src/com/cloud/offering/ServiceOffering.java b/api/src/main/java/com/cloud/offering/ServiceOffering.java similarity index 100% rename from api/src/com/cloud/offering/ServiceOffering.java rename to api/src/main/java/com/cloud/offering/ServiceOffering.java diff --git a/api/src/com/cloud/org/Cluster.java b/api/src/main/java/com/cloud/org/Cluster.java similarity index 100% rename from api/src/com/cloud/org/Cluster.java rename to api/src/main/java/com/cloud/org/Cluster.java diff --git a/api/src/com/cloud/org/Grouping.java b/api/src/main/java/com/cloud/org/Grouping.java similarity index 100% rename from api/src/com/cloud/org/Grouping.java rename to api/src/main/java/com/cloud/org/Grouping.java diff --git a/api/src/com/cloud/org/Managed.java b/api/src/main/java/com/cloud/org/Managed.java similarity index 100% rename from api/src/com/cloud/org/Managed.java rename to api/src/main/java/com/cloud/org/Managed.java diff --git a/api/src/com/cloud/org/RunningIn.java b/api/src/main/java/com/cloud/org/RunningIn.java similarity index 100% rename from api/src/com/cloud/org/RunningIn.java rename to api/src/main/java/com/cloud/org/RunningIn.java diff --git a/api/src/com/cloud/projects/Project.java b/api/src/main/java/com/cloud/projects/Project.java similarity index 100% rename from api/src/com/cloud/projects/Project.java rename to api/src/main/java/com/cloud/projects/Project.java diff --git a/api/src/com/cloud/projects/ProjectAccount.java b/api/src/main/java/com/cloud/projects/ProjectAccount.java similarity index 100% rename from api/src/com/cloud/projects/ProjectAccount.java rename to api/src/main/java/com/cloud/projects/ProjectAccount.java diff --git a/api/src/com/cloud/projects/ProjectInvitation.java b/api/src/main/java/com/cloud/projects/ProjectInvitation.java similarity index 100% rename from api/src/com/cloud/projects/ProjectInvitation.java rename to api/src/main/java/com/cloud/projects/ProjectInvitation.java diff --git a/api/src/com/cloud/projects/ProjectService.java b/api/src/main/java/com/cloud/projects/ProjectService.java similarity index 100% rename from api/src/com/cloud/projects/ProjectService.java rename to api/src/main/java/com/cloud/projects/ProjectService.java diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java b/api/src/main/java/com/cloud/region/ha/GlobalLoadBalancerRule.java similarity index 100% rename from api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java rename to api/src/main/java/com/cloud/region/ha/GlobalLoadBalancerRule.java diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java b/api/src/main/java/com/cloud/region/ha/GlobalLoadBalancingRulesService.java similarity index 100% rename from api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java rename to api/src/main/java/com/cloud/region/ha/GlobalLoadBalancingRulesService.java diff --git a/api/src/com/cloud/resource/ResourceService.java b/api/src/main/java/com/cloud/resource/ResourceService.java similarity index 100% rename from api/src/com/cloud/resource/ResourceService.java rename to api/src/main/java/com/cloud/resource/ResourceService.java diff --git a/api/src/com/cloud/resource/ResourceState.java b/api/src/main/java/com/cloud/resource/ResourceState.java similarity index 100% rename from api/src/com/cloud/resource/ResourceState.java rename to api/src/main/java/com/cloud/resource/ResourceState.java diff --git a/api/src/com/cloud/resource/UnableDeleteHostException.java b/api/src/main/java/com/cloud/resource/UnableDeleteHostException.java similarity index 100% rename from api/src/com/cloud/resource/UnableDeleteHostException.java rename to api/src/main/java/com/cloud/resource/UnableDeleteHostException.java diff --git a/api/src/com/cloud/serializer/Param.java b/api/src/main/java/com/cloud/serializer/Param.java similarity index 100% rename from api/src/com/cloud/serializer/Param.java rename to api/src/main/java/com/cloud/serializer/Param.java diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/main/java/com/cloud/server/ManagementService.java similarity index 100% rename from api/src/com/cloud/server/ManagementService.java rename to api/src/main/java/com/cloud/server/ManagementService.java diff --git a/api/src/com/cloud/server/ResourceMetaDataService.java b/api/src/main/java/com/cloud/server/ResourceMetaDataService.java similarity index 100% rename from api/src/com/cloud/server/ResourceMetaDataService.java rename to api/src/main/java/com/cloud/server/ResourceMetaDataService.java diff --git a/api/src/com/cloud/server/ResourceTag.java b/api/src/main/java/com/cloud/server/ResourceTag.java similarity index 100% rename from api/src/com/cloud/server/ResourceTag.java rename to api/src/main/java/com/cloud/server/ResourceTag.java diff --git a/api/src/com/cloud/server/TaggedResourceService.java b/api/src/main/java/com/cloud/server/TaggedResourceService.java similarity index 100% rename from api/src/com/cloud/server/TaggedResourceService.java rename to api/src/main/java/com/cloud/server/TaggedResourceService.java diff --git a/api/src/com/cloud/storage/DataStoreProviderApiService.java b/api/src/main/java/com/cloud/storage/DataStoreProviderApiService.java similarity index 100% rename from api/src/com/cloud/storage/DataStoreProviderApiService.java rename to api/src/main/java/com/cloud/storage/DataStoreProviderApiService.java diff --git a/api/src/com/cloud/storage/DataStoreRole.java b/api/src/main/java/com/cloud/storage/DataStoreRole.java similarity index 100% rename from api/src/com/cloud/storage/DataStoreRole.java rename to api/src/main/java/com/cloud/storage/DataStoreRole.java diff --git a/api/src/com/cloud/storage/GuestOS.java b/api/src/main/java/com/cloud/storage/GuestOS.java similarity index 100% rename from api/src/com/cloud/storage/GuestOS.java rename to api/src/main/java/com/cloud/storage/GuestOS.java diff --git a/api/src/com/cloud/storage/GuestOSHypervisor.java b/api/src/main/java/com/cloud/storage/GuestOSHypervisor.java similarity index 100% rename from api/src/com/cloud/storage/GuestOSHypervisor.java rename to api/src/main/java/com/cloud/storage/GuestOSHypervisor.java diff --git a/api/src/com/cloud/storage/GuestOsCategory.java b/api/src/main/java/com/cloud/storage/GuestOsCategory.java similarity index 100% rename from api/src/com/cloud/storage/GuestOsCategory.java rename to api/src/main/java/com/cloud/storage/GuestOsCategory.java diff --git a/api/src/com/cloud/storage/ImageStore.java b/api/src/main/java/com/cloud/storage/ImageStore.java similarity index 100% rename from api/src/com/cloud/storage/ImageStore.java rename to api/src/main/java/com/cloud/storage/ImageStore.java diff --git a/api/src/com/cloud/storage/ScopeType.java b/api/src/main/java/com/cloud/storage/ScopeType.java similarity index 100% rename from api/src/com/cloud/storage/ScopeType.java rename to api/src/main/java/com/cloud/storage/ScopeType.java diff --git a/api/src/com/cloud/storage/Snapshot.java b/api/src/main/java/com/cloud/storage/Snapshot.java similarity index 100% rename from api/src/com/cloud/storage/Snapshot.java rename to api/src/main/java/com/cloud/storage/Snapshot.java diff --git a/api/src/com/cloud/storage/Storage.java b/api/src/main/java/com/cloud/storage/Storage.java similarity index 100% rename from api/src/com/cloud/storage/Storage.java rename to api/src/main/java/com/cloud/storage/Storage.java diff --git a/api/src/com/cloud/storage/StorageGuru.java b/api/src/main/java/com/cloud/storage/StorageGuru.java similarity index 100% rename from api/src/com/cloud/storage/StorageGuru.java rename to api/src/main/java/com/cloud/storage/StorageGuru.java diff --git a/api/src/com/cloud/storage/StoragePool.java b/api/src/main/java/com/cloud/storage/StoragePool.java similarity index 100% rename from api/src/com/cloud/storage/StoragePool.java rename to api/src/main/java/com/cloud/storage/StoragePool.java diff --git a/api/src/com/cloud/storage/StoragePoolDiscoverer.java b/api/src/main/java/com/cloud/storage/StoragePoolDiscoverer.java similarity index 100% rename from api/src/com/cloud/storage/StoragePoolDiscoverer.java rename to api/src/main/java/com/cloud/storage/StoragePoolDiscoverer.java diff --git a/api/src/com/cloud/storage/StoragePoolStatus.java b/api/src/main/java/com/cloud/storage/StoragePoolStatus.java similarity index 100% rename from api/src/com/cloud/storage/StoragePoolStatus.java rename to api/src/main/java/com/cloud/storage/StoragePoolStatus.java diff --git a/api/src/com/cloud/storage/StorageService.java b/api/src/main/java/com/cloud/storage/StorageService.java similarity index 100% rename from api/src/com/cloud/storage/StorageService.java rename to api/src/main/java/com/cloud/storage/StorageService.java diff --git a/api/src/com/cloud/storage/StorageStats.java b/api/src/main/java/com/cloud/storage/StorageStats.java similarity index 100% rename from api/src/com/cloud/storage/StorageStats.java rename to api/src/main/java/com/cloud/storage/StorageStats.java diff --git a/api/src/com/cloud/storage/Upload.java b/api/src/main/java/com/cloud/storage/Upload.java similarity index 100% rename from api/src/com/cloud/storage/Upload.java rename to api/src/main/java/com/cloud/storage/Upload.java diff --git a/api/src/com/cloud/storage/VMTemplateStorageResourceAssoc.java b/api/src/main/java/com/cloud/storage/VMTemplateStorageResourceAssoc.java similarity index 100% rename from api/src/com/cloud/storage/VMTemplateStorageResourceAssoc.java rename to api/src/main/java/com/cloud/storage/VMTemplateStorageResourceAssoc.java diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/main/java/com/cloud/storage/Volume.java similarity index 100% rename from api/src/com/cloud/storage/Volume.java rename to api/src/main/java/com/cloud/storage/Volume.java diff --git a/api/src/com/cloud/storage/VolumeApiService.java b/api/src/main/java/com/cloud/storage/VolumeApiService.java similarity index 100% rename from api/src/com/cloud/storage/VolumeApiService.java rename to api/src/main/java/com/cloud/storage/VolumeApiService.java diff --git a/api/src/com/cloud/storage/VolumeStats.java b/api/src/main/java/com/cloud/storage/VolumeStats.java similarity index 100% rename from api/src/com/cloud/storage/VolumeStats.java rename to api/src/main/java/com/cloud/storage/VolumeStats.java diff --git a/api/src/com/cloud/storage/snapshot/SnapshotApiService.java b/api/src/main/java/com/cloud/storage/snapshot/SnapshotApiService.java similarity index 100% rename from api/src/com/cloud/storage/snapshot/SnapshotApiService.java rename to api/src/main/java/com/cloud/storage/snapshot/SnapshotApiService.java diff --git a/api/src/com/cloud/storage/snapshot/SnapshotPolicy.java b/api/src/main/java/com/cloud/storage/snapshot/SnapshotPolicy.java similarity index 100% rename from api/src/com/cloud/storage/snapshot/SnapshotPolicy.java rename to api/src/main/java/com/cloud/storage/snapshot/SnapshotPolicy.java diff --git a/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java b/api/src/main/java/com/cloud/storage/snapshot/SnapshotSchedule.java similarity index 100% rename from api/src/com/cloud/storage/snapshot/SnapshotSchedule.java rename to api/src/main/java/com/cloud/storage/snapshot/SnapshotSchedule.java diff --git a/api/src/com/cloud/storage/template/TemplateProp.java b/api/src/main/java/com/cloud/storage/template/TemplateProp.java similarity index 100% rename from api/src/com/cloud/storage/template/TemplateProp.java rename to api/src/main/java/com/cloud/storage/template/TemplateProp.java diff --git a/api/src/com/cloud/template/BasedOn.java b/api/src/main/java/com/cloud/template/BasedOn.java similarity index 100% rename from api/src/com/cloud/template/BasedOn.java rename to api/src/main/java/com/cloud/template/BasedOn.java diff --git a/api/src/com/cloud/template/TemplateApiService.java b/api/src/main/java/com/cloud/template/TemplateApiService.java similarity index 100% rename from api/src/com/cloud/template/TemplateApiService.java rename to api/src/main/java/com/cloud/template/TemplateApiService.java diff --git a/api/src/com/cloud/template/VirtualMachineTemplate.java b/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java similarity index 100% rename from api/src/com/cloud/template/VirtualMachineTemplate.java rename to api/src/main/java/com/cloud/template/VirtualMachineTemplate.java diff --git a/api/src/com/cloud/user/Account.java b/api/src/main/java/com/cloud/user/Account.java similarity index 100% rename from api/src/com/cloud/user/Account.java rename to api/src/main/java/com/cloud/user/Account.java diff --git a/api/src/com/cloud/user/AccountService.java b/api/src/main/java/com/cloud/user/AccountService.java similarity index 100% rename from api/src/com/cloud/user/AccountService.java rename to api/src/main/java/com/cloud/user/AccountService.java diff --git a/api/src/com/cloud/user/DomainService.java b/api/src/main/java/com/cloud/user/DomainService.java similarity index 100% rename from api/src/com/cloud/user/DomainService.java rename to api/src/main/java/com/cloud/user/DomainService.java diff --git a/api/src/com/cloud/user/OwnedBy.java b/api/src/main/java/com/cloud/user/OwnedBy.java similarity index 100% rename from api/src/com/cloud/user/OwnedBy.java rename to api/src/main/java/com/cloud/user/OwnedBy.java diff --git a/api/src/com/cloud/user/ResourceLimitService.java b/api/src/main/java/com/cloud/user/ResourceLimitService.java similarity index 100% rename from api/src/com/cloud/user/ResourceLimitService.java rename to api/src/main/java/com/cloud/user/ResourceLimitService.java diff --git a/api/src/com/cloud/user/SSHKeyPair.java b/api/src/main/java/com/cloud/user/SSHKeyPair.java similarity index 100% rename from api/src/com/cloud/user/SSHKeyPair.java rename to api/src/main/java/com/cloud/user/SSHKeyPair.java diff --git a/api/src/com/cloud/user/User.java b/api/src/main/java/com/cloud/user/User.java similarity index 100% rename from api/src/com/cloud/user/User.java rename to api/src/main/java/com/cloud/user/User.java diff --git a/api/src/com/cloud/user/UserAccount.java b/api/src/main/java/com/cloud/user/UserAccount.java similarity index 100% rename from api/src/com/cloud/user/UserAccount.java rename to api/src/main/java/com/cloud/user/UserAccount.java diff --git a/api/src/com/cloud/uservm/UserVm.java b/api/src/main/java/com/cloud/uservm/UserVm.java similarity index 100% rename from api/src/com/cloud/uservm/UserVm.java rename to api/src/main/java/com/cloud/uservm/UserVm.java diff --git a/api/src/com/cloud/vm/BareMetalVmService.java b/api/src/main/java/com/cloud/vm/BareMetalVmService.java similarity index 100% rename from api/src/com/cloud/vm/BareMetalVmService.java rename to api/src/main/java/com/cloud/vm/BareMetalVmService.java diff --git a/api/src/com/cloud/vm/ConsoleProxy.java b/api/src/main/java/com/cloud/vm/ConsoleProxy.java similarity index 100% rename from api/src/com/cloud/vm/ConsoleProxy.java rename to api/src/main/java/com/cloud/vm/ConsoleProxy.java diff --git a/api/src/com/cloud/vm/DiskProfile.java b/api/src/main/java/com/cloud/vm/DiskProfile.java similarity index 100% rename from api/src/com/cloud/vm/DiskProfile.java rename to api/src/main/java/com/cloud/vm/DiskProfile.java diff --git a/api/src/com/cloud/vm/InstanceGroup.java b/api/src/main/java/com/cloud/vm/InstanceGroup.java similarity index 100% rename from api/src/com/cloud/vm/InstanceGroup.java rename to api/src/main/java/com/cloud/vm/InstanceGroup.java diff --git a/api/src/com/cloud/vm/Nic.java b/api/src/main/java/com/cloud/vm/Nic.java similarity index 100% rename from api/src/com/cloud/vm/Nic.java rename to api/src/main/java/com/cloud/vm/Nic.java diff --git a/api/src/com/cloud/vm/NicExtraDhcpOption.java b/api/src/main/java/com/cloud/vm/NicExtraDhcpOption.java similarity index 100% rename from api/src/com/cloud/vm/NicExtraDhcpOption.java rename to api/src/main/java/com/cloud/vm/NicExtraDhcpOption.java diff --git a/api/src/com/cloud/vm/NicIpAlias.java b/api/src/main/java/com/cloud/vm/NicIpAlias.java similarity index 100% rename from api/src/com/cloud/vm/NicIpAlias.java rename to api/src/main/java/com/cloud/vm/NicIpAlias.java diff --git a/api/src/com/cloud/vm/NicProfile.java b/api/src/main/java/com/cloud/vm/NicProfile.java similarity index 100% rename from api/src/com/cloud/vm/NicProfile.java rename to api/src/main/java/com/cloud/vm/NicProfile.java diff --git a/api/src/com/cloud/vm/NicSecondaryIp.java b/api/src/main/java/com/cloud/vm/NicSecondaryIp.java similarity index 100% rename from api/src/com/cloud/vm/NicSecondaryIp.java rename to api/src/main/java/com/cloud/vm/NicSecondaryIp.java diff --git a/api/src/com/cloud/vm/ReservationContext.java b/api/src/main/java/com/cloud/vm/ReservationContext.java similarity index 100% rename from api/src/com/cloud/vm/ReservationContext.java rename to api/src/main/java/com/cloud/vm/ReservationContext.java diff --git a/api/src/com/cloud/vm/RunningOn.java b/api/src/main/java/com/cloud/vm/RunningOn.java similarity index 100% rename from api/src/com/cloud/vm/RunningOn.java rename to api/src/main/java/com/cloud/vm/RunningOn.java diff --git a/api/src/com/cloud/vm/SecondaryStorageVm.java b/api/src/main/java/com/cloud/vm/SecondaryStorageVm.java similarity index 100% rename from api/src/com/cloud/vm/SecondaryStorageVm.java rename to api/src/main/java/com/cloud/vm/SecondaryStorageVm.java diff --git a/api/src/com/cloud/vm/SystemVm.java b/api/src/main/java/com/cloud/vm/SystemVm.java similarity index 100% rename from api/src/com/cloud/vm/SystemVm.java rename to api/src/main/java/com/cloud/vm/SystemVm.java diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/main/java/com/cloud/vm/UserVmService.java similarity index 100% rename from api/src/com/cloud/vm/UserVmService.java rename to api/src/main/java/com/cloud/vm/UserVmService.java diff --git a/api/src/com/cloud/vm/VirtualMachine.java b/api/src/main/java/com/cloud/vm/VirtualMachine.java similarity index 100% rename from api/src/com/cloud/vm/VirtualMachine.java rename to api/src/main/java/com/cloud/vm/VirtualMachine.java diff --git a/api/src/com/cloud/vm/VirtualMachineName.java b/api/src/main/java/com/cloud/vm/VirtualMachineName.java similarity index 100% rename from api/src/com/cloud/vm/VirtualMachineName.java rename to api/src/main/java/com/cloud/vm/VirtualMachineName.java diff --git a/api/src/com/cloud/vm/VirtualMachineProfile.java b/api/src/main/java/com/cloud/vm/VirtualMachineProfile.java similarity index 100% rename from api/src/com/cloud/vm/VirtualMachineProfile.java rename to api/src/main/java/com/cloud/vm/VirtualMachineProfile.java diff --git a/api/src/com/cloud/vm/VmDetailConstants.java b/api/src/main/java/com/cloud/vm/VmDetailConstants.java similarity index 100% rename from api/src/com/cloud/vm/VmDetailConstants.java rename to api/src/main/java/com/cloud/vm/VmDetailConstants.java diff --git a/api/src/com/cloud/vm/VmDiskStats.java b/api/src/main/java/com/cloud/vm/VmDiskStats.java similarity index 100% rename from api/src/com/cloud/vm/VmDiskStats.java rename to api/src/main/java/com/cloud/vm/VmDiskStats.java diff --git a/api/src/com/cloud/vm/VmNetworkStats.java b/api/src/main/java/com/cloud/vm/VmNetworkStats.java similarity index 100% rename from api/src/com/cloud/vm/VmNetworkStats.java rename to api/src/main/java/com/cloud/vm/VmNetworkStats.java diff --git a/api/src/com/cloud/vm/VmStats.java b/api/src/main/java/com/cloud/vm/VmStats.java similarity index 100% rename from api/src/com/cloud/vm/VmStats.java rename to api/src/main/java/com/cloud/vm/VmStats.java diff --git a/api/src/com/cloud/vm/snapshot/VMSnapshot.java b/api/src/main/java/com/cloud/vm/snapshot/VMSnapshot.java similarity index 100% rename from api/src/com/cloud/vm/snapshot/VMSnapshot.java rename to api/src/main/java/com/cloud/vm/snapshot/VMSnapshot.java diff --git a/api/src/com/cloud/vm/snapshot/VMSnapshotService.java b/api/src/main/java/com/cloud/vm/snapshot/VMSnapshotService.java similarity index 100% rename from api/src/com/cloud/vm/snapshot/VMSnapshotService.java rename to api/src/main/java/com/cloud/vm/snapshot/VMSnapshotService.java diff --git a/api/src/org/apache/cloudstack/acl/APIChecker.java b/api/src/main/java/org/apache/cloudstack/acl/APIChecker.java similarity index 100% rename from api/src/org/apache/cloudstack/acl/APIChecker.java rename to api/src/main/java/org/apache/cloudstack/acl/APIChecker.java diff --git a/api/src/org/apache/cloudstack/acl/APILimitChecker.java b/api/src/main/java/org/apache/cloudstack/acl/APILimitChecker.java similarity index 100% rename from api/src/org/apache/cloudstack/acl/APILimitChecker.java rename to api/src/main/java/org/apache/cloudstack/acl/APILimitChecker.java diff --git a/api/src/org/apache/cloudstack/acl/ControlledEntity.java b/api/src/main/java/org/apache/cloudstack/acl/ControlledEntity.java similarity index 100% rename from api/src/org/apache/cloudstack/acl/ControlledEntity.java rename to api/src/main/java/org/apache/cloudstack/acl/ControlledEntity.java diff --git a/api/src/org/apache/cloudstack/acl/InfrastructureEntity.java b/api/src/main/java/org/apache/cloudstack/acl/InfrastructureEntity.java similarity index 100% rename from api/src/org/apache/cloudstack/acl/InfrastructureEntity.java rename to api/src/main/java/org/apache/cloudstack/acl/InfrastructureEntity.java diff --git a/api/src/org/apache/cloudstack/acl/PermissionScope.java b/api/src/main/java/org/apache/cloudstack/acl/PermissionScope.java similarity index 100% rename from api/src/org/apache/cloudstack/acl/PermissionScope.java rename to api/src/main/java/org/apache/cloudstack/acl/PermissionScope.java diff --git a/api/src/org/apache/cloudstack/acl/QuerySelector.java b/api/src/main/java/org/apache/cloudstack/acl/QuerySelector.java similarity index 100% rename from api/src/org/apache/cloudstack/acl/QuerySelector.java rename to api/src/main/java/org/apache/cloudstack/acl/QuerySelector.java diff --git a/api/src/org/apache/cloudstack/acl/Role.java b/api/src/main/java/org/apache/cloudstack/acl/Role.java similarity index 100% rename from api/src/org/apache/cloudstack/acl/Role.java rename to api/src/main/java/org/apache/cloudstack/acl/Role.java diff --git a/api/src/org/apache/cloudstack/acl/RolePermission.java b/api/src/main/java/org/apache/cloudstack/acl/RolePermission.java similarity index 100% rename from api/src/org/apache/cloudstack/acl/RolePermission.java rename to api/src/main/java/org/apache/cloudstack/acl/RolePermission.java diff --git a/api/src/org/apache/cloudstack/acl/RoleService.java b/api/src/main/java/org/apache/cloudstack/acl/RoleService.java similarity index 100% rename from api/src/org/apache/cloudstack/acl/RoleService.java rename to api/src/main/java/org/apache/cloudstack/acl/RoleService.java diff --git a/api/src/org/apache/cloudstack/acl/RoleType.java b/api/src/main/java/org/apache/cloudstack/acl/RoleType.java similarity index 100% rename from api/src/org/apache/cloudstack/acl/RoleType.java rename to api/src/main/java/org/apache/cloudstack/acl/RoleType.java diff --git a/api/src/org/apache/cloudstack/acl/Rule.java b/api/src/main/java/org/apache/cloudstack/acl/Rule.java similarity index 100% rename from api/src/org/apache/cloudstack/acl/Rule.java rename to api/src/main/java/org/apache/cloudstack/acl/Rule.java diff --git a/api/src/org/apache/cloudstack/acl/SecurityChecker.java b/api/src/main/java/org/apache/cloudstack/acl/SecurityChecker.java similarity index 100% rename from api/src/org/apache/cloudstack/acl/SecurityChecker.java rename to api/src/main/java/org/apache/cloudstack/acl/SecurityChecker.java diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroup.java b/api/src/main/java/org/apache/cloudstack/affinity/AffinityGroup.java similarity index 100% rename from api/src/org/apache/cloudstack/affinity/AffinityGroup.java rename to api/src/main/java/org/apache/cloudstack/affinity/AffinityGroup.java diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupProcessor.java b/api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupProcessor.java similarity index 100% rename from api/src/org/apache/cloudstack/affinity/AffinityGroupProcessor.java rename to api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupProcessor.java diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java b/api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java rename to api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupResponse.java diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupService.java b/api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupService.java similarity index 100% rename from api/src/org/apache/cloudstack/affinity/AffinityGroupService.java rename to api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupService.java diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java b/api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java rename to api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java diff --git a/api/src/org/apache/cloudstack/affinity/AffinityProcessorBase.java b/api/src/main/java/org/apache/cloudstack/affinity/AffinityProcessorBase.java similarity index 100% rename from api/src/org/apache/cloudstack/affinity/AffinityProcessorBase.java rename to api/src/main/java/org/apache/cloudstack/affinity/AffinityProcessorBase.java diff --git a/api/src/org/apache/cloudstack/alert/AlertService.java b/api/src/main/java/org/apache/cloudstack/alert/AlertService.java similarity index 100% rename from api/src/org/apache/cloudstack/alert/AlertService.java rename to api/src/main/java/org/apache/cloudstack/alert/AlertService.java diff --git a/api/src/org/apache/cloudstack/annotation/Annotation.java b/api/src/main/java/org/apache/cloudstack/annotation/Annotation.java similarity index 100% rename from api/src/org/apache/cloudstack/annotation/Annotation.java rename to api/src/main/java/org/apache/cloudstack/annotation/Annotation.java diff --git a/api/src/org/apache/cloudstack/annotation/AnnotationService.java b/api/src/main/java/org/apache/cloudstack/annotation/AnnotationService.java similarity index 100% rename from api/src/org/apache/cloudstack/annotation/AnnotationService.java rename to api/src/main/java/org/apache/cloudstack/annotation/AnnotationService.java diff --git a/api/src/org/apache/cloudstack/api/ACL.java b/api/src/main/java/org/apache/cloudstack/api/ACL.java similarity index 100% rename from api/src/org/apache/cloudstack/api/ACL.java rename to api/src/main/java/org/apache/cloudstack/api/ACL.java diff --git a/api/src/org/apache/cloudstack/api/APICommand.java b/api/src/main/java/org/apache/cloudstack/api/APICommand.java similarity index 100% rename from api/src/org/apache/cloudstack/api/APICommand.java rename to api/src/main/java/org/apache/cloudstack/api/APICommand.java diff --git a/api/src/org/apache/cloudstack/api/AbstractGetUploadParamsCmd.java b/api/src/main/java/org/apache/cloudstack/api/AbstractGetUploadParamsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/AbstractGetUploadParamsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/AbstractGetUploadParamsCmd.java diff --git a/api/src/org/apache/cloudstack/api/ApiArgValidator.java b/api/src/main/java/org/apache/cloudstack/api/ApiArgValidator.java similarity index 100% rename from api/src/org/apache/cloudstack/api/ApiArgValidator.java rename to api/src/main/java/org/apache/cloudstack/api/ApiArgValidator.java diff --git a/api/src/org/apache/cloudstack/api/ApiCommandJobType.java b/api/src/main/java/org/apache/cloudstack/api/ApiCommandJobType.java similarity index 100% rename from api/src/org/apache/cloudstack/api/ApiCommandJobType.java rename to api/src/main/java/org/apache/cloudstack/api/ApiCommandJobType.java diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java similarity index 100% rename from api/src/org/apache/cloudstack/api/ApiConstants.java rename to api/src/main/java/org/apache/cloudstack/api/ApiConstants.java diff --git a/api/src/org/apache/cloudstack/api/ApiErrorCode.java b/api/src/main/java/org/apache/cloudstack/api/ApiErrorCode.java similarity index 100% rename from api/src/org/apache/cloudstack/api/ApiErrorCode.java rename to api/src/main/java/org/apache/cloudstack/api/ApiErrorCode.java diff --git a/api/src/org/apache/cloudstack/api/ApiServerService.java b/api/src/main/java/org/apache/cloudstack/api/ApiServerService.java similarity index 100% rename from api/src/org/apache/cloudstack/api/ApiServerService.java rename to api/src/main/java/org/apache/cloudstack/api/ApiServerService.java diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseAsyncCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseAsyncCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseAsyncCmd.java diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseAsyncCreateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseAsyncCreateCmd.java diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java diff --git a/api/src/org/apache/cloudstack/api/BaseCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseCmd.java diff --git a/api/src/org/apache/cloudstack/api/BaseCustomIdCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseCustomIdCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseCustomIdCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseCustomIdCmd.java diff --git a/api/src/org/apache/cloudstack/api/BaseListAccountResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListAccountResourcesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseListAccountResourcesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseListAccountResourcesCmd.java diff --git a/api/src/org/apache/cloudstack/api/BaseListCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseListCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseListCmd.java diff --git a/api/src/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java diff --git a/api/src/org/apache/cloudstack/api/BaseListProjectAndAccountResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListProjectAndAccountResourcesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseListProjectAndAccountResourcesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseListProjectAndAccountResourcesCmd.java diff --git a/api/src/org/apache/cloudstack/api/BaseListTaggedResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListTaggedResourcesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseListTaggedResourcesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseListTaggedResourcesCmd.java diff --git a/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java diff --git a/api/src/org/apache/cloudstack/api/BaseResponse.java b/api/src/main/java/org/apache/cloudstack/api/BaseResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseResponse.java rename to api/src/main/java/org/apache/cloudstack/api/BaseResponse.java diff --git a/api/src/org/apache/cloudstack/api/BaseResponseWithTagInformation.java b/api/src/main/java/org/apache/cloudstack/api/BaseResponseWithTagInformation.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseResponseWithTagInformation.java rename to api/src/main/java/org/apache/cloudstack/api/BaseResponseWithTagInformation.java diff --git a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java diff --git a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java diff --git a/api/src/org/apache/cloudstack/api/Displayable.java b/api/src/main/java/org/apache/cloudstack/api/Displayable.java similarity index 100% rename from api/src/org/apache/cloudstack/api/Displayable.java rename to api/src/main/java/org/apache/cloudstack/api/Displayable.java diff --git a/api/src/org/apache/cloudstack/api/EntityReference.java b/api/src/main/java/org/apache/cloudstack/api/EntityReference.java similarity index 100% rename from api/src/org/apache/cloudstack/api/EntityReference.java rename to api/src/main/java/org/apache/cloudstack/api/EntityReference.java diff --git a/api/src/org/apache/cloudstack/api/IBaseListAccountResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/IBaseListAccountResourcesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/IBaseListAccountResourcesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/IBaseListAccountResourcesCmd.java diff --git a/api/src/org/apache/cloudstack/api/IBaseListCmd.java b/api/src/main/java/org/apache/cloudstack/api/IBaseListCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/IBaseListCmd.java rename to api/src/main/java/org/apache/cloudstack/api/IBaseListCmd.java diff --git a/api/src/org/apache/cloudstack/api/IBaseListDomainResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/IBaseListDomainResourcesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/IBaseListDomainResourcesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/IBaseListDomainResourcesCmd.java diff --git a/api/src/org/apache/cloudstack/api/IBaseListProjectAndAccountResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/IBaseListProjectAndAccountResourcesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/IBaseListProjectAndAccountResourcesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/IBaseListProjectAndAccountResourcesCmd.java diff --git a/api/src/org/apache/cloudstack/api/IBaseListTaggedResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/IBaseListTaggedResourcesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/IBaseListTaggedResourcesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/IBaseListTaggedResourcesCmd.java diff --git a/api/src/org/apache/cloudstack/api/Identity.java b/api/src/main/java/org/apache/cloudstack/api/Identity.java similarity index 100% rename from api/src/org/apache/cloudstack/api/Identity.java rename to api/src/main/java/org/apache/cloudstack/api/Identity.java diff --git a/api/src/org/apache/cloudstack/api/InternalIdentity.java b/api/src/main/java/org/apache/cloudstack/api/InternalIdentity.java similarity index 100% rename from api/src/org/apache/cloudstack/api/InternalIdentity.java rename to api/src/main/java/org/apache/cloudstack/api/InternalIdentity.java diff --git a/api/src/org/apache/cloudstack/api/LdapValidator.java b/api/src/main/java/org/apache/cloudstack/api/LdapValidator.java similarity index 100% rename from api/src/org/apache/cloudstack/api/LdapValidator.java rename to api/src/main/java/org/apache/cloudstack/api/LdapValidator.java diff --git a/api/src/org/apache/cloudstack/api/Parameter.java b/api/src/main/java/org/apache/cloudstack/api/Parameter.java similarity index 100% rename from api/src/org/apache/cloudstack/api/Parameter.java rename to api/src/main/java/org/apache/cloudstack/api/Parameter.java diff --git a/api/src/org/apache/cloudstack/api/ResourceDetail.java b/api/src/main/java/org/apache/cloudstack/api/ResourceDetail.java similarity index 100% rename from api/src/org/apache/cloudstack/api/ResourceDetail.java rename to api/src/main/java/org/apache/cloudstack/api/ResourceDetail.java diff --git a/api/src/org/apache/cloudstack/api/ResponseGenerator.java b/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java similarity index 100% rename from api/src/org/apache/cloudstack/api/ResponseGenerator.java rename to api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java diff --git a/api/src/org/apache/cloudstack/api/ResponseObject.java b/api/src/main/java/org/apache/cloudstack/api/ResponseObject.java similarity index 100% rename from api/src/org/apache/cloudstack/api/ResponseObject.java rename to api/src/main/java/org/apache/cloudstack/api/ResponseObject.java diff --git a/api/src/org/apache/cloudstack/api/ServerApiException.java b/api/src/main/java/org/apache/cloudstack/api/ServerApiException.java similarity index 100% rename from api/src/org/apache/cloudstack/api/ServerApiException.java rename to api/src/main/java/org/apache/cloudstack/api/ServerApiException.java diff --git a/api/src/org/apache/cloudstack/api/Validate.java b/api/src/main/java/org/apache/cloudstack/api/Validate.java similarity index 100% rename from api/src/org/apache/cloudstack/api/Validate.java rename to api/src/main/java/org/apache/cloudstack/api/Validate.java diff --git a/api/src/org/apache/cloudstack/api/auth/APIAuthenticationManager.java b/api/src/main/java/org/apache/cloudstack/api/auth/APIAuthenticationManager.java similarity index 100% rename from api/src/org/apache/cloudstack/api/auth/APIAuthenticationManager.java rename to api/src/main/java/org/apache/cloudstack/api/auth/APIAuthenticationManager.java diff --git a/api/src/org/apache/cloudstack/api/auth/APIAuthenticationType.java b/api/src/main/java/org/apache/cloudstack/api/auth/APIAuthenticationType.java similarity index 100% rename from api/src/org/apache/cloudstack/api/auth/APIAuthenticationType.java rename to api/src/main/java/org/apache/cloudstack/api/auth/APIAuthenticationType.java diff --git a/api/src/org/apache/cloudstack/api/auth/APIAuthenticator.java b/api/src/main/java/org/apache/cloudstack/api/auth/APIAuthenticator.java similarity index 100% rename from api/src/org/apache/cloudstack/api/auth/APIAuthenticator.java rename to api/src/main/java/org/apache/cloudstack/api/auth/APIAuthenticator.java diff --git a/api/src/org/apache/cloudstack/api/auth/PluggableAPIAuthenticator.java b/api/src/main/java/org/apache/cloudstack/api/auth/PluggableAPIAuthenticator.java similarity index 100% rename from api/src/org/apache/cloudstack/api/auth/PluggableAPIAuthenticator.java rename to api/src/main/java/org/apache/cloudstack/api/auth/PluggableAPIAuthenticator.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/address/AcquirePodIpCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/address/AcquirePodIpCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/address/AcquirePodIpCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/address/AcquirePodIpCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/CopyIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/CopyIsoCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/iso/CopyIsoCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/CopyIsoCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreS3CMD.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreS3CMD.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreS3CMD.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreS3CMD.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/CreateVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/CreateVolumeCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/volume/CreateVolumeCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/CreateVolumeCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/IListFirewallRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/IListFirewallRulesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/firewall/IListFirewallRulesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/IListFirewallRulesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/UpdateSnapshotPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/UpdateSnapshotPolicyCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/snapshot/UpdateSnapshotPolicyCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/UpdateSnapshotPolicyCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/SecurityGroupAction.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/SecurityGroupAction.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/SecurityGroupAction.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/SecurityGroupAction.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolumeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolumeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolumeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java diff --git a/api/src/org/apache/cloudstack/api/response/AccountResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/AccountResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/AcquirePodIpCmdResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AcquirePodIpCmdResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/AcquirePodIpCmdResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/AcquirePodIpCmdResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/AlertResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AlertResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/AlertResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/AlertResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/AnnotationResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AnnotationResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/AnnotationResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/AnnotationResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/AsyncJobResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AsyncJobResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/AsyncJobResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/AsyncJobResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/AuthenticationCmdResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AuthenticationCmdResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/AuthenticationCmdResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/AuthenticationCmdResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/CAProviderResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CAProviderResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/CAProviderResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/CAProviderResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/CapabilityResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CapabilityResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/CapabilityResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/CapabilityResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/CapacityResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CapacityResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/CapacityResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/CapacityResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/CertificateResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CertificateResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/CertificateResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/CertificateResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CloudIdentifierResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/CloudIdentifierResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ClusterResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ConditionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ConditionResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ConditionResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ConditionResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ConfigurationResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ConfigurationResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ControlledEntityResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ControlledEntityResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ControlledEntityResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ControlledEntityResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ControlledViewEntityResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ControlledViewEntityResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ControlledViewEntityResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ControlledViewEntityResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/CounterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CounterResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/CounterResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/CounterResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/CreateCmdResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CreateCmdResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/CreateCmdResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/CreateCmdResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CustomCertificateResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/CustomCertificateResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/DiskOfferingResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/DiskOfferingResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/DomainResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/DomainResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/DomainResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/DomainResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/DomainRouterResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/DomainRouterResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/EventResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/EventResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/EventResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/EventResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/EventTypeResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/EventTypeResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/EventTypeResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ExceptionResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ExceptionResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ExceptionResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ExternalFirewallResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ExternalFirewallResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ExtractResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ExtractResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ExtractResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ExtractResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/FirewallResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/FirewallResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/FirewallResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/FirewallRuleResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/FirewallRuleResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/GetUploadParamsResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GetUploadParamsResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/GetUploadParamsResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/GetUploadParamsResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GetVMPasswordResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/GetVMPasswordResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/GpuResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GpuResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/GpuResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/GpuResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GuestOSResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/GuestOSResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/GuestOSResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/GuestOsMappingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GuestOsMappingResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/GuestOsMappingResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/GuestOsMappingResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/HAProviderResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HAProviderResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/HAProviderResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/HAProviderResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostForMigrationResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/HostForMigrationResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/HostHAResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostHAResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/HostHAResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/HostHAResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/HostResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/HostResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/HostTagResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostTagResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/HostTagResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/HostTagResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HypervisorResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/HypervisorResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/HypervisorResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/IPAddressResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ImageStoreResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ImageStoreResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ImageStoreResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ImageStoreResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/InstanceGroupResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/InstanceGroupResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IsoVmResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/IsoVmResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/IsoVmResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/IsolationMethodResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IsolationMethodResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/IsolationMethodResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/IsolationMethodResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/LBHealthCheckResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LBHealthCheckResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/LBHealthCheckResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/LBHealthCheckResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LBStickinessResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/LBStickinessResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ListResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ListResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ListResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ListResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LoadBalancerResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/LoadBalancerResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/LoadBalancerRuleVmMapResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LoadBalancerRuleVmMapResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/LoadBalancerRuleVmMapResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/LoadBalancerRuleVmMapResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/LoginCmdResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LoginCmdResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/LoginCmdResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/LoginCmdResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/LogoutCmdResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LogoutCmdResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/LogoutCmdResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/LogoutCmdResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/NetworkACLItemResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkACLItemResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/NetworkACLItemResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/NetworkACLItemResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkACLResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/NetworkACLResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkDeviceResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/NetworkDeviceResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkOfferingResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/NetworkOfferingResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/NetworkResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/NicExtraDhcpOptionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NicExtraDhcpOptionResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/NicExtraDhcpOptionResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/NicExtraDhcpOptionResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/NicResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NicResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/NicResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/NicResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/OutOfBandManagementResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/OutOfBandManagementResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/OutOfBandManagementResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/OutOfBandManagementResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/OvsProviderResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/OvsProviderResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/OvsProviderResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/OvsProviderResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/PodResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/PodResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/PodResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/PodResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/PortableIpRangeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/PortableIpRangeResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/PortableIpRangeResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/PortableIpRangeResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/PortableIpResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/PortableIpResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/PortableIpResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/PortableIpResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/PrivateGatewayResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/PrivateGatewayResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ProjectAccountResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ProjectAccountResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ProjectInvitationResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ProjectInvitationResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ProjectResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ProjectResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ProjectResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ProjectResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ProviderResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ProviderResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ProviderResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ProviderResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/RegionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RegionResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/RegionResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/RegionResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/RegisterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RegisterResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/RegisterResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/RegisterResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ResourceCountResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ResourceCountResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ResourceDetailResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ResourceDetailResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ResourceDetailResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ResourceDetailResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ResourceTagResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ResourceTagResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/RolePermissionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RolePermissionResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/RolePermissionResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/RolePermissionResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/RoleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RoleResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/RoleResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/RoleResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SSHKeyPairResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/SSHKeyPairResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SecurityGroupResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/SecurityGroupResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ServiceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ServiceResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ServiceResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ServiceResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SnapshotResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/SnapshotResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/SnapshotResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SslCertResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/SslCertResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/SslCertResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/StaticRouteResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/StaticRouteResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/StoragePoolResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/StoragePoolResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/StorageProviderResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/StorageProviderResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/StorageTagResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/StorageTagResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/StorageTagResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/StorageTagResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/SuccessResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SuccessResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/SuccessResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/SuccessResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SystemVmResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/SystemVmResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/SystemVmResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/TemplateResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TrafficMonitorResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/TrafficMonitorResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TrafficTypeResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/TrafficTypeResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UsageRecordResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/UsageRecordResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UsageTypeResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/UsageTypeResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/UserResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UserResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/UserResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/UserResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/UserVmResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VMSnapshotResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/VMSnapshotResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/VMUserDataResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VMUserDataResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/VMUserDataResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/VMUserDataResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/VgpuResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VgpuResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/VgpuResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/VgpuResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VlanIpRangeResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/VlanIpRangeResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/VolumeResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VpcOfferingResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/VpcOfferingResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/VpcResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VpcResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/VpcResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/VpcResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VpnUsersResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/VpnUsersResponse.java diff --git a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ZoneResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java diff --git a/api/src/org/apache/cloudstack/ca/CAManager.java b/api/src/main/java/org/apache/cloudstack/ca/CAManager.java similarity index 100% rename from api/src/org/apache/cloudstack/ca/CAManager.java rename to api/src/main/java/org/apache/cloudstack/ca/CAManager.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/MigrateNetworkCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/MigrateNetworkCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/MigrateVPCCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/MigrateVPCCmd.java diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/user/MoveUserCmd.java similarity index 100% rename from api/src/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/user/MoveUserCmd.java diff --git a/api/src/org/apache/cloudstack/api/response/ChildTemplateResponse.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/response/ChildTemplateResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/api/response/ChildTemplateResponse.java rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/response/ChildTemplateResponse.java diff --git a/api/src/org/apache/cloudstack/direct/download/DirectDownloadManager.java b/api/src/main/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManager.java similarity index 100% rename from api/src/org/apache/cloudstack/direct/download/DirectDownloadManager.java rename to api/src/main/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManager.java diff --git a/api/src/org/apache/cloudstack/config/ApiServiceConfiguration.java b/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java similarity index 100% rename from api/src/org/apache/cloudstack/config/ApiServiceConfiguration.java rename to api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java diff --git a/api/src/org/apache/cloudstack/context/CallContext.java b/api/src/main/java/org/apache/cloudstack/context/CallContext.java similarity index 100% rename from api/src/org/apache/cloudstack/context/CallContext.java rename to api/src/main/java/org/apache/cloudstack/context/CallContext.java diff --git a/api/src/org/apache/cloudstack/context/CallContextListener.java b/api/src/main/java/org/apache/cloudstack/context/CallContextListener.java similarity index 100% rename from api/src/org/apache/cloudstack/context/CallContextListener.java rename to api/src/main/java/org/apache/cloudstack/context/CallContextListener.java diff --git a/api/src/org/apache/cloudstack/context/LogContext.java b/api/src/main/java/org/apache/cloudstack/context/LogContext.java similarity index 100% rename from api/src/org/apache/cloudstack/context/LogContext.java rename to api/src/main/java/org/apache/cloudstack/context/LogContext.java diff --git a/api/src/org/apache/cloudstack/context/LogContextListener.java b/api/src/main/java/org/apache/cloudstack/context/LogContextListener.java similarity index 100% rename from api/src/org/apache/cloudstack/context/LogContextListener.java rename to api/src/main/java/org/apache/cloudstack/context/LogContextListener.java diff --git a/api/src/org/apache/cloudstack/ha/HAConfig.java b/api/src/main/java/org/apache/cloudstack/ha/HAConfig.java similarity index 100% rename from api/src/org/apache/cloudstack/ha/HAConfig.java rename to api/src/main/java/org/apache/cloudstack/ha/HAConfig.java diff --git a/api/src/org/apache/cloudstack/ha/HAConfigManager.java b/api/src/main/java/org/apache/cloudstack/ha/HAConfigManager.java similarity index 100% rename from api/src/org/apache/cloudstack/ha/HAConfigManager.java rename to api/src/main/java/org/apache/cloudstack/ha/HAConfigManager.java diff --git a/api/src/org/apache/cloudstack/ha/HAResource.java b/api/src/main/java/org/apache/cloudstack/ha/HAResource.java similarity index 100% rename from api/src/org/apache/cloudstack/ha/HAResource.java rename to api/src/main/java/org/apache/cloudstack/ha/HAResource.java diff --git a/api/src/org/apache/cloudstack/jobs/JobInfo.java b/api/src/main/java/org/apache/cloudstack/jobs/JobInfo.java similarity index 100% rename from api/src/org/apache/cloudstack/jobs/JobInfo.java rename to api/src/main/java/org/apache/cloudstack/jobs/JobInfo.java diff --git a/api/src/org/apache/cloudstack/kernel/Partition.java b/api/src/main/java/org/apache/cloudstack/kernel/Partition.java similarity index 100% rename from api/src/org/apache/cloudstack/kernel/Partition.java rename to api/src/main/java/org/apache/cloudstack/kernel/Partition.java diff --git a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java b/api/src/main/java/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java similarity index 100% rename from api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java rename to api/src/main/java/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java diff --git a/api/src/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java b/api/src/main/java/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java similarity index 100% rename from api/src/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java rename to api/src/main/java/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java diff --git a/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java b/api/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java similarity index 100% rename from api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java rename to api/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java diff --git a/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerRule.java b/api/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerRule.java similarity index 100% rename from api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerRule.java rename to api/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerRule.java diff --git a/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java b/api/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java similarity index 100% rename from api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java rename to api/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java diff --git a/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java b/api/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java similarity index 100% rename from api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java rename to api/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java diff --git a/api/src/org/apache/cloudstack/network/tls/CertService.java b/api/src/main/java/org/apache/cloudstack/network/tls/CertService.java similarity index 100% rename from api/src/org/apache/cloudstack/network/tls/CertService.java rename to api/src/main/java/org/apache/cloudstack/network/tls/CertService.java diff --git a/api/src/org/apache/cloudstack/network/tls/SslCert.java b/api/src/main/java/org/apache/cloudstack/network/tls/SslCert.java similarity index 100% rename from api/src/org/apache/cloudstack/network/tls/SslCert.java rename to api/src/main/java/org/apache/cloudstack/network/tls/SslCert.java diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagement.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagement.java similarity index 100% rename from api/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagement.java rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagement.java diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementDriver.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementDriver.java similarity index 100% rename from api/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementDriver.java rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementDriver.java diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementService.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementService.java similarity index 100% rename from api/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementService.java rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementService.java diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverChangePasswordCommand.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverChangePasswordCommand.java similarity index 100% rename from api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverChangePasswordCommand.java rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverChangePasswordCommand.java diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverCommand.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverCommand.java similarity index 100% rename from api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverCommand.java rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverCommand.java diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverPowerCommand.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverPowerCommand.java similarity index 100% rename from api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverPowerCommand.java rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverPowerCommand.java diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverResponse.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverResponse.java similarity index 100% rename from api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverResponse.java rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverResponse.java diff --git a/api/src/org/apache/cloudstack/poll/BackgroundPollManager.java b/api/src/main/java/org/apache/cloudstack/poll/BackgroundPollManager.java similarity index 100% rename from api/src/org/apache/cloudstack/poll/BackgroundPollManager.java rename to api/src/main/java/org/apache/cloudstack/poll/BackgroundPollManager.java diff --git a/api/src/org/apache/cloudstack/poll/BackgroundPollTask.java b/api/src/main/java/org/apache/cloudstack/poll/BackgroundPollTask.java similarity index 100% rename from api/src/org/apache/cloudstack/poll/BackgroundPollTask.java rename to api/src/main/java/org/apache/cloudstack/poll/BackgroundPollTask.java diff --git a/api/src/org/apache/cloudstack/query/QueryService.java b/api/src/main/java/org/apache/cloudstack/query/QueryService.java similarity index 100% rename from api/src/org/apache/cloudstack/query/QueryService.java rename to api/src/main/java/org/apache/cloudstack/query/QueryService.java diff --git a/api/src/org/apache/cloudstack/region/PortableIp.java b/api/src/main/java/org/apache/cloudstack/region/PortableIp.java similarity index 100% rename from api/src/org/apache/cloudstack/region/PortableIp.java rename to api/src/main/java/org/apache/cloudstack/region/PortableIp.java diff --git a/api/src/org/apache/cloudstack/region/PortableIpRange.java b/api/src/main/java/org/apache/cloudstack/region/PortableIpRange.java similarity index 100% rename from api/src/org/apache/cloudstack/region/PortableIpRange.java rename to api/src/main/java/org/apache/cloudstack/region/PortableIpRange.java diff --git a/api/src/org/apache/cloudstack/region/Region.java b/api/src/main/java/org/apache/cloudstack/region/Region.java similarity index 100% rename from api/src/org/apache/cloudstack/region/Region.java rename to api/src/main/java/org/apache/cloudstack/region/Region.java diff --git a/api/src/org/apache/cloudstack/region/RegionService.java b/api/src/main/java/org/apache/cloudstack/region/RegionService.java similarity index 100% rename from api/src/org/apache/cloudstack/region/RegionService.java rename to api/src/main/java/org/apache/cloudstack/region/RegionService.java diff --git a/api/src/org/apache/cloudstack/region/RegionSync.java b/api/src/main/java/org/apache/cloudstack/region/RegionSync.java similarity index 100% rename from api/src/org/apache/cloudstack/region/RegionSync.java rename to api/src/main/java/org/apache/cloudstack/region/RegionSync.java diff --git a/api/src/org/apache/cloudstack/usage/Usage.java b/api/src/main/java/org/apache/cloudstack/usage/Usage.java similarity index 100% rename from api/src/org/apache/cloudstack/usage/Usage.java rename to api/src/main/java/org/apache/cloudstack/usage/Usage.java diff --git a/api/src/org/apache/cloudstack/usage/UsageService.java b/api/src/main/java/org/apache/cloudstack/usage/UsageService.java similarity index 100% rename from api/src/org/apache/cloudstack/usage/UsageService.java rename to api/src/main/java/org/apache/cloudstack/usage/UsageService.java diff --git a/api/src/org/apache/cloudstack/usage/UsageTypes.java b/api/src/main/java/org/apache/cloudstack/usage/UsageTypes.java similarity index 100% rename from api/src/org/apache/cloudstack/usage/UsageTypes.java rename to api/src/main/java/org/apache/cloudstack/usage/UsageTypes.java diff --git a/api/resources/META-INF/cloudstack/api-config/module.properties b/api/src/main/resources/META-INF/cloudstack/api-config/module.properties similarity index 100% rename from api/resources/META-INF/cloudstack/api-config/module.properties rename to api/src/main/resources/META-INF/cloudstack/api-config/module.properties diff --git a/api/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml b/api/src/main/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml similarity index 100% rename from api/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml rename to api/src/main/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml diff --git a/api/resources/META-INF/cloudstack/api-planner/module.properties b/api/src/main/resources/META-INF/cloudstack/api-planner/module.properties similarity index 100% rename from api/resources/META-INF/cloudstack/api-planner/module.properties rename to api/src/main/resources/META-INF/cloudstack/api-planner/module.properties diff --git a/api/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml b/api/src/main/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml similarity index 100% rename from api/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml rename to api/src/main/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml diff --git a/api/test/com/cloud/network/IsolationMethodTest.java b/api/src/test/java/com/cloud/network/IsolationMethodTest.java similarity index 100% rename from api/test/com/cloud/network/IsolationMethodTest.java rename to api/src/test/java/com/cloud/network/IsolationMethodTest.java diff --git a/api/test/com/cloud/network/NetworksTest.java b/api/src/test/java/com/cloud/network/NetworksTest.java similarity index 100% rename from api/test/com/cloud/network/NetworksTest.java rename to api/src/test/java/com/cloud/network/NetworksTest.java diff --git a/api/test/com/cloud/storage/StorageTest.java b/api/src/test/java/com/cloud/storage/StorageTest.java similarity index 100% rename from api/test/com/cloud/storage/StorageTest.java rename to api/src/test/java/com/cloud/storage/StorageTest.java diff --git a/api/test/org/apache/cloudstack/acl/RoleTypeTest.java b/api/src/test/java/org/apache/cloudstack/acl/RoleTypeTest.java similarity index 100% rename from api/test/org/apache/cloudstack/acl/RoleTypeTest.java rename to api/src/test/java/org/apache/cloudstack/acl/RoleTypeTest.java diff --git a/api/test/org/apache/cloudstack/acl/RuleTest.java b/api/src/test/java/org/apache/cloudstack/acl/RuleTest.java similarity index 100% rename from api/test/org/apache/cloudstack/acl/RuleTest.java rename to api/src/test/java/org/apache/cloudstack/acl/RuleTest.java diff --git a/api/test/org/apache/cloudstack/api/ApiCmdTestUtil.java b/api/src/test/java/org/apache/cloudstack/api/ApiCmdTestUtil.java similarity index 100% rename from api/test/org/apache/cloudstack/api/ApiCmdTestUtil.java rename to api/src/test/java/org/apache/cloudstack/api/ApiCmdTestUtil.java diff --git a/api/test/org/apache/cloudstack/api/BaseCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/BaseCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/BaseCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/BaseCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/admin/account/CreateAccountCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/admin/account/CreateAccountCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/admin/user/CreateUserCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/admin/user/CreateUserCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/AddClusterCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddClusterCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/AddClusterCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddClusterCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/AddHostCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddHostCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/AddHostCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddHostCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/RegionCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/RegionCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/UpdateHostPasswordCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateHostPasswordCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/UpdateHostPasswordCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/UpdateHostPasswordCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/UpdateVmNicIpTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateVmNicIpTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/UpdateVmNicIpTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/UpdateVmNicIpTest.java diff --git a/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/UsageCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/UsageCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdByAdminTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdByAdminTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdByAdminTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdByAdminTest.java diff --git a/api/test/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdByAdminTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdByAdminTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdByAdminTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdByAdminTest.java diff --git a/api/test/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdTest.java diff --git a/api/test/org/apache/cloudstack/api/response/HostResponseTest.java b/api/src/test/java/org/apache/cloudstack/api/response/HostResponseTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/response/HostResponseTest.java rename to api/src/test/java/org/apache/cloudstack/api/response/HostResponseTest.java diff --git a/api/test/org/apache/cloudstack/context/CallContextTest.java b/api/src/test/java/org/apache/cloudstack/context/CallContextTest.java similarity index 100% rename from api/test/org/apache/cloudstack/context/CallContextTest.java rename to api/src/test/java/org/apache/cloudstack/context/CallContextTest.java diff --git a/api/test/org/apache/cloudstack/test/utils/SpringUtils.java b/api/src/test/java/org/apache/cloudstack/test/utils/SpringUtils.java similarity index 100% rename from api/test/org/apache/cloudstack/test/utils/SpringUtils.java rename to api/src/test/java/org/apache/cloudstack/test/utils/SpringUtils.java diff --git a/client/pom.xml b/client/pom.xml index f492030689ae..5620336e054d 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -558,7 +558,7 @@ - + @@ -646,7 +646,7 @@ replace="classpath:nonossComponentContext.xml" byline="true"/> - + diff --git a/client/src/org/apache/cloudstack/ServerDaemon.java b/client/src/main/java/org/apache/cloudstack/ServerDaemon.java similarity index 100% rename from client/src/org/apache/cloudstack/ServerDaemon.java rename to client/src/main/java/org/apache/cloudstack/ServerDaemon.java diff --git a/client/resources/META-INF/cloudstack/webApplicationContext.xml b/client/src/main/resources/META-INF/cloudstack/webApplicationContext.xml similarity index 100% rename from client/resources/META-INF/cloudstack/webApplicationContext.xml rename to client/src/main/resources/META-INF/cloudstack/webApplicationContext.xml diff --git a/client/WEB-INF/web.xml b/client/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from client/WEB-INF/web.xml rename to client/src/main/webapp/WEB-INF/web.xml diff --git a/core/src/com/cloud/agent/IAgentControl.java b/core/src/main/java/com/cloud/agent/IAgentControl.java similarity index 100% rename from core/src/com/cloud/agent/IAgentControl.java rename to core/src/main/java/com/cloud/agent/IAgentControl.java diff --git a/core/src/com/cloud/agent/IAgentControlListener.java b/core/src/main/java/com/cloud/agent/IAgentControlListener.java similarity index 100% rename from core/src/com/cloud/agent/IAgentControlListener.java rename to core/src/main/java/com/cloud/agent/IAgentControlListener.java diff --git a/core/src/com/cloud/agent/StartupCommandProcessor.java b/core/src/main/java/com/cloud/agent/StartupCommandProcessor.java similarity index 100% rename from core/src/com/cloud/agent/StartupCommandProcessor.java rename to core/src/main/java/com/cloud/agent/StartupCommandProcessor.java diff --git a/core/src/com/cloud/agent/api/AgentControlAnswer.java b/core/src/main/java/com/cloud/agent/api/AgentControlAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/AgentControlAnswer.java rename to core/src/main/java/com/cloud/agent/api/AgentControlAnswer.java diff --git a/core/src/com/cloud/agent/api/AgentControlCommand.java b/core/src/main/java/com/cloud/agent/api/AgentControlCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/AgentControlCommand.java rename to core/src/main/java/com/cloud/agent/api/AgentControlCommand.java diff --git a/core/src/com/cloud/agent/api/AttachIsoAnswer.java b/core/src/main/java/com/cloud/agent/api/AttachIsoAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/AttachIsoAnswer.java rename to core/src/main/java/com/cloud/agent/api/AttachIsoAnswer.java diff --git a/core/src/com/cloud/agent/api/AttachIsoCommand.java b/core/src/main/java/com/cloud/agent/api/AttachIsoCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/AttachIsoCommand.java rename to core/src/main/java/com/cloud/agent/api/AttachIsoCommand.java diff --git a/core/src/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java b/core/src/main/java/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java rename to core/src/main/java/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java diff --git a/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java b/core/src/main/java/com/cloud/agent/api/BackupSnapshotAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/BackupSnapshotAnswer.java rename to core/src/main/java/com/cloud/agent/api/BackupSnapshotAnswer.java diff --git a/core/src/com/cloud/agent/api/BackupSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/BackupSnapshotCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/BackupSnapshotCommand.java rename to core/src/main/java/com/cloud/agent/api/BackupSnapshotCommand.java diff --git a/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java b/core/src/main/java/com/cloud/agent/api/BumpUpPriorityCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/BumpUpPriorityCommand.java rename to core/src/main/java/com/cloud/agent/api/BumpUpPriorityCommand.java diff --git a/core/src/com/cloud/agent/api/CancelCommand.java b/core/src/main/java/com/cloud/agent/api/CancelCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CancelCommand.java rename to core/src/main/java/com/cloud/agent/api/CancelCommand.java diff --git a/core/src/com/cloud/agent/api/ChangeAgentAnswer.java b/core/src/main/java/com/cloud/agent/api/ChangeAgentAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/ChangeAgentAnswer.java rename to core/src/main/java/com/cloud/agent/api/ChangeAgentAnswer.java diff --git a/core/src/com/cloud/agent/api/ChangeAgentCommand.java b/core/src/main/java/com/cloud/agent/api/ChangeAgentCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ChangeAgentCommand.java rename to core/src/main/java/com/cloud/agent/api/ChangeAgentCommand.java diff --git a/core/src/com/cloud/agent/api/CheckHealthAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckHealthAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckHealthAnswer.java rename to core/src/main/java/com/cloud/agent/api/CheckHealthAnswer.java diff --git a/core/src/com/cloud/agent/api/CheckHealthCommand.java b/core/src/main/java/com/cloud/agent/api/CheckHealthCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckHealthCommand.java rename to core/src/main/java/com/cloud/agent/api/CheckHealthCommand.java diff --git a/core/src/com/cloud/agent/api/CheckNetworkAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckNetworkAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckNetworkAnswer.java rename to core/src/main/java/com/cloud/agent/api/CheckNetworkAnswer.java diff --git a/core/src/com/cloud/agent/api/CheckNetworkCommand.java b/core/src/main/java/com/cloud/agent/api/CheckNetworkCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckNetworkCommand.java rename to core/src/main/java/com/cloud/agent/api/CheckNetworkCommand.java diff --git a/core/src/com/cloud/agent/api/CheckOnHostAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckOnHostAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckOnHostAnswer.java rename to core/src/main/java/com/cloud/agent/api/CheckOnHostAnswer.java diff --git a/core/src/com/cloud/agent/api/CheckOnHostCommand.java b/core/src/main/java/com/cloud/agent/api/CheckOnHostCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckOnHostCommand.java rename to core/src/main/java/com/cloud/agent/api/CheckOnHostCommand.java diff --git a/core/src/com/cloud/agent/api/CheckRouterAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckRouterAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckRouterAnswer.java rename to core/src/main/java/com/cloud/agent/api/CheckRouterAnswer.java diff --git a/core/src/com/cloud/agent/api/CheckRouterCommand.java b/core/src/main/java/com/cloud/agent/api/CheckRouterCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckRouterCommand.java rename to core/src/main/java/com/cloud/agent/api/CheckRouterCommand.java diff --git a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java rename to core/src/main/java/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java diff --git a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java b/core/src/main/java/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java rename to core/src/main/java/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java diff --git a/core/src/com/cloud/agent/api/CheckStateAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckStateAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckStateAnswer.java rename to core/src/main/java/com/cloud/agent/api/CheckStateAnswer.java diff --git a/core/src/com/cloud/agent/api/CheckStateCommand.java b/core/src/main/java/com/cloud/agent/api/CheckStateCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckStateCommand.java rename to core/src/main/java/com/cloud/agent/api/CheckStateCommand.java diff --git a/core/src/com/cloud/agent/api/CheckVMActivityOnStoragePoolCommand.java b/core/src/main/java/com/cloud/agent/api/CheckVMActivityOnStoragePoolCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckVMActivityOnStoragePoolCommand.java rename to core/src/main/java/com/cloud/agent/api/CheckVMActivityOnStoragePoolCommand.java diff --git a/core/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckVirtualMachineAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java rename to core/src/main/java/com/cloud/agent/api/CheckVirtualMachineAnswer.java diff --git a/core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java b/core/src/main/java/com/cloud/agent/api/CheckVirtualMachineCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java rename to core/src/main/java/com/cloud/agent/api/CheckVirtualMachineCommand.java diff --git a/core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java b/core/src/main/java/com/cloud/agent/api/CleanupNetworkRulesCmd.java similarity index 100% rename from core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java rename to core/src/main/java/com/cloud/agent/api/CleanupNetworkRulesCmd.java diff --git a/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java b/core/src/main/java/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java rename to core/src/main/java/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java diff --git a/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java b/core/src/main/java/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java rename to core/src/main/java/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java diff --git a/core/src/com/cloud/agent/api/ComputeChecksumCommand.java b/core/src/main/java/com/cloud/agent/api/ComputeChecksumCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ComputeChecksumCommand.java rename to core/src/main/java/com/cloud/agent/api/ComputeChecksumCommand.java diff --git a/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java b/core/src/main/java/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java rename to core/src/main/java/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java diff --git a/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java b/core/src/main/java/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java rename to core/src/main/java/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java diff --git a/core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java b/core/src/main/java/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java rename to core/src/main/java/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java rename to core/src/main/java/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java b/core/src/main/java/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java rename to core/src/main/java/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java diff --git a/core/src/com/cloud/agent/api/CreateStoragePoolCommand.java b/core/src/main/java/com/cloud/agent/api/CreateStoragePoolCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CreateStoragePoolCommand.java rename to core/src/main/java/com/cloud/agent/api/CreateStoragePoolCommand.java diff --git a/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java b/core/src/main/java/com/cloud/agent/api/CreateVMSnapshotAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java rename to core/src/main/java/com/cloud/agent/api/CreateVMSnapshotAnswer.java diff --git a/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/CreateVMSnapshotCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java rename to core/src/main/java/com/cloud/agent/api/CreateVMSnapshotCommand.java diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java b/core/src/main/java/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java rename to core/src/main/java/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java rename to core/src/main/java/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java b/core/src/main/java/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java rename to core/src/main/java/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java rename to core/src/main/java/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java diff --git a/core/src/com/cloud/agent/api/CronCommand.java b/core/src/main/java/com/cloud/agent/api/CronCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/CronCommand.java rename to core/src/main/java/com/cloud/agent/api/CronCommand.java diff --git a/core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java b/core/src/main/java/com/cloud/agent/api/DeleteSnapshotsDirCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java rename to core/src/main/java/com/cloud/agent/api/DeleteSnapshotsDirCommand.java diff --git a/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java b/core/src/main/java/com/cloud/agent/api/DeleteStoragePoolCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java rename to core/src/main/java/com/cloud/agent/api/DeleteStoragePoolCommand.java diff --git a/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java b/core/src/main/java/com/cloud/agent/api/DeleteVMSnapshotAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java rename to core/src/main/java/com/cloud/agent/api/DeleteVMSnapshotAnswer.java diff --git a/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/DeleteVMSnapshotCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java rename to core/src/main/java/com/cloud/agent/api/DeleteVMSnapshotCommand.java diff --git a/core/src/com/cloud/agent/api/DirectNetworkUsageAnswer.java b/core/src/main/java/com/cloud/agent/api/DirectNetworkUsageAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/DirectNetworkUsageAnswer.java rename to core/src/main/java/com/cloud/agent/api/DirectNetworkUsageAnswer.java diff --git a/core/src/com/cloud/agent/api/DirectNetworkUsageCommand.java b/core/src/main/java/com/cloud/agent/api/DirectNetworkUsageCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/DirectNetworkUsageCommand.java rename to core/src/main/java/com/cloud/agent/api/DirectNetworkUsageCommand.java diff --git a/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java b/core/src/main/java/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java rename to core/src/main/java/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java diff --git a/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java b/core/src/main/java/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java rename to core/src/main/java/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java diff --git a/core/src/com/cloud/agent/api/FenceAnswer.java b/core/src/main/java/com/cloud/agent/api/FenceAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/FenceAnswer.java rename to core/src/main/java/com/cloud/agent/api/FenceAnswer.java diff --git a/core/src/com/cloud/agent/api/FenceCommand.java b/core/src/main/java/com/cloud/agent/api/FenceCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/FenceCommand.java rename to core/src/main/java/com/cloud/agent/api/FenceCommand.java diff --git a/core/src/com/cloud/agent/api/GetDomRVersionAnswer.java b/core/src/main/java/com/cloud/agent/api/GetDomRVersionAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/GetDomRVersionAnswer.java rename to core/src/main/java/com/cloud/agent/api/GetDomRVersionAnswer.java diff --git a/core/src/com/cloud/agent/api/GetDomRVersionCmd.java b/core/src/main/java/com/cloud/agent/api/GetDomRVersionCmd.java similarity index 100% rename from core/src/com/cloud/agent/api/GetDomRVersionCmd.java rename to core/src/main/java/com/cloud/agent/api/GetDomRVersionCmd.java diff --git a/core/src/com/cloud/agent/api/GetGPUStatsAnswer.java b/core/src/main/java/com/cloud/agent/api/GetGPUStatsAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/GetGPUStatsAnswer.java rename to core/src/main/java/com/cloud/agent/api/GetGPUStatsAnswer.java diff --git a/core/src/com/cloud/agent/api/GetGPUStatsCommand.java b/core/src/main/java/com/cloud/agent/api/GetGPUStatsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/GetGPUStatsCommand.java rename to core/src/main/java/com/cloud/agent/api/GetGPUStatsCommand.java diff --git a/core/src/com/cloud/agent/api/GetHostStatsAnswer.java b/core/src/main/java/com/cloud/agent/api/GetHostStatsAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/GetHostStatsAnswer.java rename to core/src/main/java/com/cloud/agent/api/GetHostStatsAnswer.java diff --git a/core/src/com/cloud/agent/api/GetHostStatsCommand.java b/core/src/main/java/com/cloud/agent/api/GetHostStatsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/GetHostStatsCommand.java rename to core/src/main/java/com/cloud/agent/api/GetHostStatsCommand.java diff --git a/core/src/com/cloud/agent/api/GetRouterAlertsAnswer.java b/core/src/main/java/com/cloud/agent/api/GetRouterAlertsAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/GetRouterAlertsAnswer.java rename to core/src/main/java/com/cloud/agent/api/GetRouterAlertsAnswer.java diff --git a/core/src/com/cloud/agent/api/GetStorageStatsAnswer.java b/core/src/main/java/com/cloud/agent/api/GetStorageStatsAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/GetStorageStatsAnswer.java rename to core/src/main/java/com/cloud/agent/api/GetStorageStatsAnswer.java diff --git a/core/src/com/cloud/agent/api/GetStorageStatsCommand.java b/core/src/main/java/com/cloud/agent/api/GetStorageStatsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/GetStorageStatsCommand.java rename to core/src/main/java/com/cloud/agent/api/GetStorageStatsCommand.java diff --git a/core/src/com/cloud/agent/api/GetVmConfigAnswer.java b/core/src/main/java/com/cloud/agent/api/GetVmConfigAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/GetVmConfigAnswer.java rename to core/src/main/java/com/cloud/agent/api/GetVmConfigAnswer.java diff --git a/core/src/com/cloud/agent/api/GetVmConfigCommand.java b/core/src/main/java/com/cloud/agent/api/GetVmConfigCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/GetVmConfigCommand.java rename to core/src/main/java/com/cloud/agent/api/GetVmConfigCommand.java diff --git a/core/src/com/cloud/agent/api/GetVmDiskStatsAnswer.java b/core/src/main/java/com/cloud/agent/api/GetVmDiskStatsAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/GetVmDiskStatsAnswer.java rename to core/src/main/java/com/cloud/agent/api/GetVmDiskStatsAnswer.java diff --git a/core/src/com/cloud/agent/api/GetVmDiskStatsCommand.java b/core/src/main/java/com/cloud/agent/api/GetVmDiskStatsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/GetVmDiskStatsCommand.java rename to core/src/main/java/com/cloud/agent/api/GetVmDiskStatsCommand.java diff --git a/core/src/com/cloud/agent/api/GetVmIpAddressCommand.java b/core/src/main/java/com/cloud/agent/api/GetVmIpAddressCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/GetVmIpAddressCommand.java rename to core/src/main/java/com/cloud/agent/api/GetVmIpAddressCommand.java diff --git a/core/src/com/cloud/agent/api/GetVmNetworkStatsAnswer.java b/core/src/main/java/com/cloud/agent/api/GetVmNetworkStatsAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/GetVmNetworkStatsAnswer.java rename to core/src/main/java/com/cloud/agent/api/GetVmNetworkStatsAnswer.java diff --git a/core/src/com/cloud/agent/api/GetVmNetworkStatsCommand.java b/core/src/main/java/com/cloud/agent/api/GetVmNetworkStatsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/GetVmNetworkStatsCommand.java rename to core/src/main/java/com/cloud/agent/api/GetVmNetworkStatsCommand.java diff --git a/core/src/com/cloud/agent/api/GetVmStatsAnswer.java b/core/src/main/java/com/cloud/agent/api/GetVmStatsAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/GetVmStatsAnswer.java rename to core/src/main/java/com/cloud/agent/api/GetVmStatsAnswer.java diff --git a/core/src/com/cloud/agent/api/GetVmStatsCommand.java b/core/src/main/java/com/cloud/agent/api/GetVmStatsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/GetVmStatsCommand.java rename to core/src/main/java/com/cloud/agent/api/GetVmStatsCommand.java diff --git a/core/src/com/cloud/agent/api/GetVncPortAnswer.java b/core/src/main/java/com/cloud/agent/api/GetVncPortAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/GetVncPortAnswer.java rename to core/src/main/java/com/cloud/agent/api/GetVncPortAnswer.java diff --git a/core/src/com/cloud/agent/api/GetVncPortCommand.java b/core/src/main/java/com/cloud/agent/api/GetVncPortCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/GetVncPortCommand.java rename to core/src/main/java/com/cloud/agent/api/GetVncPortCommand.java diff --git a/core/src/com/cloud/agent/api/GetVolumeStatsAnswer.java b/core/src/main/java/com/cloud/agent/api/GetVolumeStatsAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/GetVolumeStatsAnswer.java rename to core/src/main/java/com/cloud/agent/api/GetVolumeStatsAnswer.java diff --git a/core/src/com/cloud/agent/api/GetVolumeStatsCommand.java b/core/src/main/java/com/cloud/agent/api/GetVolumeStatsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/GetVolumeStatsCommand.java rename to core/src/main/java/com/cloud/agent/api/GetVolumeStatsCommand.java diff --git a/core/src/com/cloud/agent/api/HandleConfigDriveIsoCommand.java b/core/src/main/java/com/cloud/agent/api/HandleConfigDriveIsoCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/HandleConfigDriveIsoCommand.java rename to core/src/main/java/com/cloud/agent/api/HandleConfigDriveIsoCommand.java diff --git a/core/src/com/cloud/agent/api/HostStatsEntry.java b/core/src/main/java/com/cloud/agent/api/HostStatsEntry.java similarity index 100% rename from core/src/com/cloud/agent/api/HostStatsEntry.java rename to core/src/main/java/com/cloud/agent/api/HostStatsEntry.java diff --git a/core/src/com/cloud/agent/api/MaintainAnswer.java b/core/src/main/java/com/cloud/agent/api/MaintainAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/MaintainAnswer.java rename to core/src/main/java/com/cloud/agent/api/MaintainAnswer.java diff --git a/core/src/com/cloud/agent/api/MaintainCommand.java b/core/src/main/java/com/cloud/agent/api/MaintainCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/MaintainCommand.java rename to core/src/main/java/com/cloud/agent/api/MaintainCommand.java diff --git a/core/src/com/cloud/agent/api/ManageSnapshotAnswer.java b/core/src/main/java/com/cloud/agent/api/ManageSnapshotAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/ManageSnapshotAnswer.java rename to core/src/main/java/com/cloud/agent/api/ManageSnapshotAnswer.java diff --git a/core/src/com/cloud/agent/api/ManageSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/ManageSnapshotCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ManageSnapshotCommand.java rename to core/src/main/java/com/cloud/agent/api/ManageSnapshotCommand.java diff --git a/core/src/com/cloud/agent/api/MigrateAnswer.java b/core/src/main/java/com/cloud/agent/api/MigrateAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/MigrateAnswer.java rename to core/src/main/java/com/cloud/agent/api/MigrateAnswer.java diff --git a/core/src/com/cloud/agent/api/MigrateCommand.java b/core/src/main/java/com/cloud/agent/api/MigrateCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/MigrateCommand.java rename to core/src/main/java/com/cloud/agent/api/MigrateCommand.java diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageAnswer.java b/core/src/main/java/com/cloud/agent/api/MigrateWithStorageAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/MigrateWithStorageAnswer.java rename to core/src/main/java/com/cloud/agent/api/MigrateWithStorageAnswer.java diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java b/core/src/main/java/com/cloud/agent/api/MigrateWithStorageCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/MigrateWithStorageCommand.java rename to core/src/main/java/com/cloud/agent/api/MigrateWithStorageCommand.java diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java b/core/src/main/java/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java rename to core/src/main/java/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java b/core/src/main/java/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java rename to core/src/main/java/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java b/core/src/main/java/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java rename to core/src/main/java/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java b/core/src/main/java/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java rename to core/src/main/java/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java b/core/src/main/java/com/cloud/agent/api/MigrateWithStorageSendAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java rename to core/src/main/java/com/cloud/agent/api/MigrateWithStorageSendAnswer.java diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java b/core/src/main/java/com/cloud/agent/api/MigrateWithStorageSendCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java rename to core/src/main/java/com/cloud/agent/api/MigrateWithStorageSendCommand.java diff --git a/core/src/com/cloud/agent/api/ModifySshKeysCommand.java b/core/src/main/java/com/cloud/agent/api/ModifySshKeysCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ModifySshKeysCommand.java rename to core/src/main/java/com/cloud/agent/api/ModifySshKeysCommand.java diff --git a/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java b/core/src/main/java/com/cloud/agent/api/ModifyStoragePoolAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java rename to core/src/main/java/com/cloud/agent/api/ModifyStoragePoolAnswer.java diff --git a/core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java b/core/src/main/java/com/cloud/agent/api/ModifyStoragePoolCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java rename to core/src/main/java/com/cloud/agent/api/ModifyStoragePoolCommand.java diff --git a/core/src/com/cloud/agent/api/ModifyTargetsAnswer.java b/core/src/main/java/com/cloud/agent/api/ModifyTargetsAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/ModifyTargetsAnswer.java rename to core/src/main/java/com/cloud/agent/api/ModifyTargetsAnswer.java diff --git a/core/src/com/cloud/agent/api/ModifyTargetsCommand.java b/core/src/main/java/com/cloud/agent/api/ModifyTargetsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ModifyTargetsCommand.java rename to core/src/main/java/com/cloud/agent/api/ModifyTargetsCommand.java diff --git a/core/src/com/cloud/agent/api/ModifyVmNicConfigAnswer.java b/core/src/main/java/com/cloud/agent/api/ModifyVmNicConfigAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/ModifyVmNicConfigAnswer.java rename to core/src/main/java/com/cloud/agent/api/ModifyVmNicConfigAnswer.java diff --git a/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java b/core/src/main/java/com/cloud/agent/api/ModifyVmNicConfigCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java rename to core/src/main/java/com/cloud/agent/api/ModifyVmNicConfigCommand.java diff --git a/core/src/com/cloud/agent/api/NetScalerImplementNetworkCommand.java b/core/src/main/java/com/cloud/agent/api/NetScalerImplementNetworkCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/NetScalerImplementNetworkCommand.java rename to core/src/main/java/com/cloud/agent/api/NetScalerImplementNetworkCommand.java diff --git a/core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java b/core/src/main/java/com/cloud/agent/api/NetworkRulesSystemVmCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java rename to core/src/main/java/com/cloud/agent/api/NetworkRulesSystemVmCommand.java diff --git a/core/src/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java b/core/src/main/java/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java rename to core/src/main/java/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java diff --git a/core/src/com/cloud/agent/api/NetworkUsageAnswer.java b/core/src/main/java/com/cloud/agent/api/NetworkUsageAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/NetworkUsageAnswer.java rename to core/src/main/java/com/cloud/agent/api/NetworkUsageAnswer.java diff --git a/core/src/com/cloud/agent/api/NetworkUsageCommand.java b/core/src/main/java/com/cloud/agent/api/NetworkUsageCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/NetworkUsageCommand.java rename to core/src/main/java/com/cloud/agent/api/NetworkUsageCommand.java diff --git a/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java b/core/src/main/java/com/cloud/agent/api/PerformanceMonitorAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java rename to core/src/main/java/com/cloud/agent/api/PerformanceMonitorAnswer.java diff --git a/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java b/core/src/main/java/com/cloud/agent/api/PerformanceMonitorCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/PerformanceMonitorCommand.java rename to core/src/main/java/com/cloud/agent/api/PerformanceMonitorCommand.java diff --git a/core/src/com/cloud/agent/api/PingAnswer.java b/core/src/main/java/com/cloud/agent/api/PingAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/PingAnswer.java rename to core/src/main/java/com/cloud/agent/api/PingAnswer.java diff --git a/core/src/com/cloud/agent/api/PingCommand.java b/core/src/main/java/com/cloud/agent/api/PingCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/PingCommand.java rename to core/src/main/java/com/cloud/agent/api/PingCommand.java diff --git a/core/src/com/cloud/agent/api/PingRoutingCommand.java b/core/src/main/java/com/cloud/agent/api/PingRoutingCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/PingRoutingCommand.java rename to core/src/main/java/com/cloud/agent/api/PingRoutingCommand.java diff --git a/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java b/core/src/main/java/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java rename to core/src/main/java/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java diff --git a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java b/core/src/main/java/com/cloud/agent/api/PingRoutingWithOvsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java rename to core/src/main/java/com/cloud/agent/api/PingRoutingWithOvsCommand.java diff --git a/core/src/com/cloud/agent/api/PingStorageCommand.java b/core/src/main/java/com/cloud/agent/api/PingStorageCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/PingStorageCommand.java rename to core/src/main/java/com/cloud/agent/api/PingStorageCommand.java diff --git a/core/src/com/cloud/agent/api/PingTestCommand.java b/core/src/main/java/com/cloud/agent/api/PingTestCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/PingTestCommand.java rename to core/src/main/java/com/cloud/agent/api/PingTestCommand.java diff --git a/core/src/com/cloud/agent/api/PlugNicAnswer.java b/core/src/main/java/com/cloud/agent/api/PlugNicAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/PlugNicAnswer.java rename to core/src/main/java/com/cloud/agent/api/PlugNicAnswer.java diff --git a/core/src/com/cloud/agent/api/PlugNicCommand.java b/core/src/main/java/com/cloud/agent/api/PlugNicCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/PlugNicCommand.java rename to core/src/main/java/com/cloud/agent/api/PlugNicCommand.java diff --git a/core/src/com/cloud/agent/api/PrepareForMigrationAnswer.java b/core/src/main/java/com/cloud/agent/api/PrepareForMigrationAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/PrepareForMigrationAnswer.java rename to core/src/main/java/com/cloud/agent/api/PrepareForMigrationAnswer.java diff --git a/core/src/com/cloud/agent/api/PrepareForMigrationCommand.java b/core/src/main/java/com/cloud/agent/api/PrepareForMigrationCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/PrepareForMigrationCommand.java rename to core/src/main/java/com/cloud/agent/api/PrepareForMigrationCommand.java diff --git a/core/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java b/core/src/main/java/com/cloud/agent/api/PrepareOCFS2NodesCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java rename to core/src/main/java/com/cloud/agent/api/PrepareOCFS2NodesCommand.java diff --git a/core/src/com/cloud/agent/api/PropagateResourceEventCommand.java b/core/src/main/java/com/cloud/agent/api/PropagateResourceEventCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/PropagateResourceEventCommand.java rename to core/src/main/java/com/cloud/agent/api/PropagateResourceEventCommand.java diff --git a/core/src/com/cloud/agent/api/ReadyAnswer.java b/core/src/main/java/com/cloud/agent/api/ReadyAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/ReadyAnswer.java rename to core/src/main/java/com/cloud/agent/api/ReadyAnswer.java diff --git a/core/src/com/cloud/agent/api/ReadyCommand.java b/core/src/main/java/com/cloud/agent/api/ReadyCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ReadyCommand.java rename to core/src/main/java/com/cloud/agent/api/ReadyCommand.java diff --git a/core/src/com/cloud/agent/api/RebootAnswer.java b/core/src/main/java/com/cloud/agent/api/RebootAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/RebootAnswer.java rename to core/src/main/java/com/cloud/agent/api/RebootAnswer.java diff --git a/core/src/com/cloud/agent/api/RebootCommand.java b/core/src/main/java/com/cloud/agent/api/RebootCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/RebootCommand.java rename to core/src/main/java/com/cloud/agent/api/RebootCommand.java diff --git a/core/src/com/cloud/agent/api/RebootRouterCommand.java b/core/src/main/java/com/cloud/agent/api/RebootRouterCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/RebootRouterCommand.java rename to core/src/main/java/com/cloud/agent/api/RebootRouterCommand.java diff --git a/core/src/com/cloud/agent/api/RecurringNetworkUsageAnswer.java b/core/src/main/java/com/cloud/agent/api/RecurringNetworkUsageAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/RecurringNetworkUsageAnswer.java rename to core/src/main/java/com/cloud/agent/api/RecurringNetworkUsageAnswer.java diff --git a/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java b/core/src/main/java/com/cloud/agent/api/RecurringNetworkUsageCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java rename to core/src/main/java/com/cloud/agent/api/RecurringNetworkUsageCommand.java diff --git a/core/src/com/cloud/agent/api/RestoreVMSnapshotAnswer.java b/core/src/main/java/com/cloud/agent/api/RestoreVMSnapshotAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/RestoreVMSnapshotAnswer.java rename to core/src/main/java/com/cloud/agent/api/RestoreVMSnapshotAnswer.java diff --git a/core/src/com/cloud/agent/api/RestoreVMSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/RestoreVMSnapshotCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/RestoreVMSnapshotCommand.java rename to core/src/main/java/com/cloud/agent/api/RestoreVMSnapshotCommand.java diff --git a/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java b/core/src/main/java/com/cloud/agent/api/RevertToVMSnapshotAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java rename to core/src/main/java/com/cloud/agent/api/RevertToVMSnapshotAnswer.java diff --git a/core/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/RevertToVMSnapshotCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java rename to core/src/main/java/com/cloud/agent/api/RevertToVMSnapshotCommand.java diff --git a/core/src/com/cloud/agent/api/ScaleVmAnswer.java b/core/src/main/java/com/cloud/agent/api/ScaleVmAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/ScaleVmAnswer.java rename to core/src/main/java/com/cloud/agent/api/ScaleVmAnswer.java diff --git a/core/src/com/cloud/agent/api/ScaleVmCommand.java b/core/src/main/java/com/cloud/agent/api/ScaleVmCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ScaleVmCommand.java rename to core/src/main/java/com/cloud/agent/api/ScaleVmCommand.java diff --git a/core/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java b/core/src/main/java/com/cloud/agent/api/ScheduleHostScanTaskCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java rename to core/src/main/java/com/cloud/agent/api/ScheduleHostScanTaskCommand.java diff --git a/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java b/core/src/main/java/com/cloud/agent/api/SecStorageFirewallCfgCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java rename to core/src/main/java/com/cloud/agent/api/SecStorageFirewallCfgCommand.java diff --git a/core/src/com/cloud/agent/api/SecStorageSetupAnswer.java b/core/src/main/java/com/cloud/agent/api/SecStorageSetupAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/SecStorageSetupAnswer.java rename to core/src/main/java/com/cloud/agent/api/SecStorageSetupAnswer.java diff --git a/core/src/com/cloud/agent/api/SecStorageSetupCommand.java b/core/src/main/java/com/cloud/agent/api/SecStorageSetupCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/SecStorageSetupCommand.java rename to core/src/main/java/com/cloud/agent/api/SecStorageSetupCommand.java diff --git a/core/src/com/cloud/agent/api/SecStorageVMSetupCommand.java b/core/src/main/java/com/cloud/agent/api/SecStorageVMSetupCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/SecStorageVMSetupCommand.java rename to core/src/main/java/com/cloud/agent/api/SecStorageVMSetupCommand.java diff --git a/core/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java b/core/src/main/java/com/cloud/agent/api/SecurityGroupRuleAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java rename to core/src/main/java/com/cloud/agent/api/SecurityGroupRuleAnswer.java diff --git a/core/src/com/cloud/agent/api/SecurityGroupRulesCmd.java b/core/src/main/java/com/cloud/agent/api/SecurityGroupRulesCmd.java similarity index 100% rename from core/src/com/cloud/agent/api/SecurityGroupRulesCmd.java rename to core/src/main/java/com/cloud/agent/api/SecurityGroupRulesCmd.java diff --git a/core/src/com/cloud/agent/api/SetHostParamsCommand.java b/core/src/main/java/com/cloud/agent/api/SetHostParamsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/SetHostParamsCommand.java rename to core/src/main/java/com/cloud/agent/api/SetHostParamsCommand.java diff --git a/core/src/com/cloud/agent/api/SetupAnswer.java b/core/src/main/java/com/cloud/agent/api/SetupAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/SetupAnswer.java rename to core/src/main/java/com/cloud/agent/api/SetupAnswer.java diff --git a/core/src/com/cloud/agent/api/SetupCommand.java b/core/src/main/java/com/cloud/agent/api/SetupCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/SetupCommand.java rename to core/src/main/java/com/cloud/agent/api/SetupCommand.java diff --git a/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java b/core/src/main/java/com/cloud/agent/api/SetupGuestNetworkCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java rename to core/src/main/java/com/cloud/agent/api/SetupGuestNetworkCommand.java diff --git a/core/src/com/cloud/agent/api/ShutdownCommand.java b/core/src/main/java/com/cloud/agent/api/ShutdownCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ShutdownCommand.java rename to core/src/main/java/com/cloud/agent/api/ShutdownCommand.java diff --git a/core/src/com/cloud/agent/api/SnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/SnapshotCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/SnapshotCommand.java rename to core/src/main/java/com/cloud/agent/api/SnapshotCommand.java diff --git a/core/src/com/cloud/agent/api/StartAnswer.java b/core/src/main/java/com/cloud/agent/api/StartAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/StartAnswer.java rename to core/src/main/java/com/cloud/agent/api/StartAnswer.java diff --git a/core/src/com/cloud/agent/api/StartCommand.java b/core/src/main/java/com/cloud/agent/api/StartCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/StartCommand.java rename to core/src/main/java/com/cloud/agent/api/StartCommand.java diff --git a/core/src/com/cloud/agent/api/StartupAnswer.java b/core/src/main/java/com/cloud/agent/api/StartupAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/StartupAnswer.java rename to core/src/main/java/com/cloud/agent/api/StartupAnswer.java diff --git a/core/src/com/cloud/agent/api/StartupCommand.java b/core/src/main/java/com/cloud/agent/api/StartupCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/StartupCommand.java rename to core/src/main/java/com/cloud/agent/api/StartupCommand.java diff --git a/core/src/com/cloud/agent/api/StartupExternalDhcpCommand.java b/core/src/main/java/com/cloud/agent/api/StartupExternalDhcpCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/StartupExternalDhcpCommand.java rename to core/src/main/java/com/cloud/agent/api/StartupExternalDhcpCommand.java diff --git a/core/src/com/cloud/agent/api/StartupExternalFirewallCommand.java b/core/src/main/java/com/cloud/agent/api/StartupExternalFirewallCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/StartupExternalFirewallCommand.java rename to core/src/main/java/com/cloud/agent/api/StartupExternalFirewallCommand.java diff --git a/core/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java b/core/src/main/java/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java rename to core/src/main/java/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java diff --git a/core/src/com/cloud/agent/api/StartupProxyCommand.java b/core/src/main/java/com/cloud/agent/api/StartupProxyCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/StartupProxyCommand.java rename to core/src/main/java/com/cloud/agent/api/StartupProxyCommand.java diff --git a/core/src/com/cloud/agent/api/StartupPxeServerCommand.java b/core/src/main/java/com/cloud/agent/api/StartupPxeServerCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/StartupPxeServerCommand.java rename to core/src/main/java/com/cloud/agent/api/StartupPxeServerCommand.java diff --git a/core/src/com/cloud/agent/api/StartupRoutingCommand.java b/core/src/main/java/com/cloud/agent/api/StartupRoutingCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/StartupRoutingCommand.java rename to core/src/main/java/com/cloud/agent/api/StartupRoutingCommand.java diff --git a/core/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java b/core/src/main/java/com/cloud/agent/api/StartupSecondaryStorageCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java rename to core/src/main/java/com/cloud/agent/api/StartupSecondaryStorageCommand.java diff --git a/core/src/com/cloud/agent/api/StartupStorageCommand.java b/core/src/main/java/com/cloud/agent/api/StartupStorageCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/StartupStorageCommand.java rename to core/src/main/java/com/cloud/agent/api/StartupStorageCommand.java diff --git a/core/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java b/core/src/main/java/com/cloud/agent/api/StartupTrafficMonitorCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java rename to core/src/main/java/com/cloud/agent/api/StartupTrafficMonitorCommand.java diff --git a/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java b/core/src/main/java/com/cloud/agent/api/StartupVMMAgentCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/StartupVMMAgentCommand.java rename to core/src/main/java/com/cloud/agent/api/StartupVMMAgentCommand.java diff --git a/core/src/com/cloud/agent/api/StopAnswer.java b/core/src/main/java/com/cloud/agent/api/StopAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/StopAnswer.java rename to core/src/main/java/com/cloud/agent/api/StopAnswer.java diff --git a/core/src/com/cloud/agent/api/StopCommand.java b/core/src/main/java/com/cloud/agent/api/StopCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/StopCommand.java rename to core/src/main/java/com/cloud/agent/api/StopCommand.java diff --git a/core/src/com/cloud/agent/api/TransferAgentCommand.java b/core/src/main/java/com/cloud/agent/api/TransferAgentCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/TransferAgentCommand.java rename to core/src/main/java/com/cloud/agent/api/TransferAgentCommand.java diff --git a/core/src/com/cloud/agent/api/UnPlugNicAnswer.java b/core/src/main/java/com/cloud/agent/api/UnPlugNicAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/UnPlugNicAnswer.java rename to core/src/main/java/com/cloud/agent/api/UnPlugNicAnswer.java diff --git a/core/src/com/cloud/agent/api/UnPlugNicCommand.java b/core/src/main/java/com/cloud/agent/api/UnPlugNicCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/UnPlugNicCommand.java rename to core/src/main/java/com/cloud/agent/api/UnPlugNicCommand.java diff --git a/core/src/com/cloud/agent/api/UnregisterNicCommand.java b/core/src/main/java/com/cloud/agent/api/UnregisterNicCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/UnregisterNicCommand.java rename to core/src/main/java/com/cloud/agent/api/UnregisterNicCommand.java diff --git a/core/src/com/cloud/agent/api/UnregisterVMCommand.java b/core/src/main/java/com/cloud/agent/api/UnregisterVMCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/UnregisterVMCommand.java rename to core/src/main/java/com/cloud/agent/api/UnregisterVMCommand.java diff --git a/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java b/core/src/main/java/com/cloud/agent/api/UpdateHostPasswordCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java rename to core/src/main/java/com/cloud/agent/api/UpdateHostPasswordCommand.java diff --git a/core/src/com/cloud/agent/api/UpgradeSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/UpgradeSnapshotCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/UpgradeSnapshotCommand.java rename to core/src/main/java/com/cloud/agent/api/UpgradeSnapshotCommand.java diff --git a/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java b/core/src/main/java/com/cloud/agent/api/VMSnapshotBaseCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java rename to core/src/main/java/com/cloud/agent/api/VMSnapshotBaseCommand.java diff --git a/core/src/com/cloud/agent/api/VMSnapshotTO.java b/core/src/main/java/com/cloud/agent/api/VMSnapshotTO.java similarity index 100% rename from core/src/com/cloud/agent/api/VMSnapshotTO.java rename to core/src/main/java/com/cloud/agent/api/VMSnapshotTO.java diff --git a/core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java b/core/src/main/java/com/cloud/agent/api/ValidateSnapshotAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java rename to core/src/main/java/com/cloud/agent/api/ValidateSnapshotAnswer.java diff --git a/core/src/com/cloud/agent/api/ValidateSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/ValidateSnapshotCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ValidateSnapshotCommand.java rename to core/src/main/java/com/cloud/agent/api/ValidateSnapshotCommand.java diff --git a/core/src/com/cloud/agent/api/VmDiskStatsEntry.java b/core/src/main/java/com/cloud/agent/api/VmDiskStatsEntry.java similarity index 100% rename from core/src/com/cloud/agent/api/VmDiskStatsEntry.java rename to core/src/main/java/com/cloud/agent/api/VmDiskStatsEntry.java diff --git a/core/src/com/cloud/agent/api/VmNetworkStatsEntry.java b/core/src/main/java/com/cloud/agent/api/VmNetworkStatsEntry.java similarity index 100% rename from core/src/com/cloud/agent/api/VmNetworkStatsEntry.java rename to core/src/main/java/com/cloud/agent/api/VmNetworkStatsEntry.java diff --git a/core/src/com/cloud/agent/api/VmStatsEntry.java b/core/src/main/java/com/cloud/agent/api/VmStatsEntry.java similarity index 100% rename from core/src/com/cloud/agent/api/VmStatsEntry.java rename to core/src/main/java/com/cloud/agent/api/VmStatsEntry.java diff --git a/core/src/com/cloud/agent/api/VolumeStatsEntry.java b/core/src/main/java/com/cloud/agent/api/VolumeStatsEntry.java similarity index 100% rename from core/src/com/cloud/agent/api/VolumeStatsEntry.java rename to core/src/main/java/com/cloud/agent/api/VolumeStatsEntry.java diff --git a/core/src/com/cloud/agent/api/ReplugNicAnswer.java b/core/src/main/java/com/cloud/agent/api/api/ReplugNicAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/ReplugNicAnswer.java rename to core/src/main/java/com/cloud/agent/api/api/ReplugNicAnswer.java diff --git a/core/src/com/cloud/agent/api/ReplugNicCommand.java b/core/src/main/java/com/cloud/agent/api/api/ReplugNicCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/ReplugNicCommand.java rename to core/src/main/java/com/cloud/agent/api/api/ReplugNicCommand.java diff --git a/core/src/com/cloud/agent/api/storage/CreateDatadiskTemplateAnswer.java b/core/src/main/java/com/cloud/agent/api/api/storage/CreateDatadiskTemplateAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/CreateDatadiskTemplateAnswer.java rename to core/src/main/java/com/cloud/agent/api/api/storage/CreateDatadiskTemplateAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/CreateDatadiskTemplateCommand.java b/core/src/main/java/com/cloud/agent/api/api/storage/CreateDatadiskTemplateCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/CreateDatadiskTemplateCommand.java rename to core/src/main/java/com/cloud/agent/api/api/storage/CreateDatadiskTemplateCommand.java diff --git a/core/src/com/cloud/agent/api/storage/GetDatadisksAnswer.java b/core/src/main/java/com/cloud/agent/api/api/storage/GetDatadisksAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/GetDatadisksAnswer.java rename to core/src/main/java/com/cloud/agent/api/api/storage/GetDatadisksAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/GetDatadisksCommand.java b/core/src/main/java/com/cloud/agent/api/api/storage/GetDatadisksCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/GetDatadisksCommand.java rename to core/src/main/java/com/cloud/agent/api/api/storage/GetDatadisksCommand.java diff --git a/core/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java b/core/src/main/java/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java rename to core/src/main/java/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java diff --git a/core/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java b/core/src/main/java/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java rename to core/src/main/java/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java diff --git a/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java b/core/src/main/java/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java rename to core/src/main/java/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java diff --git a/core/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java b/core/src/main/java/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java rename to core/src/main/java/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java diff --git a/core/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java b/core/src/main/java/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java rename to core/src/main/java/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java diff --git a/core/src/com/cloud/agent/api/check/CheckSshAnswer.java b/core/src/main/java/com/cloud/agent/api/check/CheckSshAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/check/CheckSshAnswer.java rename to core/src/main/java/com/cloud/agent/api/check/CheckSshAnswer.java diff --git a/core/src/com/cloud/agent/api/check/CheckSshCommand.java b/core/src/main/java/com/cloud/agent/api/check/CheckSshCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/check/CheckSshCommand.java rename to core/src/main/java/com/cloud/agent/api/check/CheckSshCommand.java diff --git a/core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java b/core/src/main/java/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java rename to core/src/main/java/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java diff --git a/core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java b/core/src/main/java/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java rename to core/src/main/java/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java diff --git a/core/src/com/cloud/agent/api/proxy/ProxyCommand.java b/core/src/main/java/com/cloud/agent/api/proxy/ProxyCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/proxy/ProxyCommand.java rename to core/src/main/java/com/cloud/agent/api/proxy/ProxyCommand.java diff --git a/core/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java b/core/src/main/java/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java rename to core/src/main/java/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java diff --git a/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java b/core/src/main/java/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java rename to core/src/main/java/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java diff --git a/core/src/com/cloud/agent/api/routing/AggregationControlCommand.java b/core/src/main/java/com/cloud/agent/api/routing/AggregationControlCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/AggregationControlCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/AggregationControlCommand.java diff --git a/core/src/com/cloud/agent/api/routing/CreateIpAliasCommand.java b/core/src/main/java/com/cloud/agent/api/routing/CreateIpAliasCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/CreateIpAliasCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/CreateIpAliasCommand.java diff --git a/core/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java b/core/src/main/java/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java diff --git a/core/src/com/cloud/agent/api/routing/DeleteIpAliasCommand.java b/core/src/main/java/com/cloud/agent/api/routing/DeleteIpAliasCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/DeleteIpAliasCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/DeleteIpAliasCommand.java diff --git a/core/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java b/core/src/main/java/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java diff --git a/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java b/core/src/main/java/com/cloud/agent/api/routing/DhcpEntryCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/DhcpEntryCommand.java diff --git a/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java b/core/src/main/java/com/cloud/agent/api/routing/DnsMasqConfigCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/DnsMasqConfigCommand.java diff --git a/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java b/core/src/main/java/com/cloud/agent/api/routing/GetRouterAlertsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/GetRouterAlertsCommand.java diff --git a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java b/core/src/main/java/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java rename to core/src/main/java/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java diff --git a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java b/core/src/main/java/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java diff --git a/core/src/com/cloud/agent/api/routing/GroupAnswer.java b/core/src/main/java/com/cloud/agent/api/routing/GroupAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/GroupAnswer.java rename to core/src/main/java/com/cloud/agent/api/routing/GroupAnswer.java diff --git a/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java b/core/src/main/java/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java rename to core/src/main/java/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java diff --git a/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java b/core/src/main/java/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java diff --git a/core/src/com/cloud/agent/api/routing/IpAliasTO.java b/core/src/main/java/com/cloud/agent/api/routing/IpAliasTO.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/IpAliasTO.java rename to core/src/main/java/com/cloud/agent/api/routing/IpAliasTO.java diff --git a/core/src/com/cloud/agent/api/routing/IpAssocAnswer.java b/core/src/main/java/com/cloud/agent/api/routing/IpAssocAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/IpAssocAnswer.java rename to core/src/main/java/com/cloud/agent/api/routing/IpAssocAnswer.java diff --git a/core/src/com/cloud/agent/api/routing/IpAssocCommand.java b/core/src/main/java/com/cloud/agent/api/routing/IpAssocCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/IpAssocCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/IpAssocCommand.java diff --git a/core/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java b/core/src/main/java/com/cloud/agent/api/routing/IpAssocVpcCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/IpAssocVpcCommand.java diff --git a/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java b/core/src/main/java/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java diff --git a/core/src/com/cloud/agent/api/routing/NetworkElementCommand.java b/core/src/main/java/com/cloud/agent/api/routing/NetworkElementCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/NetworkElementCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/NetworkElementCommand.java diff --git a/core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java b/core/src/main/java/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java diff --git a/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SavePasswordCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SavePasswordCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/SavePasswordCommand.java diff --git a/core/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java b/core/src/main/java/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java rename to core/src/main/java/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java diff --git a/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetFirewallRulesCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/SetFirewallRulesCommand.java diff --git a/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetMonitorServiceCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/SetMonitorServiceCommand.java diff --git a/core/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java b/core/src/main/java/com/cloud/agent/api/routing/SetNetworkACLAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java rename to core/src/main/java/com/cloud/agent/api/routing/SetNetworkACLAnswer.java diff --git a/core/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetNetworkACLCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/SetNetworkACLCommand.java diff --git a/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java b/core/src/main/java/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java rename to core/src/main/java/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java diff --git a/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java diff --git a/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java diff --git a/core/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java b/core/src/main/java/com/cloud/agent/api/routing/SetSourceNatAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java rename to core/src/main/java/com/cloud/agent/api/routing/SetSourceNatAnswer.java diff --git a/core/src/com/cloud/agent/api/routing/SetSourceNatCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetSourceNatCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetSourceNatCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/SetSourceNatCommand.java diff --git a/core/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java b/core/src/main/java/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java rename to core/src/main/java/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java diff --git a/core/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java diff --git a/core/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java b/core/src/main/java/com/cloud/agent/api/routing/SetStaticRouteAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java rename to core/src/main/java/com/cloud/agent/api/routing/SetStaticRouteAnswer.java diff --git a/core/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetStaticRouteCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/SetStaticRouteCommand.java diff --git a/core/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java b/core/src/main/java/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java diff --git a/core/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java b/core/src/main/java/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java rename to core/src/main/java/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java diff --git a/core/src/com/cloud/agent/api/routing/UserDataCommand.java b/core/src/main/java/com/cloud/agent/api/routing/UserDataCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/UserDataCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/UserDataCommand.java diff --git a/core/src/com/cloud/agent/api/routing/VmDataCommand.java b/core/src/main/java/com/cloud/agent/api/routing/VmDataCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/VmDataCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/VmDataCommand.java diff --git a/core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java b/core/src/main/java/com/cloud/agent/api/routing/VpnUsersCfgCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java rename to core/src/main/java/com/cloud/agent/api/routing/VpnUsersCfgCommand.java diff --git a/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java b/core/src/main/java/com/cloud/agent/api/storage/AbstractDownloadCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/AbstractDownloadCommand.java diff --git a/core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java b/core/src/main/java/com/cloud/agent/api/storage/AbstractUploadCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/AbstractUploadCommand.java diff --git a/core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/CopyVolumeAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/CopyVolumeAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java b/core/src/main/java/com/cloud/agent/api/storage/CopyVolumeCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/CopyVolumeCommand.java diff --git a/core/src/com/cloud/agent/api/storage/CreateAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/CreateAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/CreateAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/CreateAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/CreateCommand.java b/core/src/main/java/com/cloud/agent/api/storage/CreateCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/CreateCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/CreateCommand.java diff --git a/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java b/core/src/main/java/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java diff --git a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java b/core/src/main/java/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java diff --git a/core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java b/core/src/main/java/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java diff --git a/core/src/com/cloud/agent/api/storage/DestroyAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/DestroyAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/DestroyAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/DestroyAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/DestroyCommand.java b/core/src/main/java/com/cloud/agent/api/storage/DestroyCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/DestroyCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/DestroyCommand.java diff --git a/core/src/com/cloud/agent/api/storage/DownloadAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/DownloadAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/DownloadAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/DownloadAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/ListTemplateAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/ListTemplateAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/ListTemplateAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/ListTemplateAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/ListTemplateCommand.java b/core/src/main/java/com/cloud/agent/api/storage/ListTemplateCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/ListTemplateCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/ListTemplateCommand.java diff --git a/core/src/com/cloud/agent/api/storage/ListVolumeAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/ListVolumeAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/ListVolumeAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/ListVolumeAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/ListVolumeCommand.java b/core/src/main/java/com/cloud/agent/api/storage/ListVolumeCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/ListVolumeCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/ListVolumeCommand.java diff --git a/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java b/core/src/main/java/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java diff --git a/core/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/MigrateVolumeAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/MigrateVolumeAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java b/core/src/main/java/com/cloud/agent/api/storage/MigrateVolumeCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/MigrateVolumeCommand.java diff --git a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java b/core/src/main/java/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java diff --git a/core/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/ResizeVolumeAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/ResizeVolumeAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java b/core/src/main/java/com/cloud/agent/api/storage/ResizeVolumeCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/ResizeVolumeCommand.java diff --git a/core/src/com/cloud/agent/api/storage/SsCommand.java b/core/src/main/java/com/cloud/agent/api/storage/SsCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/SsCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/SsCommand.java diff --git a/core/src/com/cloud/agent/api/storage/StorageCommand.java b/core/src/main/java/com/cloud/agent/api/storage/StorageCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/StorageCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/StorageCommand.java diff --git a/core/src/com/cloud/agent/api/storage/StorageNfsVersionCommand.java b/core/src/main/java/com/cloud/agent/api/storage/StorageNfsVersionCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/StorageNfsVersionCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/StorageNfsVersionCommand.java diff --git a/core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/UpgradeDiskAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/UpgradeDiskAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java b/core/src/main/java/com/cloud/agent/api/storage/UpgradeDiskCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/UpgradeDiskCommand.java diff --git a/core/src/com/cloud/agent/api/storage/UploadAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/UploadAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/UploadAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/UploadAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/UploadCommand.java b/core/src/main/java/com/cloud/agent/api/storage/UploadCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/UploadCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/UploadCommand.java diff --git a/core/src/com/cloud/agent/api/storage/UploadProgressCommand.java b/core/src/main/java/com/cloud/agent/api/storage/UploadProgressCommand.java similarity index 100% rename from core/src/com/cloud/agent/api/storage/UploadProgressCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/UploadProgressCommand.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/ConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/ConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/ConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/ConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/FileConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/FileConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/FileConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/FileConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/ScriptConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/ScriptConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/ScriptConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/ScriptConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/VRScripts.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/VRScripts.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/BumpUpPriorityConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/BumpUpPriorityConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/BumpUpPriorityConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/BumpUpPriorityConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/CreateIpAliasConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/CreateIpAliasConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/CreateIpAliasConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/CreateIpAliasConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/DeleteIpAliasConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/DeleteIpAliasConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/DeleteIpAliasConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/DeleteIpAliasConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/DhcpEntryConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/DhcpEntryConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/DhcpEntryConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/DhcpEntryConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/DnsMasqConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/DnsMasqConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/DnsMasqConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/DnsMasqConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/IpAssociationConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/IpAssociationConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/IpAssociationConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/IpAssociationConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/LoadBalancerConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/LoadBalancerConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/LoadBalancerConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/LoadBalancerConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/RemoteAccessVpnConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/RemoteAccessVpnConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/RemoteAccessVpnConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/RemoteAccessVpnConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/SavePasswordConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SavePasswordConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/SavePasswordConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SavePasswordConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/SetFirewallRulesConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetFirewallRulesConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/SetFirewallRulesConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetFirewallRulesConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/SetGuestNetworkConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetGuestNetworkConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/SetGuestNetworkConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetGuestNetworkConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/SetMonitorServiceConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetMonitorServiceConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/SetMonitorServiceConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetMonitorServiceConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/SetNetworkAclConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetNetworkAclConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/SetNetworkAclConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetNetworkAclConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/SetPortForwardingRulesConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetPortForwardingRulesConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/SetPortForwardingRulesConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetPortForwardingRulesConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/SetPortForwardingRulesVpcConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetPortForwardingRulesVpcConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/SetPortForwardingRulesVpcConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetPortForwardingRulesVpcConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/SetSourceNatConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetSourceNatConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/SetSourceNatConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetSourceNatConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/SetStaticNatRulesConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetStaticNatRulesConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/SetStaticNatRulesConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetStaticNatRulesConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/SetStaticRouteConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetStaticRouteConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/SetStaticRouteConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetStaticRouteConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/Site2SiteVpnConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/Site2SiteVpnConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/Site2SiteVpnConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/Site2SiteVpnConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/VmDataConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/VmDataConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/VmDataConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/VmDataConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/facade/VpnUsersConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/VpnUsersConfigItem.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/facade/VpnUsersConfigItem.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/VpnUsersConfigItem.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/AclRule.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/AclRule.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/AclRule.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/AclRule.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/AllAclRule.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/AllAclRule.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/AllAclRule.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/AllAclRule.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/ConfigBase.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/ConfigBase.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/ConfigBase.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/ConfigBase.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/DhcpConfig.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/DhcpConfig.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/DhcpConfig.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/DhcpConfig.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/DhcpConfigEntry.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/DhcpConfigEntry.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/DhcpConfigEntry.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/DhcpConfigEntry.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRule.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/FirewallRule.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRule.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/FirewallRule.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRules.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/FirewallRules.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRules.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/FirewallRules.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/ForwardingRule.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/ForwardingRule.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/ForwardingRule.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/ForwardingRule.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/ForwardingRules.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/ForwardingRules.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/ForwardingRules.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/ForwardingRules.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/GuestNetwork.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/GuestNetwork.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/GuestNetwork.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/GuestNetwork.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/IcmpAclRule.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/IcmpAclRule.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/IcmpAclRule.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/IcmpAclRule.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/IpAddress.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/IpAddress.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/IpAddress.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/IpAddress.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/IpAddressAlias.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/IpAddressAlias.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/IpAddressAlias.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/IpAddressAlias.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/IpAliases.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/IpAliases.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/IpAliases.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/IpAliases.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/IpAssociation.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/IpAssociation.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/IpAssociation.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/IpAssociation.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/LoadBalancerRule.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/LoadBalancerRule.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/LoadBalancerRule.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/LoadBalancerRule.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/LoadBalancerRules.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/LoadBalancerRules.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/LoadBalancerRules.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/LoadBalancerRules.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/NetworkACL.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/NetworkACL.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/NetworkACL.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/NetworkACL.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/ProtocolAclRule.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/ProtocolAclRule.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/ProtocolAclRule.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/ProtocolAclRule.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/RemoteAccessVpn.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/RemoteAccessVpn.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/RemoteAccessVpn.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/RemoteAccessVpn.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/Site2SiteVpn.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/Site2SiteVpn.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/Site2SiteVpn.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/Site2SiteVpn.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/StaticNatRule.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/StaticNatRule.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/StaticNatRule.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/StaticNatRule.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/StaticNatRules.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/StaticNatRules.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/StaticNatRules.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/StaticNatRules.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/StaticRoute.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/StaticRoute.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/StaticRoute.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/StaticRoute.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/StaticRoutes.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/StaticRoutes.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/StaticRoutes.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/StaticRoutes.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/TcpAclRule.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/TcpAclRule.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/TcpAclRule.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/TcpAclRule.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/UdpAclRule.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/UdpAclRule.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/UdpAclRule.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/UdpAclRule.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/VmData.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/VmData.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/VmData.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/VmData.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/VmDhcpConfig.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/VmDhcpConfig.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/VmDhcpConfig.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/VmDhcpConfig.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/VmPassword.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/VmPassword.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/VmPassword.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/VmPassword.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/VpnUser.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/VpnUser.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/VpnUser.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/VpnUser.java diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/VpnUserList.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/VpnUserList.java similarity index 100% rename from core/src/com/cloud/agent/resource/virtualnetwork/model/VpnUserList.java rename to core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/VpnUserList.java diff --git a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java b/core/src/main/java/com/cloud/agent/transport/ArrayTypeAdaptor.java similarity index 100% rename from core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java rename to core/src/main/java/com/cloud/agent/transport/ArrayTypeAdaptor.java diff --git a/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java b/core/src/main/java/com/cloud/agent/transport/InterfaceTypeAdaptor.java similarity index 100% rename from core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java rename to core/src/main/java/com/cloud/agent/transport/InterfaceTypeAdaptor.java diff --git a/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java b/core/src/main/java/com/cloud/agent/transport/LoggingExclusionStrategy.java similarity index 100% rename from core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java rename to core/src/main/java/com/cloud/agent/transport/LoggingExclusionStrategy.java diff --git a/core/src/com/cloud/agent/transport/Request.java b/core/src/main/java/com/cloud/agent/transport/Request.java similarity index 100% rename from core/src/com/cloud/agent/transport/Request.java rename to core/src/main/java/com/cloud/agent/transport/Request.java diff --git a/core/src/com/cloud/agent/transport/Response.java b/core/src/main/java/com/cloud/agent/transport/Response.java similarity index 100% rename from core/src/com/cloud/agent/transport/Response.java rename to core/src/main/java/com/cloud/agent/transport/Response.java diff --git a/core/src/com/cloud/storage/template/MetalinkTemplateDownloader.java b/core/src/main/java/com/cloud/cloud/storage/template/MetalinkTemplateDownloader.java similarity index 100% rename from core/src/com/cloud/storage/template/MetalinkTemplateDownloader.java rename to core/src/main/java/com/cloud/cloud/storage/template/MetalinkTemplateDownloader.java diff --git a/core/src/com/cloud/exception/UnsupportedVersionException.java b/core/src/main/java/com/cloud/exception/UnsupportedVersionException.java similarity index 100% rename from core/src/com/cloud/exception/UnsupportedVersionException.java rename to core/src/main/java/com/cloud/exception/UnsupportedVersionException.java diff --git a/core/src/com/cloud/exception/UsageServerException.java b/core/src/main/java/com/cloud/exception/UsageServerException.java similarity index 100% rename from core/src/com/cloud/exception/UsageServerException.java rename to core/src/main/java/com/cloud/exception/UsageServerException.java diff --git a/core/src/com/cloud/host/HostInfo.java b/core/src/main/java/com/cloud/host/HostInfo.java similarity index 100% rename from core/src/com/cloud/host/HostInfo.java rename to core/src/main/java/com/cloud/host/HostInfo.java diff --git a/core/src/com/cloud/info/ConsoleProxyConnectionInfo.java b/core/src/main/java/com/cloud/info/ConsoleProxyConnectionInfo.java similarity index 100% rename from core/src/com/cloud/info/ConsoleProxyConnectionInfo.java rename to core/src/main/java/com/cloud/info/ConsoleProxyConnectionInfo.java diff --git a/core/src/com/cloud/info/ConsoleProxyInfo.java b/core/src/main/java/com/cloud/info/ConsoleProxyInfo.java similarity index 100% rename from core/src/com/cloud/info/ConsoleProxyInfo.java rename to core/src/main/java/com/cloud/info/ConsoleProxyInfo.java diff --git a/core/src/com/cloud/info/ConsoleProxyStatus.java b/core/src/main/java/com/cloud/info/ConsoleProxyStatus.java similarity index 100% rename from core/src/com/cloud/info/ConsoleProxyStatus.java rename to core/src/main/java/com/cloud/info/ConsoleProxyStatus.java diff --git a/core/src/com/cloud/info/RunningHostInfoAgregator.java b/core/src/main/java/com/cloud/info/RunningHostInfoAgregator.java similarity index 100% rename from core/src/com/cloud/info/RunningHostInfoAgregator.java rename to core/src/main/java/com/cloud/info/RunningHostInfoAgregator.java diff --git a/core/src/com/cloud/info/SecStorageVmLoadInfo.java b/core/src/main/java/com/cloud/info/SecStorageVmLoadInfo.java similarity index 100% rename from core/src/com/cloud/info/SecStorageVmLoadInfo.java rename to core/src/main/java/com/cloud/info/SecStorageVmLoadInfo.java diff --git a/core/src/com/cloud/network/HAProxyConfigurator.java b/core/src/main/java/com/cloud/network/HAProxyConfigurator.java similarity index 100% rename from core/src/com/cloud/network/HAProxyConfigurator.java rename to core/src/main/java/com/cloud/network/HAProxyConfigurator.java diff --git a/core/src/com/cloud/network/LoadBalancerConfigurator.java b/core/src/main/java/com/cloud/network/LoadBalancerConfigurator.java similarity index 100% rename from core/src/com/cloud/network/LoadBalancerConfigurator.java rename to core/src/main/java/com/cloud/network/LoadBalancerConfigurator.java diff --git a/core/src/com/cloud/network/LoadBalancerValidator.java b/core/src/main/java/com/cloud/network/LoadBalancerValidator.java similarity index 100% rename from core/src/com/cloud/network/LoadBalancerValidator.java rename to core/src/main/java/com/cloud/network/LoadBalancerValidator.java diff --git a/core/src/com/cloud/network/resource/CreateLoadBalancerApplianceAnswer.java b/core/src/main/java/com/cloud/network/resource/CreateLoadBalancerApplianceAnswer.java similarity index 100% rename from core/src/com/cloud/network/resource/CreateLoadBalancerApplianceAnswer.java rename to core/src/main/java/com/cloud/network/resource/CreateLoadBalancerApplianceAnswer.java diff --git a/core/src/com/cloud/network/resource/DestroyLoadBalancerApplianceAnswer.java b/core/src/main/java/com/cloud/network/resource/DestroyLoadBalancerApplianceAnswer.java similarity index 100% rename from core/src/com/cloud/network/resource/DestroyLoadBalancerApplianceAnswer.java rename to core/src/main/java/com/cloud/network/resource/DestroyLoadBalancerApplianceAnswer.java diff --git a/core/src/com/cloud/network/resource/TrafficSentinelResource.java b/core/src/main/java/com/cloud/network/resource/TrafficSentinelResource.java similarity index 100% rename from core/src/com/cloud/network/resource/TrafficSentinelResource.java rename to core/src/main/java/com/cloud/network/resource/TrafficSentinelResource.java diff --git a/core/src/com/cloud/resource/CommandWrapper.java b/core/src/main/java/com/cloud/resource/CommandWrapper.java similarity index 100% rename from core/src/com/cloud/resource/CommandWrapper.java rename to core/src/main/java/com/cloud/resource/CommandWrapper.java diff --git a/core/src/com/cloud/resource/RequestWrapper.java b/core/src/main/java/com/cloud/resource/RequestWrapper.java similarity index 100% rename from core/src/com/cloud/resource/RequestWrapper.java rename to core/src/main/java/com/cloud/resource/RequestWrapper.java diff --git a/core/src/com/cloud/resource/ResourceListener.java b/core/src/main/java/com/cloud/resource/ResourceListener.java similarity index 100% rename from core/src/com/cloud/resource/ResourceListener.java rename to core/src/main/java/com/cloud/resource/ResourceListener.java diff --git a/core/src/com/cloud/resource/ResourceWrapper.java b/core/src/main/java/com/cloud/resource/ResourceWrapper.java similarity index 100% rename from core/src/com/cloud/resource/ResourceWrapper.java rename to core/src/main/java/com/cloud/resource/ResourceWrapper.java diff --git a/core/src/com/cloud/resource/ServerResource.java b/core/src/main/java/com/cloud/resource/ServerResource.java similarity index 100% rename from core/src/com/cloud/resource/ServerResource.java rename to core/src/main/java/com/cloud/resource/ServerResource.java diff --git a/core/src/com/cloud/resource/ServerResourceBase.java b/core/src/main/java/com/cloud/resource/ServerResourceBase.java similarity index 100% rename from core/src/com/cloud/resource/ServerResourceBase.java rename to core/src/main/java/com/cloud/resource/ServerResourceBase.java diff --git a/core/src/com/cloud/resource/hypervisor/HypervisorResource.java b/core/src/main/java/com/cloud/resource/hypervisor/HypervisorResource.java similarity index 100% rename from core/src/com/cloud/resource/hypervisor/HypervisorResource.java rename to core/src/main/java/com/cloud/resource/hypervisor/HypervisorResource.java diff --git a/core/src/com/cloud/serializer/GsonHelper.java b/core/src/main/java/com/cloud/serializer/GsonHelper.java similarity index 100% rename from core/src/com/cloud/serializer/GsonHelper.java rename to core/src/main/java/com/cloud/serializer/GsonHelper.java diff --git a/core/src/com/cloud/serializer/SerializerHelper.java b/core/src/main/java/com/cloud/serializer/SerializerHelper.java similarity index 100% rename from core/src/com/cloud/serializer/SerializerHelper.java rename to core/src/main/java/com/cloud/serializer/SerializerHelper.java diff --git a/core/src/com/cloud/storage/JavaStorageLayer.java b/core/src/main/java/com/cloud/storage/JavaStorageLayer.java similarity index 100% rename from core/src/com/cloud/storage/JavaStorageLayer.java rename to core/src/main/java/com/cloud/storage/JavaStorageLayer.java diff --git a/core/src/com/cloud/storage/StorageLayer.java b/core/src/main/java/com/cloud/storage/StorageLayer.java similarity index 100% rename from core/src/com/cloud/storage/StorageLayer.java rename to core/src/main/java/com/cloud/storage/StorageLayer.java diff --git a/core/src/com/cloud/storage/resource/StoragePoolResource.java b/core/src/main/java/com/cloud/storage/resource/StoragePoolResource.java similarity index 100% rename from core/src/com/cloud/storage/resource/StoragePoolResource.java rename to core/src/main/java/com/cloud/storage/resource/StoragePoolResource.java diff --git a/core/src/com/cloud/storage/resource/StorageProcessor.java b/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java similarity index 100% rename from core/src/com/cloud/storage/resource/StorageProcessor.java rename to core/src/main/java/com/cloud/storage/resource/StorageProcessor.java diff --git a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandler.java b/core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandler.java similarity index 100% rename from core/src/com/cloud/storage/resource/StorageSubsystemCommandHandler.java rename to core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandler.java diff --git a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java b/core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java similarity index 100% rename from core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java rename to core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java diff --git a/core/src/com/cloud/storage/template/FtpTemplateUploader.java b/core/src/main/java/com/cloud/storage/template/FtpTemplateUploader.java similarity index 100% rename from core/src/com/cloud/storage/template/FtpTemplateUploader.java rename to core/src/main/java/com/cloud/storage/template/FtpTemplateUploader.java diff --git a/core/src/com/cloud/storage/template/HttpTemplateDownloader.java b/core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java similarity index 100% rename from core/src/com/cloud/storage/template/HttpTemplateDownloader.java rename to core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java diff --git a/core/src/com/cloud/storage/template/IsoProcessor.java b/core/src/main/java/com/cloud/storage/template/IsoProcessor.java similarity index 100% rename from core/src/com/cloud/storage/template/IsoProcessor.java rename to core/src/main/java/com/cloud/storage/template/IsoProcessor.java diff --git a/core/src/com/cloud/storage/template/LocalTemplateDownloader.java b/core/src/main/java/com/cloud/storage/template/LocalTemplateDownloader.java similarity index 100% rename from core/src/com/cloud/storage/template/LocalTemplateDownloader.java rename to core/src/main/java/com/cloud/storage/template/LocalTemplateDownloader.java diff --git a/core/src/com/cloud/storage/template/OVAProcessor.java b/core/src/main/java/com/cloud/storage/template/OVAProcessor.java similarity index 100% rename from core/src/com/cloud/storage/template/OVAProcessor.java rename to core/src/main/java/com/cloud/storage/template/OVAProcessor.java diff --git a/core/src/com/cloud/storage/template/Processor.java b/core/src/main/java/com/cloud/storage/template/Processor.java similarity index 100% rename from core/src/com/cloud/storage/template/Processor.java rename to core/src/main/java/com/cloud/storage/template/Processor.java diff --git a/core/src/com/cloud/storage/template/QCOW2Processor.java b/core/src/main/java/com/cloud/storage/template/QCOW2Processor.java similarity index 100% rename from core/src/com/cloud/storage/template/QCOW2Processor.java rename to core/src/main/java/com/cloud/storage/template/QCOW2Processor.java diff --git a/core/src/com/cloud/storage/template/RawImageProcessor.java b/core/src/main/java/com/cloud/storage/template/RawImageProcessor.java similarity index 100% rename from core/src/com/cloud/storage/template/RawImageProcessor.java rename to core/src/main/java/com/cloud/storage/template/RawImageProcessor.java diff --git a/core/src/com/cloud/storage/template/S3TemplateDownloader.java b/core/src/main/java/com/cloud/storage/template/S3TemplateDownloader.java similarity index 100% rename from core/src/com/cloud/storage/template/S3TemplateDownloader.java rename to core/src/main/java/com/cloud/storage/template/S3TemplateDownloader.java diff --git a/core/src/com/cloud/storage/template/ScpTemplateDownloader.java b/core/src/main/java/com/cloud/storage/template/ScpTemplateDownloader.java similarity index 100% rename from core/src/com/cloud/storage/template/ScpTemplateDownloader.java rename to core/src/main/java/com/cloud/storage/template/ScpTemplateDownloader.java diff --git a/core/src/com/cloud/storage/template/TARProcessor.java b/core/src/main/java/com/cloud/storage/template/TARProcessor.java similarity index 100% rename from core/src/com/cloud/storage/template/TARProcessor.java rename to core/src/main/java/com/cloud/storage/template/TARProcessor.java diff --git a/core/src/com/cloud/storage/template/TemplateConstants.java b/core/src/main/java/com/cloud/storage/template/TemplateConstants.java similarity index 100% rename from core/src/com/cloud/storage/template/TemplateConstants.java rename to core/src/main/java/com/cloud/storage/template/TemplateConstants.java diff --git a/core/src/com/cloud/storage/template/TemplateDownloader.java b/core/src/main/java/com/cloud/storage/template/TemplateDownloader.java similarity index 100% rename from core/src/com/cloud/storage/template/TemplateDownloader.java rename to core/src/main/java/com/cloud/storage/template/TemplateDownloader.java diff --git a/core/src/com/cloud/storage/template/TemplateDownloaderBase.java b/core/src/main/java/com/cloud/storage/template/TemplateDownloaderBase.java similarity index 100% rename from core/src/com/cloud/storage/template/TemplateDownloaderBase.java rename to core/src/main/java/com/cloud/storage/template/TemplateDownloaderBase.java diff --git a/core/src/com/cloud/storage/template/TemplateLocation.java b/core/src/main/java/com/cloud/storage/template/TemplateLocation.java similarity index 100% rename from core/src/com/cloud/storage/template/TemplateLocation.java rename to core/src/main/java/com/cloud/storage/template/TemplateLocation.java diff --git a/core/src/com/cloud/storage/template/TemplateUploader.java b/core/src/main/java/com/cloud/storage/template/TemplateUploader.java similarity index 100% rename from core/src/com/cloud/storage/template/TemplateUploader.java rename to core/src/main/java/com/cloud/storage/template/TemplateUploader.java diff --git a/core/src/com/cloud/storage/template/VhdProcessor.java b/core/src/main/java/com/cloud/storage/template/VhdProcessor.java similarity index 100% rename from core/src/com/cloud/storage/template/VhdProcessor.java rename to core/src/main/java/com/cloud/storage/template/VhdProcessor.java diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/main/java/com/cloud/storage/template/VmdkProcessor.java similarity index 100% rename from core/src/com/cloud/storage/template/VmdkProcessor.java rename to core/src/main/java/com/cloud/storage/template/VmdkProcessor.java diff --git a/core/src/org/apache/cloudstack/agent/directdownload/CheckUrlAnswer.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/CheckUrlAnswer.java similarity index 100% rename from core/src/org/apache/cloudstack/agent/directdownload/CheckUrlAnswer.java rename to core/src/main/java/org/apache/cloudstack/agent/directdownload/CheckUrlAnswer.java diff --git a/core/src/org/apache/cloudstack/agent/directdownload/CheckUrlCommand.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/CheckUrlCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/agent/directdownload/CheckUrlCommand.java rename to core/src/main/java/org/apache/cloudstack/agent/directdownload/CheckUrlCommand.java diff --git a/core/src/org/apache/cloudstack/agent/directdownload/DirectDownloadAnswer.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/DirectDownloadAnswer.java similarity index 100% rename from core/src/org/apache/cloudstack/agent/directdownload/DirectDownloadAnswer.java rename to core/src/main/java/org/apache/cloudstack/agent/directdownload/DirectDownloadAnswer.java diff --git a/core/src/org/apache/cloudstack/agent/directdownload/DirectDownloadCommand.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/DirectDownloadCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/agent/directdownload/DirectDownloadCommand.java rename to core/src/main/java/org/apache/cloudstack/agent/directdownload/DirectDownloadCommand.java diff --git a/core/src/org/apache/cloudstack/agent/directdownload/HttpDirectDownloadCommand.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/HttpDirectDownloadCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/agent/directdownload/HttpDirectDownloadCommand.java rename to core/src/main/java/org/apache/cloudstack/agent/directdownload/HttpDirectDownloadCommand.java diff --git a/core/src/org/apache/cloudstack/agent/directdownload/HttpsDirectDownloadCommand.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/HttpsDirectDownloadCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/agent/directdownload/HttpsDirectDownloadCommand.java rename to core/src/main/java/org/apache/cloudstack/agent/directdownload/HttpsDirectDownloadCommand.java diff --git a/core/src/org/apache/cloudstack/agent/directdownload/MetalinkDirectDownloadCommand.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/MetalinkDirectDownloadCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/agent/directdownload/MetalinkDirectDownloadCommand.java rename to core/src/main/java/org/apache/cloudstack/agent/directdownload/MetalinkDirectDownloadCommand.java diff --git a/core/src/org/apache/cloudstack/agent/directdownload/NfsDirectDownloadCommand.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/NfsDirectDownloadCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/agent/directdownload/NfsDirectDownloadCommand.java rename to core/src/main/java/org/apache/cloudstack/agent/directdownload/NfsDirectDownloadCommand.java diff --git a/core/src/org/apache/cloudstack/agent/directdownload/SetupDirectDownloadCertificate.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/SetupDirectDownloadCertificate.java similarity index 100% rename from core/src/org/apache/cloudstack/agent/directdownload/SetupDirectDownloadCertificate.java rename to core/src/main/java/org/apache/cloudstack/agent/directdownload/SetupDirectDownloadCertificate.java diff --git a/core/src/org/apache/cloudstack/ca/SetupCertificateAnswer.java b/core/src/main/java/org/apache/cloudstack/ca/SetupCertificateAnswer.java similarity index 100% rename from core/src/org/apache/cloudstack/ca/SetupCertificateAnswer.java rename to core/src/main/java/org/apache/cloudstack/ca/SetupCertificateAnswer.java diff --git a/core/src/org/apache/cloudstack/ca/SetupCertificateCommand.java b/core/src/main/java/org/apache/cloudstack/ca/SetupCertificateCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/ca/SetupCertificateCommand.java rename to core/src/main/java/org/apache/cloudstack/ca/SetupCertificateCommand.java diff --git a/core/src/org/apache/cloudstack/ca/SetupKeyStoreCommand.java b/core/src/main/java/org/apache/cloudstack/ca/SetupKeyStoreCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/ca/SetupKeyStoreCommand.java rename to core/src/main/java/org/apache/cloudstack/ca/SetupKeyStoreCommand.java diff --git a/core/src/org/apache/cloudstack/ca/SetupKeystoreAnswer.java b/core/src/main/java/org/apache/cloudstack/ca/SetupKeystoreAnswer.java similarity index 100% rename from core/src/org/apache/cloudstack/ca/SetupKeystoreAnswer.java rename to core/src/main/java/org/apache/cloudstack/ca/SetupKeystoreAnswer.java diff --git a/core/src/org/apache/cloudstack/storage/command/AttachAnswer.java b/core/src/main/java/org/apache/cloudstack/storage/command/AttachAnswer.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/AttachAnswer.java rename to core/src/main/java/org/apache/cloudstack/storage/command/AttachAnswer.java diff --git a/core/src/org/apache/cloudstack/storage/command/AttachCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/AttachCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/AttachCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/AttachCommand.java diff --git a/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java b/core/src/main/java/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java rename to core/src/main/java/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java diff --git a/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java b/core/src/main/java/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java rename to core/src/main/java/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java diff --git a/core/src/org/apache/cloudstack/storage/command/CopyCmdAnswer.java b/core/src/main/java/org/apache/cloudstack/storage/command/CopyCmdAnswer.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/CopyCmdAnswer.java rename to core/src/main/java/org/apache/cloudstack/storage/command/CopyCmdAnswer.java diff --git a/core/src/org/apache/cloudstack/storage/command/CopyCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/CopyCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/CopyCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/CopyCommand.java diff --git a/core/src/org/apache/cloudstack/storage/command/CreateObjectAnswer.java b/core/src/main/java/org/apache/cloudstack/storage/command/CreateObjectAnswer.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/CreateObjectAnswer.java rename to core/src/main/java/org/apache/cloudstack/storage/command/CreateObjectAnswer.java diff --git a/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/CreateObjectCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/CreateObjectCommand.java diff --git a/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java b/core/src/main/java/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java rename to core/src/main/java/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java diff --git a/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/DeleteCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/DeleteCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/DeleteCommand.java diff --git a/core/src/org/apache/cloudstack/storage/command/DettachAnswer.java b/core/src/main/java/org/apache/cloudstack/storage/command/DettachAnswer.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/DettachAnswer.java rename to core/src/main/java/org/apache/cloudstack/storage/command/DettachAnswer.java diff --git a/core/src/org/apache/cloudstack/storage/command/DettachCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/DettachCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/DettachCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/DettachCommand.java diff --git a/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/DownloadCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/DownloadCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/DownloadCommand.java diff --git a/core/src/org/apache/cloudstack/storage/command/DownloadProgressCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/DownloadProgressCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/DownloadProgressCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/DownloadProgressCommand.java diff --git a/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java b/core/src/main/java/org/apache/cloudstack/storage/command/ForgetObjectCmd.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java rename to core/src/main/java/org/apache/cloudstack/storage/command/ForgetObjectCmd.java diff --git a/core/src/org/apache/cloudstack/storage/command/IntroduceObjectAnswer.java b/core/src/main/java/org/apache/cloudstack/storage/command/IntroduceObjectAnswer.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/IntroduceObjectAnswer.java rename to core/src/main/java/org/apache/cloudstack/storage/command/IntroduceObjectAnswer.java diff --git a/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java b/core/src/main/java/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java rename to core/src/main/java/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java diff --git a/core/src/org/apache/cloudstack/storage/command/ResignatureAnswer.java b/core/src/main/java/org/apache/cloudstack/storage/command/ResignatureAnswer.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/ResignatureAnswer.java rename to core/src/main/java/org/apache/cloudstack/storage/command/ResignatureAnswer.java diff --git a/core/src/org/apache/cloudstack/storage/command/ResignatureCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/ResignatureCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/ResignatureCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/ResignatureCommand.java diff --git a/core/src/org/apache/cloudstack/storage/command/RevertSnapshotCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/RevertSnapshotCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/RevertSnapshotCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/RevertSnapshotCommand.java diff --git a/core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyAnswer.java b/core/src/main/java/org/apache/cloudstack/storage/command/SnapshotAndCopyAnswer.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyAnswer.java rename to core/src/main/java/org/apache/cloudstack/storage/command/SnapshotAndCopyAnswer.java diff --git a/core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/SnapshotAndCopyCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/SnapshotAndCopyCommand.java diff --git a/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java diff --git a/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java diff --git a/core/src/org/apache/cloudstack/storage/command/UploadStatusAnswer.java b/core/src/main/java/org/apache/cloudstack/storage/command/UploadStatusAnswer.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/UploadStatusAnswer.java rename to core/src/main/java/org/apache/cloudstack/storage/command/UploadStatusAnswer.java diff --git a/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/UploadStatusCommand.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/UploadStatusCommand.java diff --git a/core/src/org/apache/cloudstack/storage/to/ImageStoreTO.java b/core/src/main/java/org/apache/cloudstack/storage/to/ImageStoreTO.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/to/ImageStoreTO.java rename to core/src/main/java/org/apache/cloudstack/storage/to/ImageStoreTO.java diff --git a/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java b/core/src/main/java/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java rename to core/src/main/java/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java diff --git a/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java b/core/src/main/java/org/apache/cloudstack/storage/to/SnapshotObjectTO.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java rename to core/src/main/java/org/apache/cloudstack/storage/to/SnapshotObjectTO.java diff --git a/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java b/core/src/main/java/org/apache/cloudstack/storage/to/TemplateObjectTO.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java rename to core/src/main/java/org/apache/cloudstack/storage/to/TemplateObjectTO.java diff --git a/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java b/core/src/main/java/org/apache/cloudstack/storage/to/VolumeObjectTO.java similarity index 100% rename from core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java rename to core/src/main/java/org/apache/cloudstack/storage/to/VolumeObjectTO.java diff --git a/core/resources/META-INF/cloudstack/allocator/module.properties b/core/src/main/resources/META-INF/cloudstack/allocator/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/allocator/module.properties rename to core/src/main/resources/META-INF/cloudstack/allocator/module.properties diff --git a/core/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml b/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml similarity index 100% rename from core/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml rename to core/src/main/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml diff --git a/core/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml similarity index 100% rename from core/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml rename to core/src/main/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml diff --git a/core/resources/META-INF/cloudstack/api/module.properties b/core/src/main/resources/META-INF/cloudstack/api/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/api/module.properties rename to core/src/main/resources/META-INF/cloudstack/api/module.properties diff --git a/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml similarity index 100% rename from core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml rename to core/src/main/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml diff --git a/core/resources/META-INF/cloudstack/backend/module.properties b/core/src/main/resources/META-INF/cloudstack/backend/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/backend/module.properties rename to core/src/main/resources/META-INF/cloudstack/backend/module.properties diff --git a/core/resources/META-INF/cloudstack/bootstrap/module.properties b/core/src/main/resources/META-INF/cloudstack/bootstrap/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/bootstrap/module.properties rename to core/src/main/resources/META-INF/cloudstack/bootstrap/module.properties diff --git a/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml similarity index 100% rename from core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml rename to core/src/main/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml diff --git a/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml b/core/src/main/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml similarity index 100% rename from core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml rename to core/src/main/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml diff --git a/core/resources/META-INF/cloudstack/ca/module.properties b/core/src/main/resources/META-INF/cloudstack/ca/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/ca/module.properties rename to core/src/main/resources/META-INF/cloudstack/ca/module.properties diff --git a/core/resources/META-INF/cloudstack/ca/spring-core-lifecycle-ca-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/ca/spring-core-lifecycle-ca-context-inheritable.xml similarity index 100% rename from core/resources/META-INF/cloudstack/ca/spring-core-lifecycle-ca-context-inheritable.xml rename to core/src/main/resources/META-INF/cloudstack/ca/spring-core-lifecycle-ca-context-inheritable.xml diff --git a/core/resources/META-INF/cloudstack/direct-download/module.properties b/core/src/main/resources/META-INF/cloudstack/cloudstack/direct-download/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/direct-download/module.properties rename to core/src/main/resources/META-INF/cloudstack/cloudstack/direct-download/module.properties diff --git a/core/resources/META-INF/cloudstack/direct-download/spring-lifecycle-direct-download-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/cloudstack/direct-download/spring-lifecycle-direct-download-context-inheritable.xml similarity index 100% rename from core/resources/META-INF/cloudstack/direct-download/spring-lifecycle-direct-download-context-inheritable.xml rename to core/src/main/resources/META-INF/cloudstack/cloudstack/direct-download/spring-lifecycle-direct-download-context-inheritable.xml diff --git a/core/resources/META-INF/cloudstack/compute/module.properties b/core/src/main/resources/META-INF/cloudstack/compute/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/compute/module.properties rename to core/src/main/resources/META-INF/cloudstack/compute/module.properties diff --git a/core/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml similarity index 100% rename from core/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml rename to core/src/main/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml diff --git a/core/resources/META-INF/cloudstack/core/module.properties b/core/src/main/resources/META-INF/cloudstack/core/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/core/module.properties rename to core/src/main/resources/META-INF/cloudstack/core/module.properties diff --git a/core/resources/META-INF/cloudstack/core/spring-core-context.xml b/core/src/main/resources/META-INF/cloudstack/core/spring-core-context.xml similarity index 100% rename from core/resources/META-INF/cloudstack/core/spring-core-context.xml rename to core/src/main/resources/META-INF/cloudstack/core/spring-core-context.xml diff --git a/core/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml similarity index 100% rename from core/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml rename to core/src/main/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml diff --git a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml b/core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml similarity index 100% rename from core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml rename to core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml diff --git a/core/resources/META-INF/cloudstack/discoverer/module.properties b/core/src/main/resources/META-INF/cloudstack/discoverer/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/discoverer/module.properties rename to core/src/main/resources/META-INF/cloudstack/discoverer/module.properties diff --git a/core/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml similarity index 100% rename from core/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml rename to core/src/main/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml diff --git a/core/resources/META-INF/cloudstack/network/module.properties b/core/src/main/resources/META-INF/cloudstack/network/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/network/module.properties rename to core/src/main/resources/META-INF/cloudstack/network/module.properties diff --git a/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml similarity index 100% rename from core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml rename to core/src/main/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml diff --git a/core/resources/META-INF/cloudstack/outofbandmanagement/module.properties b/core/src/main/resources/META-INF/cloudstack/outofbandmanagement/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/outofbandmanagement/module.properties rename to core/src/main/resources/META-INF/cloudstack/outofbandmanagement/module.properties diff --git a/core/resources/META-INF/cloudstack/outofbandmanagement/spring-core-lifecycle-outofbandmanagement-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/outofbandmanagement/spring-core-lifecycle-outofbandmanagement-context-inheritable.xml similarity index 100% rename from core/resources/META-INF/cloudstack/outofbandmanagement/spring-core-lifecycle-outofbandmanagement-context-inheritable.xml rename to core/src/main/resources/META-INF/cloudstack/outofbandmanagement/spring-core-lifecycle-outofbandmanagement-context-inheritable.xml diff --git a/core/resources/META-INF/cloudstack/planner/module.properties b/core/src/main/resources/META-INF/cloudstack/planner/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/planner/module.properties rename to core/src/main/resources/META-INF/cloudstack/planner/module.properties diff --git a/core/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml similarity index 100% rename from core/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml rename to core/src/main/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml diff --git a/core/resources/META-INF/cloudstack/storage/module.properties b/core/src/main/resources/META-INF/cloudstack/storage/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/storage/module.properties rename to core/src/main/resources/META-INF/cloudstack/storage/module.properties diff --git a/core/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml similarity index 100% rename from core/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml rename to core/src/main/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml diff --git a/core/resources/META-INF/cloudstack/system/module.properties b/core/src/main/resources/META-INF/cloudstack/system/module.properties similarity index 100% rename from core/resources/META-INF/cloudstack/system/module.properties rename to core/src/main/resources/META-INF/cloudstack/system/module.properties diff --git a/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml similarity index 100% rename from core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml rename to core/src/main/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml diff --git a/core/resources/META-INF/cloudstack/system/spring-core-system-context.xml b/core/src/main/resources/META-INF/cloudstack/system/spring-core-system-context.xml similarity index 100% rename from core/resources/META-INF/cloudstack/system/spring-core-system-context.xml rename to core/src/main/resources/META-INF/cloudstack/system/spring-core-system-context.xml diff --git a/core/test/com/cloud/agent/api/SecurityGroupRulesCmdTest.java b/core/src/test/java/com/cloud/agent/api/SecurityGroupRulesCmdTest.java similarity index 100% rename from core/test/com/cloud/agent/api/SecurityGroupRulesCmdTest.java rename to core/src/test/java/com/cloud/agent/api/SecurityGroupRulesCmdTest.java diff --git a/core/test/com/cloud/agent/api/routing/SetNetworkACLCommandTest.java b/core/src/test/java/com/cloud/agent/api/routing/SetNetworkACLCommandTest.java similarity index 100% rename from core/test/com/cloud/agent/api/routing/SetNetworkACLCommandTest.java rename to core/src/test/java/com/cloud/agent/api/routing/SetNetworkACLCommandTest.java diff --git a/core/test/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java b/core/src/test/java/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java similarity index 100% rename from core/test/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java rename to core/src/test/java/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java diff --git a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java b/core/src/test/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java similarity index 100% rename from core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java rename to core/src/test/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java diff --git a/core/test/com/cloud/agent/transport/RequestTest.java b/core/src/test/java/com/cloud/agent/transport/RequestTest.java similarity index 100% rename from core/test/com/cloud/agent/transport/RequestTest.java rename to core/src/test/java/com/cloud/agent/transport/RequestTest.java diff --git a/core/test/com/cloud/network/HAProxyConfiguratorTest.java b/core/src/test/java/com/cloud/network/HAProxyConfiguratorTest.java similarity index 100% rename from core/test/com/cloud/network/HAProxyConfiguratorTest.java rename to core/src/test/java/com/cloud/network/HAProxyConfiguratorTest.java diff --git a/core/test/com/cloud/storage/template/LocalTemplateDownloaderTest.java b/core/src/test/java/com/cloud/storage/template/LocalTemplateDownloaderTest.java similarity index 100% rename from core/test/com/cloud/storage/template/LocalTemplateDownloaderTest.java rename to core/src/test/java/com/cloud/storage/template/LocalTemplateDownloaderTest.java diff --git a/core/test/com/cloud/storage/template/OVAProcessorTest.java b/core/src/test/java/com/cloud/storage/template/OVAProcessorTest.java similarity index 100% rename from core/test/com/cloud/storage/template/OVAProcessorTest.java rename to core/src/test/java/com/cloud/storage/template/OVAProcessorTest.java diff --git a/core/test/com/cloud/storage/template/QCOW2ProcessorTest.java b/core/src/test/java/com/cloud/storage/template/QCOW2ProcessorTest.java similarity index 100% rename from core/test/com/cloud/storage/template/QCOW2ProcessorTest.java rename to core/src/test/java/com/cloud/storage/template/QCOW2ProcessorTest.java diff --git a/core/test/com/cloud/storage/template/VhdProcessorTest.java b/core/src/test/java/com/cloud/storage/template/VhdProcessorTest.java similarity index 100% rename from core/test/com/cloud/storage/template/VhdProcessorTest.java rename to core/src/test/java/com/cloud/storage/template/VhdProcessorTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/AnswerTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/AnswerTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/AnswerTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/AnswerTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/CancelCommandTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/CancelCommandTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/CancelCommandTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/CancelCommandTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java diff --git a/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java similarity index 100% rename from core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java rename to core/src/test/java/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java diff --git a/core/test/resources/vhds/test.vhd b/core/src/test/resources/vhds/test.vhd similarity index 100% rename from core/test/resources/vhds/test.vhd rename to core/src/test/resources/vhds/test.vhd diff --git a/core/test/resources/vhds/test.vhd.bz2 b/core/src/test/resources/vhds/test.vhd.bz2 similarity index 100% rename from core/test/resources/vhds/test.vhd.bz2 rename to core/src/test/resources/vhds/test.vhd.bz2 diff --git a/core/test/resources/vhds/test.vhd.gz b/core/src/test/resources/vhds/test.vhd.gz similarity index 100% rename from core/test/resources/vhds/test.vhd.gz rename to core/src/test/resources/vhds/test.vhd.gz diff --git a/core/test/resources/vhds/test.vhd.zip b/core/src/test/resources/vhds/test.vhd.zip similarity index 100% rename from core/test/resources/vhds/test.vhd.zip rename to core/src/test/resources/vhds/test.vhd.zip diff --git a/engine/api/src/com/cloud/vm/VirtualMachineGuru.java b/engine/api/src/main/java/com/cloud/vm/VirtualMachineGuru.java similarity index 100% rename from engine/api/src/com/cloud/vm/VirtualMachineGuru.java rename to engine/api/src/main/java/com/cloud/vm/VirtualMachineGuru.java diff --git a/engine/api/src/com/cloud/vm/VirtualMachineManager.java b/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java similarity index 100% rename from engine/api/src/com/cloud/vm/VirtualMachineManager.java rename to engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/BackupEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/BackupEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/BackupEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/BackupEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/EdgeService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/EdgeService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/EdgeService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/EdgeService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/NetworkEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/NetworkEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/NetworkEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/NetworkEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/NicEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/NicEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/NicEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/NicEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/SnapshotEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/SnapshotEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/SnapshotEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/SnapshotEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/TemplateEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/TemplateEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/TemplateEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/TemplateEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VolumeEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VolumeEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VolumeEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VolumeEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/OrganizationScope.java b/engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/OrganizationScope.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/OrganizationScope.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/OrganizationScope.java diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/StorageEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/StorageEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/StorageEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/StorageEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java diff --git a/engine/api/src/org/apache/cloudstack/engine/exception/InsufficientCapacityException.java b/engine/api/src/main/java/org/apache/cloudstack/engine/exception/InsufficientCapacityException.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/exception/InsufficientCapacityException.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/exception/InsufficientCapacityException.java diff --git a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/rest/service/api/PodRestService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/rest/service/api/PodRestService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/service/api/DirectoryService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/service/api/DirectoryService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/service/api/DirectoryService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/service/api/DirectoryService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/service/api/EntityService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/service/api/EntityService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/service/api/EntityService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/service/api/EntityService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/service/api/OperationsServices.java b/engine/api/src/main/java/org/apache/cloudstack/engine/service/api/OperationsServices.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/service/api/OperationsServices.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/service/api/OperationsServices.java diff --git a/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/service/api/OrchestrationService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/service/api/OrchestrationService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/service/api/ProvisioningService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/service/api/ProvisioningService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/hypervisor/ComputeSubsystem.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/hypervisor/ComputeSubsystem.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/hypervisor/ComputeSubsystem.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/hypervisor/ComputeSubsystem.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/network/NetworkServiceProvider.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/network/NetworkServiceProvider.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/network/NetworkServiceProvider.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/network/NetworkServiceProvider.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/network/NetworkSubsystem.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/network/NetworkSubsystem.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/network/NetworkSubsystem.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/network/NetworkSubsystem.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/AbstractScope.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/AbstractScope.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/AbstractScope.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/AbstractScope.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ChapInfo.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ChapInfo.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ChapInfo.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ChapInfo.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ClusterScope.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ClusterScope.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ClusterScope.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ClusterScope.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/CopyCommandResult.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/CopyCommandResult.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/CopyCommandResult.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/CopyCommandResult.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/CreateCmdResult.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/CreateCmdResult.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/CreateCmdResult.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/CreateCmdResult.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionStrategy.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionStrategy.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionStrategy.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionStrategy.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataObject.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataObject.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataObject.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataObject.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataObjectInStore.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataObjectInStore.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataObjectInStore.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataObjectInStore.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStore.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStore.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStore.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStore.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreCapabilities.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreCapabilities.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreCapabilities.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreCapabilities.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreLifeCycle.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreLifeCycle.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreLifeCycle.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreLifeCycle.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreManager.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreManager.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreManager.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreManager.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProvider.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProvider.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProvider.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProvider.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/EndPoint.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPoint.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/EndPoint.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPoint.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/HostScope.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/HostScope.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/HostScope.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/HostScope.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/HypervisorHostListener.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/HypervisorHostListener.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/HypervisorHostListener.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/HypervisorHostListener.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ImageStoreProvider.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ImageStoreProvider.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ImageStoreProvider.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ImageStoreProvider.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreInfo.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreInfo.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreInfo.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreInfo.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreLifeCycle.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreLifeCycle.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreLifeCycle.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreLifeCycle.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreParameters.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreParameters.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreParameters.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreParameters.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreProvider.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreProvider.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreProvider.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreProvider.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/Scope.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/Scope.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/Scope.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/Scope.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotDataFactory.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotDataFactory.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotDataFactory.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotDataFactory.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotInfo.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotInfo.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotInfo.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotInfo.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotProfile.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotProfile.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotProfile.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotProfile.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotResult.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotResult.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotResult.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotResult.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageAction.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StorageAction.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageAction.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StorageAction.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageCacheManager.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StorageCacheManager.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageCacheManager.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StorageCacheManager.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageEvent.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StorageEvent.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageEvent.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StorageEvent.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StoragePoolAllocator.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StoragePoolAllocator.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StoragePoolAllocator.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StoragePoolAllocator.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageStrategyFactory.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StorageStrategyFactory.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageStrategyFactory.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StorageStrategyFactory.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriority.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriority.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriority.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriority.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateDataFactory.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateDataFactory.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateDataFactory.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateDataFactory.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateEvent.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateEvent.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateEvent.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateEvent.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateState.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateState.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateState.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateState.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotOptions.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotOptions.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotOptions.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotOptions.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotStrategy.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotStrategy.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotStrategy.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotStrategy.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeDataFactory.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeDataFactory.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeDataFactory.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeDataFactory.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ZoneScope.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ZoneScope.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ZoneScope.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ZoneScope.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/DiskFormat.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/DiskFormat.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/DiskFormat.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/DiskFormat.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/QCOW2.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/QCOW2.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/QCOW2.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/QCOW2.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/Unknown.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/Unknown.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/Unknown.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/Unknown.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VHD.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VHD.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VHD.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VHD.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VHDX.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VHDX.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VHDX.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VHDX.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VMDK.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VMDK.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VMDK.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VMDK.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskType.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskType.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskType.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskType.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskTypeBase.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskTypeBase.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskTypeBase.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskTypeBase.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskTypeHelper.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskTypeHelper.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskTypeHelper.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VolumeDiskTypeHelper.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/BaseImage.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/BaseImage.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/BaseImage.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/BaseImage.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/DataDisk.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/DataDisk.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/DataDisk.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/DataDisk.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/Iso.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/Iso.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/Iso.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/Iso.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/RootDisk.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/RootDisk.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/RootDisk.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/RootDisk.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/Unknown.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/Unknown.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/Unknown.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/Unknown.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeType.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeType.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeType.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeType.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeBase.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeBase.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeBase.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeBase.java diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelper.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelper.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelper.java rename to engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelper.java diff --git a/engine/api/src/org/apache/cloudstack/storage/command/CommandResult.java b/engine/api/src/main/java/org/apache/cloudstack/storage/command/CommandResult.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/storage/command/CommandResult.java rename to engine/api/src/main/java/org/apache/cloudstack/storage/command/CommandResult.java diff --git a/engine/api/src/org/apache/cloudstack/storage/image/datastore/ImageStoreEntity.java b/engine/api/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreEntity.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/storage/image/datastore/ImageStoreEntity.java rename to engine/api/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreEntity.java diff --git a/engine/api/src/org/apache/cloudstack/storage/image/datastore/ImageStoreInfo.java b/engine/api/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreInfo.java similarity index 100% rename from engine/api/src/org/apache/cloudstack/storage/image/datastore/ImageStoreInfo.java rename to engine/api/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreInfo.java diff --git a/engine/api/resources/META-INF/cloudstack/core/spring-engine-api-core-context.xml b/engine/api/src/main/resources/META-INF/cloudstack/core/spring-engine-api-core-context.xml similarity index 100% rename from engine/api/resources/META-INF/cloudstack/core/spring-engine-api-core-context.xml rename to engine/api/src/main/resources/META-INF/cloudstack/core/spring-engine-api-core-context.xml diff --git a/engine/api/test/org/apache/cloudstack/engine/subsystem/api/storage/ScopeTest.java b/engine/api/src/test/java/org/apache/cloudstack/engine/subsystem/api/storage/ScopeTest.java similarity index 100% rename from engine/api/test/org/apache/cloudstack/engine/subsystem/api/storage/ScopeTest.java rename to engine/api/src/test/java/org/apache/cloudstack/engine/subsystem/api/storage/ScopeTest.java diff --git a/engine/api/test/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelperTest.java b/engine/api/src/test/java/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelperTest.java similarity index 100% rename from engine/api/test/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelperTest.java rename to engine/api/src/test/java/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelperTest.java diff --git a/engine/components-api/src/com/cloud/agent/AgentManager.java b/engine/components-api/src/main/java/com/cloud/agent/AgentManager.java similarity index 100% rename from engine/components-api/src/com/cloud/agent/AgentManager.java rename to engine/components-api/src/main/java/com/cloud/agent/AgentManager.java diff --git a/engine/components-api/src/com/cloud/agent/Listener.java b/engine/components-api/src/main/java/com/cloud/agent/Listener.java similarity index 100% rename from engine/components-api/src/com/cloud/agent/Listener.java rename to engine/components-api/src/main/java/com/cloud/agent/Listener.java diff --git a/engine/components-api/src/com/cloud/alert/AlertManager.java b/engine/components-api/src/main/java/com/cloud/alert/AlertManager.java similarity index 100% rename from engine/components-api/src/com/cloud/alert/AlertManager.java rename to engine/components-api/src/main/java/com/cloud/alert/AlertManager.java diff --git a/engine/components-api/src/com/cloud/capacity/CapacityManager.java b/engine/components-api/src/main/java/com/cloud/capacity/CapacityManager.java similarity index 100% rename from engine/components-api/src/com/cloud/capacity/CapacityManager.java rename to engine/components-api/src/main/java/com/cloud/capacity/CapacityManager.java diff --git a/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java b/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java similarity index 100% rename from engine/components-api/src/com/cloud/configuration/ConfigurationManager.java rename to engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java diff --git a/engine/components-api/src/com/cloud/deploy/DeploymentPlanningManager.java b/engine/components-api/src/main/java/com/cloud/deploy/DeploymentPlanningManager.java similarity index 100% rename from engine/components-api/src/com/cloud/deploy/DeploymentPlanningManager.java rename to engine/components-api/src/main/java/com/cloud/deploy/DeploymentPlanningManager.java diff --git a/engine/components-api/src/com/cloud/event/UsageEventUtils.java b/engine/components-api/src/main/java/com/cloud/event/UsageEventUtils.java similarity index 100% rename from engine/components-api/src/com/cloud/event/UsageEventUtils.java rename to engine/components-api/src/main/java/com/cloud/event/UsageEventUtils.java diff --git a/engine/components-api/src/com/cloud/ha/HighAvailabilityManager.java b/engine/components-api/src/main/java/com/cloud/ha/HighAvailabilityManager.java similarity index 100% rename from engine/components-api/src/com/cloud/ha/HighAvailabilityManager.java rename to engine/components-api/src/main/java/com/cloud/ha/HighAvailabilityManager.java diff --git a/engine/components-api/src/com/cloud/hypervisor/HypervisorGuruManager.java b/engine/components-api/src/main/java/com/cloud/hypervisor/HypervisorGuruManager.java similarity index 100% rename from engine/components-api/src/com/cloud/hypervisor/HypervisorGuruManager.java rename to engine/components-api/src/main/java/com/cloud/hypervisor/HypervisorGuruManager.java diff --git a/engine/components-api/src/com/cloud/network/IpAddressManager.java b/engine/components-api/src/main/java/com/cloud/network/IpAddressManager.java similarity index 100% rename from engine/components-api/src/com/cloud/network/IpAddressManager.java rename to engine/components-api/src/main/java/com/cloud/network/IpAddressManager.java diff --git a/engine/components-api/src/com/cloud/network/NetworkStateListener.java b/engine/components-api/src/main/java/com/cloud/network/NetworkStateListener.java similarity index 100% rename from engine/components-api/src/com/cloud/network/NetworkStateListener.java rename to engine/components-api/src/main/java/com/cloud/network/NetworkStateListener.java diff --git a/engine/components-api/src/com/cloud/network/addr/PublicIp.java b/engine/components-api/src/main/java/com/cloud/network/addr/PublicIp.java similarity index 100% rename from engine/components-api/src/com/cloud/network/addr/PublicIp.java rename to engine/components-api/src/main/java/com/cloud/network/addr/PublicIp.java diff --git a/engine/components-api/src/com/cloud/network/lb/LoadBalancingRulesManager.java b/engine/components-api/src/main/java/com/cloud/network/lb/LoadBalancingRulesManager.java similarity index 100% rename from engine/components-api/src/com/cloud/network/lb/LoadBalancingRulesManager.java rename to engine/components-api/src/main/java/com/cloud/network/lb/LoadBalancingRulesManager.java diff --git a/engine/components-api/src/com/cloud/network/rules/FirewallManager.java b/engine/components-api/src/main/java/com/cloud/network/rules/FirewallManager.java similarity index 100% rename from engine/components-api/src/com/cloud/network/rules/FirewallManager.java rename to engine/components-api/src/main/java/com/cloud/network/rules/FirewallManager.java diff --git a/engine/components-api/src/com/cloud/network/rules/RulesManager.java b/engine/components-api/src/main/java/com/cloud/network/rules/RulesManager.java similarity index 100% rename from engine/components-api/src/com/cloud/network/rules/RulesManager.java rename to engine/components-api/src/main/java/com/cloud/network/rules/RulesManager.java diff --git a/engine/components-api/src/com/cloud/network/rules/StaticNatRuleImpl.java b/engine/components-api/src/main/java/com/cloud/network/rules/StaticNatRuleImpl.java similarity index 100% rename from engine/components-api/src/com/cloud/network/rules/StaticNatRuleImpl.java rename to engine/components-api/src/main/java/com/cloud/network/rules/StaticNatRuleImpl.java diff --git a/engine/components-api/src/com/cloud/network/vpc/NetworkACLManager.java b/engine/components-api/src/main/java/com/cloud/network/vpc/NetworkACLManager.java similarity index 100% rename from engine/components-api/src/com/cloud/network/vpc/NetworkACLManager.java rename to engine/components-api/src/main/java/com/cloud/network/vpc/NetworkACLManager.java diff --git a/engine/components-api/src/com/cloud/network/vpc/VpcManager.java b/engine/components-api/src/main/java/com/cloud/network/vpc/VpcManager.java similarity index 100% rename from engine/components-api/src/com/cloud/network/vpc/VpcManager.java rename to engine/components-api/src/main/java/com/cloud/network/vpc/VpcManager.java diff --git a/engine/components-api/src/com/cloud/resource/Discoverer.java b/engine/components-api/src/main/java/com/cloud/resource/Discoverer.java similarity index 100% rename from engine/components-api/src/com/cloud/resource/Discoverer.java rename to engine/components-api/src/main/java/com/cloud/resource/Discoverer.java diff --git a/engine/components-api/src/com/cloud/resource/ResourceManager.java b/engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java similarity index 100% rename from engine/components-api/src/com/cloud/resource/ResourceManager.java rename to engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java diff --git a/engine/components-api/src/com/cloud/resource/ResourceStateAdapter.java b/engine/components-api/src/main/java/com/cloud/resource/ResourceStateAdapter.java similarity index 100% rename from engine/components-api/src/com/cloud/resource/ResourceStateAdapter.java rename to engine/components-api/src/main/java/com/cloud/resource/ResourceStateAdapter.java diff --git a/engine/components-api/src/com/cloud/storage/StorageManager.java b/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java similarity index 100% rename from engine/components-api/src/com/cloud/storage/StorageManager.java rename to engine/components-api/src/main/java/com/cloud/storage/StorageManager.java diff --git a/engine/components-api/src/com/cloud/template/TemplateManager.java b/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java similarity index 100% rename from engine/components-api/src/com/cloud/template/TemplateManager.java rename to engine/components-api/src/main/java/com/cloud/template/TemplateManager.java diff --git a/engine/components-api/src/com/cloud/vm/ReservationContextImpl.java b/engine/components-api/src/main/java/com/cloud/vm/ReservationContextImpl.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/ReservationContextImpl.java rename to engine/components-api/src/main/java/com/cloud/vm/ReservationContextImpl.java diff --git a/engine/components-api/src/com/cloud/vm/VirtualMachineProfileImpl.java b/engine/components-api/src/main/java/com/cloud/vm/VirtualMachineProfileImpl.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/VirtualMachineProfileImpl.java rename to engine/components-api/src/main/java/com/cloud/vm/VirtualMachineProfileImpl.java diff --git a/engine/components-api/src/com/cloud/vm/VmWork.java b/engine/components-api/src/main/java/com/cloud/vm/VmWork.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/VmWork.java rename to engine/components-api/src/main/java/com/cloud/vm/VmWork.java diff --git a/engine/components-api/src/com/cloud/vm/VmWorkAttachVolume.java b/engine/components-api/src/main/java/com/cloud/vm/VmWorkAttachVolume.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/VmWorkAttachVolume.java rename to engine/components-api/src/main/java/com/cloud/vm/VmWorkAttachVolume.java diff --git a/engine/components-api/src/com/cloud/vm/VmWorkConstants.java b/engine/components-api/src/main/java/com/cloud/vm/VmWorkConstants.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/VmWorkConstants.java rename to engine/components-api/src/main/java/com/cloud/vm/VmWorkConstants.java diff --git a/engine/components-api/src/com/cloud/vm/VmWorkDetachVolume.java b/engine/components-api/src/main/java/com/cloud/vm/VmWorkDetachVolume.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/VmWorkDetachVolume.java rename to engine/components-api/src/main/java/com/cloud/vm/VmWorkDetachVolume.java diff --git a/engine/components-api/src/com/cloud/vm/VmWorkExtractVolume.java b/engine/components-api/src/main/java/com/cloud/vm/VmWorkExtractVolume.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/VmWorkExtractVolume.java rename to engine/components-api/src/main/java/com/cloud/vm/VmWorkExtractVolume.java diff --git a/engine/components-api/src/com/cloud/vm/VmWorkJobHandler.java b/engine/components-api/src/main/java/com/cloud/vm/VmWorkJobHandler.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/VmWorkJobHandler.java rename to engine/components-api/src/main/java/com/cloud/vm/VmWorkJobHandler.java diff --git a/engine/components-api/src/com/cloud/vm/VmWorkJobHandlerProxy.java b/engine/components-api/src/main/java/com/cloud/vm/VmWorkJobHandlerProxy.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/VmWorkJobHandlerProxy.java rename to engine/components-api/src/main/java/com/cloud/vm/VmWorkJobHandlerProxy.java diff --git a/engine/components-api/src/com/cloud/vm/VmWorkMigrateVolume.java b/engine/components-api/src/main/java/com/cloud/vm/VmWorkMigrateVolume.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/VmWorkMigrateVolume.java rename to engine/components-api/src/main/java/com/cloud/vm/VmWorkMigrateVolume.java diff --git a/engine/components-api/src/com/cloud/vm/VmWorkResizeVolume.java b/engine/components-api/src/main/java/com/cloud/vm/VmWorkResizeVolume.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/VmWorkResizeVolume.java rename to engine/components-api/src/main/java/com/cloud/vm/VmWorkResizeVolume.java diff --git a/engine/components-api/src/com/cloud/vm/VmWorkSerializer.java b/engine/components-api/src/main/java/com/cloud/vm/VmWorkSerializer.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/VmWorkSerializer.java rename to engine/components-api/src/main/java/com/cloud/vm/VmWorkSerializer.java diff --git a/engine/components-api/src/com/cloud/vm/VmWorkTakeVolumeSnapshot.java b/engine/components-api/src/main/java/com/cloud/vm/VmWorkTakeVolumeSnapshot.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/VmWorkTakeVolumeSnapshot.java rename to engine/components-api/src/main/java/com/cloud/vm/VmWorkTakeVolumeSnapshot.java diff --git a/engine/components-api/src/com/cloud/vm/snapshot/VMSnapshotManager.java b/engine/components-api/src/main/java/com/cloud/vm/snapshot/VMSnapshotManager.java similarity index 100% rename from engine/components-api/src/com/cloud/vm/snapshot/VMSnapshotManager.java rename to engine/components-api/src/main/java/com/cloud/vm/snapshot/VMSnapshotManager.java diff --git a/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java b/engine/components-api/src/main/java/org/apache/cloudstack/compute/ComputeGuru.java similarity index 100% rename from engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java rename to engine/components-api/src/main/java/org/apache/cloudstack/compute/ComputeGuru.java diff --git a/engine/components-api/resources/META-INF/cloudstack/core/spring-engine-components-api-core-context.xml b/engine/components-api/src/main/resources/META-INF/cloudstack/core/spring-engine-components-api-core-context.xml similarity index 100% rename from engine/components-api/resources/META-INF/cloudstack/core/spring-engine-components-api-core-context.xml rename to engine/components-api/src/main/resources/META-INF/cloudstack/core/spring-engine-components-api-core-context.xml diff --git a/engine/network/pom.xml b/engine/network/pom.xml index 4755874aea71..bf7c377b0b81 100644 --- a/engine/network/pom.xml +++ b/engine/network/pom.xml @@ -46,7 +46,5 @@ install - src - test diff --git a/engine/network/src/org/apache/cloudstack/network/NetworkOrchestrator.java b/engine/network/src/main/java/org/apache/cloudstack/network/NetworkOrchestrator.java similarity index 100% rename from engine/network/src/org/apache/cloudstack/network/NetworkOrchestrator.java rename to engine/network/src/main/java/org/apache/cloudstack/network/NetworkOrchestrator.java diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentAttache.java similarity index 100% rename from engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java rename to engine/orchestration/src/main/java/com/cloud/agent/manager/AgentAttache.java diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java similarity index 100% rename from engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java rename to engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentAttache.java similarity index 100% rename from engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java rename to engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentAttache.java diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java similarity index 100% rename from engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java rename to engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredDirectAgentAttache.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredDirectAgentAttache.java similarity index 100% rename from engine/orchestration/src/com/cloud/agent/manager/ClusteredDirectAgentAttache.java rename to engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredDirectAgentAttache.java diff --git a/engine/orchestration/src/com/cloud/agent/manager/ConnectedAgentAttache.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/ConnectedAgentAttache.java similarity index 100% rename from engine/orchestration/src/com/cloud/agent/manager/ConnectedAgentAttache.java rename to engine/orchestration/src/main/java/com/cloud/agent/manager/ConnectedAgentAttache.java diff --git a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/DirectAgentAttache.java similarity index 100% rename from engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java rename to engine/orchestration/src/main/java/com/cloud/agent/manager/DirectAgentAttache.java diff --git a/engine/orchestration/src/com/cloud/agent/manager/DummyAttache.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/DummyAttache.java similarity index 100% rename from engine/orchestration/src/com/cloud/agent/manager/DummyAttache.java rename to engine/orchestration/src/main/java/com/cloud/agent/manager/DummyAttache.java diff --git a/engine/orchestration/src/com/cloud/agent/manager/Routable.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/Routable.java similarity index 100% rename from engine/orchestration/src/com/cloud/agent/manager/Routable.java rename to engine/orchestration/src/main/java/com/cloud/agent/manager/Routable.java diff --git a/engine/orchestration/src/com/cloud/agent/manager/SynchronousListener.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/SynchronousListener.java similarity index 100% rename from engine/orchestration/src/com/cloud/agent/manager/SynchronousListener.java rename to engine/orchestration/src/main/java/com/cloud/agent/manager/SynchronousListener.java diff --git a/engine/orchestration/src/com/cloud/cluster/ClusteredAgentRebalanceService.java b/engine/orchestration/src/main/java/com/cloud/cluster/ClusteredAgentRebalanceService.java similarity index 100% rename from engine/orchestration/src/com/cloud/cluster/ClusteredAgentRebalanceService.java rename to engine/orchestration/src/main/java/com/cloud/cluster/ClusteredAgentRebalanceService.java diff --git a/engine/orchestration/src/com/cloud/cluster/agentlb/AgentLoadBalancerPlanner.java b/engine/orchestration/src/main/java/com/cloud/cluster/agentlb/AgentLoadBalancerPlanner.java similarity index 100% rename from engine/orchestration/src/com/cloud/cluster/agentlb/AgentLoadBalancerPlanner.java rename to engine/orchestration/src/main/java/com/cloud/cluster/agentlb/AgentLoadBalancerPlanner.java diff --git a/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java b/engine/orchestration/src/main/java/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java similarity index 100% rename from engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java rename to engine/orchestration/src/main/java/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java diff --git a/engine/orchestration/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java rename to engine/orchestration/src/main/java/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java rename to engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSync.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachinePowerStateSync.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSync.java rename to engine/orchestration/src/main/java/com/cloud/vm/VirtualMachinePowerStateSync.java diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java rename to engine/orchestration/src/main/java/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkAddVmToNetwork.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkAddVmToNetwork.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkAddVmToNetwork.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkAddVmToNetwork.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkJobDispatcher.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkJobDispatcher.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkJobWakeupDispatcher.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkJobWakeupDispatcher.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkJobWakeupDispatcher.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkJobWakeupDispatcher.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkMigrate.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkMigrate.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkMigrate.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkMigrate.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkMigrateAway.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkMigrateAway.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkMigrateAway.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkMigrateAway.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkMigrateForScale.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkMigrateForScale.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkMigrateForScale.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkMigrateForScale.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkMigrateWithStorage.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkMigrateWithStorage.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkMigrateWithStorage.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkMigrateWithStorage.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkReboot.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkReboot.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkReboot.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkReboot.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkReconfigure.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkReconfigure.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkReconfigure.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkReconfigure.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkRemoveNicFromVm.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkRemoveNicFromVm.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkRemoveNicFromVm.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkRemoveNicFromVm.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkRemoveVmFromNetwork.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkRemoveVmFromNetwork.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkRemoveVmFromNetwork.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkRemoveVmFromNetwork.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkStart.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkStart.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkStart.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkStart.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkStop.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkStop.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkStop.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkStop.java diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkStorageMigration.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkStorageMigration.java similarity index 100% rename from engine/orchestration/src/com/cloud/vm/VmWorkStorageMigration.java rename to engine/orchestration/src/main/java/com/cloud/vm/VmWorkStorageMigration.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterDetailsVO.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterDetailsVO.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterDetailsVO.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterDetailsVO.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/DcDetailVO.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/DcDetailVO.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/DcDetailVO.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/DcDetailVO.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDao.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDao.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDao.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDao.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDao.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDao.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDao.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDao.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDao.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDao.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDao.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDao.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDao.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDao.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDao.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDao.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java similarity index 100% rename from engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java rename to engine/orchestration/src/main/java/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java diff --git a/engine/orchestration/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml b/engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml similarity index 100% rename from engine/orchestration/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml rename to engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml diff --git a/engine/orchestration/test/com/cloud/agent/manager/AgentManagerImplTest.java b/engine/orchestration/src/test/java/com/cloud/agent/manager/AgentManagerImplTest.java similarity index 100% rename from engine/orchestration/test/com/cloud/agent/manager/AgentManagerImplTest.java rename to engine/orchestration/src/test/java/com/cloud/agent/manager/AgentManagerImplTest.java diff --git a/engine/orchestration/test/com/cloud/agent/manager/ConnectedAgentAttacheTest.java b/engine/orchestration/src/test/java/com/cloud/agent/manager/ConnectedAgentAttacheTest.java similarity index 100% rename from engine/orchestration/test/com/cloud/agent/manager/ConnectedAgentAttacheTest.java rename to engine/orchestration/src/test/java/com/cloud/agent/manager/ConnectedAgentAttacheTest.java diff --git a/engine/orchestration/test/com/cloud/agent/manager/DirectAgentAttacheTest.java b/engine/orchestration/src/test/java/com/cloud/agent/manager/DirectAgentAttacheTest.java similarity index 100% rename from engine/orchestration/test/com/cloud/agent/manager/DirectAgentAttacheTest.java rename to engine/orchestration/src/test/java/com/cloud/agent/manager/DirectAgentAttacheTest.java diff --git a/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java similarity index 100% rename from engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java rename to engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java diff --git a/engine/orchestration/test/org/apache/cloudstack/engine/orchestration/NetworkOrchestratorTest.java b/engine/orchestration/src/test/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestratorTest.java similarity index 100% rename from engine/orchestration/test/org/apache/cloudstack/engine/orchestration/NetworkOrchestratorTest.java rename to engine/orchestration/src/test/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestratorTest.java diff --git a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java b/engine/orchestration/src/test/java/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java similarity index 100% rename from engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java rename to engine/orchestration/src/test/java/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java diff --git a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java b/engine/orchestration/src/test/java/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java similarity index 100% rename from engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java rename to engine/orchestration/src/test/java/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java diff --git a/engine/orchestration/test/resource/provisioningContext.xml b/engine/orchestration/src/test/resources/provisioningContext.xml similarity index 100% rename from engine/orchestration/test/resource/provisioningContext.xml rename to engine/orchestration/src/test/resources/provisioningContext.xml diff --git a/engine/schema/src/com/cloud/alert/AlertVO.java b/engine/schema/src/main/java/com/cloud/alert/AlertVO.java similarity index 100% rename from engine/schema/src/com/cloud/alert/AlertVO.java rename to engine/schema/src/main/java/com/cloud/alert/AlertVO.java diff --git a/engine/schema/src/com/cloud/alert/dao/AlertDao.java b/engine/schema/src/main/java/com/cloud/alert/dao/AlertDao.java similarity index 100% rename from engine/schema/src/com/cloud/alert/dao/AlertDao.java rename to engine/schema/src/main/java/com/cloud/alert/dao/AlertDao.java diff --git a/engine/schema/src/com/cloud/alert/dao/AlertDaoImpl.java b/engine/schema/src/main/java/com/cloud/alert/dao/AlertDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/alert/dao/AlertDaoImpl.java rename to engine/schema/src/main/java/com/cloud/alert/dao/AlertDaoImpl.java diff --git a/engine/schema/src/com/cloud/capacity/CapacityVO.java b/engine/schema/src/main/java/com/cloud/capacity/CapacityVO.java similarity index 100% rename from engine/schema/src/com/cloud/capacity/CapacityVO.java rename to engine/schema/src/main/java/com/cloud/capacity/CapacityVO.java diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDao.java b/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDao.java similarity index 100% rename from engine/schema/src/com/cloud/capacity/dao/CapacityDao.java rename to engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDao.java diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java rename to engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDaoImpl.java diff --git a/engine/schema/src/com/cloud/certificate/CertificateVO.java b/engine/schema/src/main/java/com/cloud/certificate/CertificateVO.java similarity index 100% rename from engine/schema/src/com/cloud/certificate/CertificateVO.java rename to engine/schema/src/main/java/com/cloud/certificate/CertificateVO.java diff --git a/engine/schema/src/com/cloud/certificate/CrlVO.java b/engine/schema/src/main/java/com/cloud/certificate/CrlVO.java similarity index 100% rename from engine/schema/src/com/cloud/certificate/CrlVO.java rename to engine/schema/src/main/java/com/cloud/certificate/CrlVO.java diff --git a/engine/schema/src/com/cloud/certificate/dao/CertificateDao.java b/engine/schema/src/main/java/com/cloud/certificate/dao/CertificateDao.java similarity index 100% rename from engine/schema/src/com/cloud/certificate/dao/CertificateDao.java rename to engine/schema/src/main/java/com/cloud/certificate/dao/CertificateDao.java diff --git a/engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java b/engine/schema/src/main/java/com/cloud/certificate/dao/CertificateDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java rename to engine/schema/src/main/java/com/cloud/certificate/dao/CertificateDaoImpl.java diff --git a/engine/schema/src/com/cloud/certificate/dao/CrlDao.java b/engine/schema/src/main/java/com/cloud/certificate/dao/CrlDao.java similarity index 100% rename from engine/schema/src/com/cloud/certificate/dao/CrlDao.java rename to engine/schema/src/main/java/com/cloud/certificate/dao/CrlDao.java diff --git a/engine/schema/src/com/cloud/certificate/dao/CrlDaoImpl.java b/engine/schema/src/main/java/com/cloud/certificate/dao/CrlDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/certificate/dao/CrlDaoImpl.java rename to engine/schema/src/main/java/com/cloud/certificate/dao/CrlDaoImpl.java diff --git a/engine/schema/src/com/cloud/configuration/ManagementServiceConfiguration.java b/engine/schema/src/main/java/com/cloud/cloud/configuration/ManagementServiceConfiguration.java similarity index 100% rename from engine/schema/src/com/cloud/configuration/ManagementServiceConfiguration.java rename to engine/schema/src/main/java/com/cloud/cloud/configuration/ManagementServiceConfiguration.java diff --git a/engine/schema/src/com/cloud/configuration/ManagementServiceConfigurationImpl.java b/engine/schema/src/main/java/com/cloud/cloud/configuration/ManagementServiceConfigurationImpl.java similarity index 100% rename from engine/schema/src/com/cloud/configuration/ManagementServiceConfigurationImpl.java rename to engine/schema/src/main/java/com/cloud/cloud/configuration/ManagementServiceConfigurationImpl.java diff --git a/engine/schema/src/com/cloud/usage/UsageSnapshotOnPrimaryVO.java b/engine/schema/src/main/java/com/cloud/cloud/usage/UsageSnapshotOnPrimaryVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageSnapshotOnPrimaryVO.java rename to engine/schema/src/main/java/com/cloud/cloud/usage/UsageSnapshotOnPrimaryVO.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVMSnapshotOnPrimaryDao.java b/engine/schema/src/main/java/com/cloud/cloud/usage/dao/UsageVMSnapshotOnPrimaryDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageVMSnapshotOnPrimaryDao.java rename to engine/schema/src/main/java/com/cloud/cloud/usage/dao/UsageVMSnapshotOnPrimaryDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java b/engine/schema/src/main/java/com/cloud/cloud/usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java rename to engine/schema/src/main/java/com/cloud/cloud/usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java diff --git a/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java b/engine/schema/src/main/java/com/cloud/cluster/agentlb/HostTransferMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java rename to engine/schema/src/main/java/com/cloud/cluster/agentlb/HostTransferMapVO.java diff --git a/engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDao.java b/engine/schema/src/main/java/com/cloud/cluster/agentlb/dao/HostTransferMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDao.java rename to engine/schema/src/main/java/com/cloud/cluster/agentlb/dao/HostTransferMapDao.java diff --git a/engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/configuration/ResourceCountVO.java b/engine/schema/src/main/java/com/cloud/configuration/ResourceCountVO.java similarity index 100% rename from engine/schema/src/com/cloud/configuration/ResourceCountVO.java rename to engine/schema/src/main/java/com/cloud/configuration/ResourceCountVO.java diff --git a/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java b/engine/schema/src/main/java/com/cloud/configuration/ResourceLimitVO.java similarity index 100% rename from engine/schema/src/com/cloud/configuration/ResourceLimitVO.java rename to engine/schema/src/main/java/com/cloud/configuration/ResourceLimitVO.java diff --git a/engine/schema/src/com/cloud/configuration/dao/ResourceCountDao.java b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java similarity index 100% rename from engine/schema/src/com/cloud/configuration/dao/ResourceCountDao.java rename to engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java diff --git a/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java rename to engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java diff --git a/engine/schema/src/com/cloud/configuration/dao/ResourceLimitDao.java b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceLimitDao.java similarity index 100% rename from engine/schema/src/com/cloud/configuration/dao/ResourceLimitDao.java rename to engine/schema/src/main/java/com/cloud/configuration/dao/ResourceLimitDao.java diff --git a/engine/schema/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceLimitDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java rename to engine/schema/src/main/java/com/cloud/configuration/dao/ResourceLimitDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java b/engine/schema/src/main/java/com/cloud/dc/AccountVlanMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/AccountVlanMapVO.java rename to engine/schema/src/main/java/com/cloud/dc/AccountVlanMapVO.java diff --git a/engine/schema/src/com/cloud/dc/ClusterDetailsDao.java b/engine/schema/src/main/java/com/cloud/dc/ClusterDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/ClusterDetailsDao.java rename to engine/schema/src/main/java/com/cloud/dc/ClusterDetailsDao.java diff --git a/engine/schema/src/com/cloud/dc/ClusterDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/ClusterDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/ClusterDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/ClusterDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java b/engine/schema/src/main/java/com/cloud/dc/ClusterDetailsVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/ClusterDetailsVO.java rename to engine/schema/src/main/java/com/cloud/dc/ClusterDetailsVO.java diff --git a/engine/schema/src/com/cloud/dc/ClusterVO.java b/engine/schema/src/main/java/com/cloud/dc/ClusterVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/ClusterVO.java rename to engine/schema/src/main/java/com/cloud/dc/ClusterVO.java diff --git a/engine/schema/src/com/cloud/dc/ClusterVSMMapVO.java b/engine/schema/src/main/java/com/cloud/dc/ClusterVSMMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/ClusterVSMMapVO.java rename to engine/schema/src/main/java/com/cloud/dc/ClusterVSMMapVO.java diff --git a/engine/schema/src/com/cloud/dc/DataCenterDetailVO.java b/engine/schema/src/main/java/com/cloud/dc/DataCenterDetailVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/DataCenterDetailVO.java rename to engine/schema/src/main/java/com/cloud/dc/DataCenterDetailVO.java diff --git a/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java b/engine/schema/src/main/java/com/cloud/dc/DataCenterIpAddressVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java rename to engine/schema/src/main/java/com/cloud/dc/DataCenterIpAddressVO.java diff --git a/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java b/engine/schema/src/main/java/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java rename to engine/schema/src/main/java/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java diff --git a/engine/schema/src/com/cloud/dc/DataCenterVO.java b/engine/schema/src/main/java/com/cloud/dc/DataCenterVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/DataCenterVO.java rename to engine/schema/src/main/java/com/cloud/dc/DataCenterVO.java diff --git a/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java b/engine/schema/src/main/java/com/cloud/dc/DataCenterVnetVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/DataCenterVnetVO.java rename to engine/schema/src/main/java/com/cloud/dc/DataCenterVnetVO.java diff --git a/engine/schema/src/com/cloud/dc/DomainVlanMapVO.java b/engine/schema/src/main/java/com/cloud/dc/DomainVlanMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/DomainVlanMapVO.java rename to engine/schema/src/main/java/com/cloud/dc/DomainVlanMapVO.java diff --git a/engine/schema/src/com/cloud/dc/HostPodVO.java b/engine/schema/src/main/java/com/cloud/dc/HostPodVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/HostPodVO.java rename to engine/schema/src/main/java/com/cloud/dc/HostPodVO.java diff --git a/engine/schema/src/com/cloud/dc/PodCluster.java b/engine/schema/src/main/java/com/cloud/dc/PodCluster.java similarity index 100% rename from engine/schema/src/com/cloud/dc/PodCluster.java rename to engine/schema/src/main/java/com/cloud/dc/PodCluster.java diff --git a/engine/schema/src/com/cloud/dc/PodVlanMapVO.java b/engine/schema/src/main/java/com/cloud/dc/PodVlanMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/PodVlanMapVO.java rename to engine/schema/src/main/java/com/cloud/dc/PodVlanMapVO.java diff --git a/engine/schema/src/com/cloud/dc/PodVlanVO.java b/engine/schema/src/main/java/com/cloud/dc/PodVlanVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/PodVlanVO.java rename to engine/schema/src/main/java/com/cloud/dc/PodVlanVO.java diff --git a/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java b/engine/schema/src/main/java/com/cloud/dc/StorageNetworkIpAddressVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java rename to engine/schema/src/main/java/com/cloud/dc/StorageNetworkIpAddressVO.java diff --git a/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java b/engine/schema/src/main/java/com/cloud/dc/StorageNetworkIpRangeVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java rename to engine/schema/src/main/java/com/cloud/dc/StorageNetworkIpRangeVO.java diff --git a/engine/schema/src/com/cloud/dc/VlanDetailsVO.java b/engine/schema/src/main/java/com/cloud/dc/VlanDetailsVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/VlanDetailsVO.java rename to engine/schema/src/main/java/com/cloud/dc/VlanDetailsVO.java diff --git a/engine/schema/src/com/cloud/dc/VlanVO.java b/engine/schema/src/main/java/com/cloud/dc/VlanVO.java similarity index 100% rename from engine/schema/src/com/cloud/dc/VlanVO.java rename to engine/schema/src/main/java/com/cloud/dc/VlanVO.java diff --git a/engine/schema/src/com/cloud/dc/dao/AccountVlanMapDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/AccountVlanMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/AccountVlanMapDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/AccountVlanMapDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/AccountVlanMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/AccountVlanMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/ClusterDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/ClusterDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/ClusterDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/ClusterDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/ClusterVSMMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/ClusterVSMMapDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/DataCenterDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDetailsDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/DataCenterIpAddressDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/DataCenterIpAddressDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/DataCenterVnetDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/DataCenterVnetDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/DataCenterVnetDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/DataCenterVnetDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/DataCenterVnetDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/DomainVlanMapDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/DomainVlanMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/DomainVlanMapDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/DomainVlanMapDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/DomainVlanMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/DomainVlanMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/DomainVlanMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/DomainVlanMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/HostPodDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/HostPodDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/HostPodDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/HostPodDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/HostPodDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/HostPodDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/HostPodDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/HostPodDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/PodVlanDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/PodVlanDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/PodVlanDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/PodVlanDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/PodVlanDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/PodVlanDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/PodVlanDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/PodVlanDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/PodVlanMapDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/PodVlanMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/PodVlanMapDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/PodVlanMapDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/PodVlanMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/PodVlanMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/StorageNetworkIpAddressDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/StorageNetworkIpAddressDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/StorageNetworkIpRangeDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/StorageNetworkIpRangeDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/VlanDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/VlanDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/VlanDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/VlanDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/VlanDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/VlanDaoImpl.java diff --git a/engine/schema/src/com/cloud/dc/dao/VlanDetailsDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/VlanDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/VlanDetailsDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/VlanDetailsDao.java diff --git a/engine/schema/src/com/cloud/dc/dao/VlanDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/VlanDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/dc/dao/VlanDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/VlanDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/domain/DomainVO.java b/engine/schema/src/main/java/com/cloud/domain/DomainVO.java similarity index 100% rename from engine/schema/src/com/cloud/domain/DomainVO.java rename to engine/schema/src/main/java/com/cloud/domain/DomainVO.java diff --git a/engine/schema/src/com/cloud/domain/dao/DomainDao.java b/engine/schema/src/main/java/com/cloud/domain/dao/DomainDao.java similarity index 100% rename from engine/schema/src/com/cloud/domain/dao/DomainDao.java rename to engine/schema/src/main/java/com/cloud/domain/dao/DomainDao.java diff --git a/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java b/engine/schema/src/main/java/com/cloud/domain/dao/DomainDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java rename to engine/schema/src/main/java/com/cloud/domain/dao/DomainDaoImpl.java diff --git a/engine/schema/src/com/cloud/domain/DomainDetailVO.java b/engine/schema/src/main/java/com/cloud/domain/domain/DomainDetailVO.java similarity index 100% rename from engine/schema/src/com/cloud/domain/DomainDetailVO.java rename to engine/schema/src/main/java/com/cloud/domain/domain/DomainDetailVO.java diff --git a/engine/schema/src/com/cloud/domain/dao/DomainDetailsDao.java b/engine/schema/src/main/java/com/cloud/domain/domain/dao/DomainDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/domain/dao/DomainDetailsDao.java rename to engine/schema/src/main/java/com/cloud/domain/domain/dao/DomainDetailsDao.java diff --git a/engine/schema/src/com/cloud/domain/dao/DomainDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/domain/domain/dao/DomainDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/domain/dao/DomainDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/domain/domain/dao/DomainDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/event/EventVO.java b/engine/schema/src/main/java/com/cloud/event/EventVO.java similarity index 100% rename from engine/schema/src/com/cloud/event/EventVO.java rename to engine/schema/src/main/java/com/cloud/event/EventVO.java diff --git a/engine/schema/src/com/cloud/event/UsageEventDetailsVO.java b/engine/schema/src/main/java/com/cloud/event/UsageEventDetailsVO.java similarity index 100% rename from engine/schema/src/com/cloud/event/UsageEventDetailsVO.java rename to engine/schema/src/main/java/com/cloud/event/UsageEventDetailsVO.java diff --git a/engine/schema/src/com/cloud/event/UsageEventVO.java b/engine/schema/src/main/java/com/cloud/event/UsageEventVO.java similarity index 100% rename from engine/schema/src/com/cloud/event/UsageEventVO.java rename to engine/schema/src/main/java/com/cloud/event/UsageEventVO.java diff --git a/engine/schema/src/com/cloud/event/dao/EventDao.java b/engine/schema/src/main/java/com/cloud/event/dao/EventDao.java similarity index 100% rename from engine/schema/src/com/cloud/event/dao/EventDao.java rename to engine/schema/src/main/java/com/cloud/event/dao/EventDao.java diff --git a/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java b/engine/schema/src/main/java/com/cloud/event/dao/EventDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/event/dao/EventDaoImpl.java rename to engine/schema/src/main/java/com/cloud/event/dao/EventDaoImpl.java diff --git a/engine/schema/src/com/cloud/event/dao/UsageEventDao.java b/engine/schema/src/main/java/com/cloud/event/dao/UsageEventDao.java similarity index 100% rename from engine/schema/src/com/cloud/event/dao/UsageEventDao.java rename to engine/schema/src/main/java/com/cloud/event/dao/UsageEventDao.java diff --git a/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java b/engine/schema/src/main/java/com/cloud/event/dao/UsageEventDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java rename to engine/schema/src/main/java/com/cloud/event/dao/UsageEventDaoImpl.java diff --git a/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDao.java b/engine/schema/src/main/java/com/cloud/event/dao/UsageEventDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/event/dao/UsageEventDetailsDao.java rename to engine/schema/src/main/java/com/cloud/event/dao/UsageEventDetailsDao.java diff --git a/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/event/dao/UsageEventDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/event/dao/UsageEventDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/gpu/HostGpuGroupsVO.java b/engine/schema/src/main/java/com/cloud/gpu/HostGpuGroupsVO.java similarity index 100% rename from engine/schema/src/com/cloud/gpu/HostGpuGroupsVO.java rename to engine/schema/src/main/java/com/cloud/gpu/HostGpuGroupsVO.java diff --git a/engine/schema/src/com/cloud/gpu/VGPUTypesVO.java b/engine/schema/src/main/java/com/cloud/gpu/VGPUTypesVO.java similarity index 100% rename from engine/schema/src/com/cloud/gpu/VGPUTypesVO.java rename to engine/schema/src/main/java/com/cloud/gpu/VGPUTypesVO.java diff --git a/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDao.java b/engine/schema/src/main/java/com/cloud/gpu/dao/HostGpuGroupsDao.java similarity index 100% rename from engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDao.java rename to engine/schema/src/main/java/com/cloud/gpu/dao/HostGpuGroupsDao.java diff --git a/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java b/engine/schema/src/main/java/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java diff --git a/engine/schema/src/com/cloud/gpu/dao/VGPUTypesDao.java b/engine/schema/src/main/java/com/cloud/gpu/dao/VGPUTypesDao.java similarity index 100% rename from engine/schema/src/com/cloud/gpu/dao/VGPUTypesDao.java rename to engine/schema/src/main/java/com/cloud/gpu/dao/VGPUTypesDao.java diff --git a/engine/schema/src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java b/engine/schema/src/main/java/com/cloud/gpu/dao/VGPUTypesDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java rename to engine/schema/src/main/java/com/cloud/gpu/dao/VGPUTypesDaoImpl.java diff --git a/engine/schema/src/com/cloud/host/DetailVO.java b/engine/schema/src/main/java/com/cloud/host/DetailVO.java similarity index 100% rename from engine/schema/src/com/cloud/host/DetailVO.java rename to engine/schema/src/main/java/com/cloud/host/DetailVO.java diff --git a/engine/schema/src/com/cloud/host/HostTagVO.java b/engine/schema/src/main/java/com/cloud/host/HostTagVO.java similarity index 100% rename from engine/schema/src/com/cloud/host/HostTagVO.java rename to engine/schema/src/main/java/com/cloud/host/HostTagVO.java diff --git a/engine/schema/src/com/cloud/host/HostVO.java b/engine/schema/src/main/java/com/cloud/host/HostVO.java similarity index 100% rename from engine/schema/src/com/cloud/host/HostVO.java rename to engine/schema/src/main/java/com/cloud/host/HostVO.java diff --git a/engine/schema/src/com/cloud/host/dao/HostDao.java b/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java similarity index 100% rename from engine/schema/src/com/cloud/host/dao/HostDao.java rename to engine/schema/src/main/java/com/cloud/host/dao/HostDao.java diff --git a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/host/dao/HostDaoImpl.java rename to engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java diff --git a/engine/schema/src/com/cloud/host/dao/HostDetailsDao.java b/engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/host/dao/HostDetailsDao.java rename to engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDao.java diff --git a/engine/schema/src/com/cloud/host/dao/HostDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/host/dao/HostDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/host/dao/HostTagsDao.java b/engine/schema/src/main/java/com/cloud/host/dao/HostTagsDao.java similarity index 100% rename from engine/schema/src/com/cloud/host/dao/HostTagsDao.java rename to engine/schema/src/main/java/com/cloud/host/dao/HostTagsDao.java diff --git a/engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java b/engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java diff --git a/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java b/engine/schema/src/main/java/com/cloud/hypervisor/HypervisorCapabilitiesVO.java similarity index 100% rename from engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java rename to engine/schema/src/main/java/com/cloud/hypervisor/HypervisorCapabilitiesVO.java diff --git a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDao.java b/engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDao.java similarity index 100% rename from engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDao.java rename to engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDao.java diff --git a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java b/engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java rename to engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java b/engine/schema/src/main/java/com/cloud/network/LBHealthCheckPolicyVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java rename to engine/schema/src/main/java/com/cloud/network/LBHealthCheckPolicyVO.java diff --git a/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java b/engine/schema/src/main/java/com/cloud/network/UserIpv6AddressVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/UserIpv6AddressVO.java rename to engine/schema/src/main/java/com/cloud/network/UserIpv6AddressVO.java diff --git a/engine/schema/src/com/cloud/network/VpnUserVO.java b/engine/schema/src/main/java/com/cloud/network/VpnUserVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/VpnUserVO.java rename to engine/schema/src/main/java/com/cloud/network/VpnUserVO.java diff --git a/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java b/engine/schema/src/main/java/com/cloud/network/as/AutoScalePolicyConditionMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java rename to engine/schema/src/main/java/com/cloud/network/as/AutoScalePolicyConditionMapVO.java diff --git a/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java b/engine/schema/src/main/java/com/cloud/network/as/AutoScalePolicyVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java rename to engine/schema/src/main/java/com/cloud/network/as/AutoScalePolicyVO.java diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java b/engine/schema/src/main/java/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java rename to engine/schema/src/main/java/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java b/engine/schema/src/main/java/com/cloud/network/as/AutoScaleVmGroupVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java rename to engine/schema/src/main/java/com/cloud/network/as/AutoScaleVmGroupVO.java diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java b/engine/schema/src/main/java/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java rename to engine/schema/src/main/java/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java b/engine/schema/src/main/java/com/cloud/network/as/AutoScaleVmProfileVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java rename to engine/schema/src/main/java/com/cloud/network/as/AutoScaleVmProfileVO.java diff --git a/engine/schema/src/com/cloud/network/as/ConditionVO.java b/engine/schema/src/main/java/com/cloud/network/as/ConditionVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/ConditionVO.java rename to engine/schema/src/main/java/com/cloud/network/as/ConditionVO.java diff --git a/engine/schema/src/com/cloud/network/as/CounterVO.java b/engine/schema/src/main/java/com/cloud/network/as/CounterVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/CounterVO.java rename to engine/schema/src/main/java/com/cloud/network/as/CounterVO.java diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDao.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScalePolicyDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDao.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/AutoScalePolicyDao.java diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupDao.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupDao.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupDao.java diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDao.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDao.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDao.java diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmProfileDao.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmProfileDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/AutoScaleVmProfileDao.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmProfileDao.java diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/as/dao/ConditionDao.java b/engine/schema/src/main/java/com/cloud/network/as/dao/ConditionDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/ConditionDao.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/ConditionDao.java diff --git a/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/as/dao/ConditionDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/ConditionDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/as/dao/CounterDao.java b/engine/schema/src/main/java/com/cloud/network/as/dao/CounterDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/CounterDao.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/CounterDao.java diff --git a/engine/schema/src/com/cloud/network/as/dao/CounterDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/as/dao/CounterDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/as/dao/CounterDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/as/dao/CounterDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java b/engine/schema/src/main/java/com/cloud/network/dao/AccountGuestVlanMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/AccountGuestVlanMapDao.java diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java b/engine/schema/src/main/java/com/cloud/network/dao/AccountGuestVlanMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/AccountGuestVlanMapVO.java diff --git a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDao.java b/engine/schema/src/main/java/com/cloud/network/dao/ExternalFirewallDeviceDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/ExternalFirewallDeviceDao.java diff --git a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java b/engine/schema/src/main/java/com/cloud/network/dao/ExternalFirewallDeviceVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/ExternalFirewallDeviceVO.java diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java b/engine/schema/src/main/java/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java b/engine/schema/src/main/java/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDao.java b/engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesCidrsDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesCidrsDao.java diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java b/engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesCidrsVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesCidrsVO.java diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesDao.java b/engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/FirewallRulesDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesDao.java diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesDcidrsDao.java b/engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesDcidrsDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/FirewallRulesDcidrsDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesDcidrsDao.java diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesDcidrsDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesDcidrsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/FirewallRulesDcidrsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesDcidrsDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesDestCidrsVO.java b/engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesDestCidrsVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/FirewallRulesDestCidrsVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesDestCidrsVO.java diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDao.java b/engine/schema/src/main/java/com/cloud/network/dao/IPAddressDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/IPAddressDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/IPAddressDao.java diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/IPAddressDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/IPAddressDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressVO.java b/engine/schema/src/main/java/com/cloud/network/dao/IPAddressVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/IPAddressVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/IPAddressVO.java diff --git a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapDao.java b/engine/schema/src/main/java/com/cloud/network/dao/InlineLoadBalancerNicMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/InlineLoadBalancerNicMapDao.java diff --git a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java b/engine/schema/src/main/java/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java diff --git a/engine/schema/src/com/cloud/network/dao/LBHealthCheckPolicyDao.java b/engine/schema/src/main/java/com/cloud/network/dao/LBHealthCheckPolicyDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LBHealthCheckPolicyDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/LBHealthCheckPolicyDao.java diff --git a/engine/schema/src/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyDao.java b/engine/schema/src/main/java/com/cloud/network/dao/LBStickinessPolicyDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LBStickinessPolicyDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/LBStickinessPolicyDao.java diff --git a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java b/engine/schema/src/main/java/com/cloud/network/dao/LBStickinessPolicyVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/LBStickinessPolicyVO.java diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java b/engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerCertMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerCertMapDao.java diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java b/engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerCertMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerCertMapVO.java diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerDao.java b/engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LoadBalancerDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerDao.java diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapDao.java b/engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVMMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVMMapDao.java diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java b/engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVMMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVMMapVO.java diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java b/engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVO.java diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java b/engine/schema/src/main/java/com/cloud/network/dao/MonitoringServiceDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/MonitoringServiceDao.java diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/MonitoringServiceDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/MonitoringServiceDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java b/engine/schema/src/main/java/com/cloud/network/dao/MonitoringServiceVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/MonitoringServiceVO.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkAccountDao.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkAccountDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkAccountDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkAccountDao.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkAccountDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkAccountDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkAccountDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkAccountDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkAccountVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkAccountVO.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDao.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkDao.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDetailVO.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkDetailVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailVO.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDao.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkDetailsDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDao.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDomainDao.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDomainDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkDomainDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkDomainDao.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDomainDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkDomainDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDomainVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkDomainVO.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDao.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkExternalFirewallDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkExternalFirewallDao.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkExternalFirewallVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkExternalFirewallVO.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDao.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkExternalLoadBalancerDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkExternalLoadBalancerDao.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkOpDao.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkOpDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkOpDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkOpDao.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkOpDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkOpDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkOpVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkOpVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkOpVO.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDao.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkRuleConfigDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkRuleConfigDao.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigVO.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkRuleConfigVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkRuleConfigVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkRuleConfigVO.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapDao.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkServiceMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkServiceMapDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkServiceMapDao.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkServiceMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkServiceMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkServiceMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkServiceMapVO.java diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/NetworkVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/NetworkVO.java diff --git a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDao.java b/engine/schema/src/main/java/com/cloud/network/dao/OpRouterMonitorServiceDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/OpRouterMonitorServiceDao.java diff --git a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java b/engine/schema/src/main/java/com/cloud/network/dao/OpRouterMonitorServiceVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/OpRouterMonitorServiceVO.java diff --git a/engine/schema/src/com/cloud/network/dao/OvsProviderDao.java b/engine/schema/src/main/java/com/cloud/network/dao/OvsProviderDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/OvsProviderDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/OvsProviderDao.java diff --git a/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/OvsProviderDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/OvsProviderDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkDao.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PhysicalNetworkDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkDao.java diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDao.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkServiceProviderDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkServiceProviderDao.java diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTagDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTagDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTagVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTagVO.java diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDao.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeDao.java diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkVO.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PhysicalNetworkVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkVO.java diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileDao.java b/engine/schema/src/main/java/com/cloud/network/dao/PortProfileDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PortProfileDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/PortProfileDao.java diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/PortProfileDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/PortProfileDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileVO.java b/engine/schema/src/main/java/com/cloud/network/dao/PortProfileVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/PortProfileVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/PortProfileVO.java diff --git a/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnDao.java b/engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/RemoteAccessVpnDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnDao.java diff --git a/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnVO.java b/engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/RemoteAccessVpnVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnVO.java diff --git a/engine/schema/src/com/cloud/network/dao/RouterNetworkDao.java b/engine/schema/src/main/java/com/cloud/network/dao/RouterNetworkDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/RouterNetworkDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/RouterNetworkDao.java diff --git a/engine/schema/src/com/cloud/network/dao/RouterNetworkDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/RouterNetworkDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/RouterNetworkDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/RouterNetworkDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/RouterNetworkVO.java b/engine/schema/src/main/java/com/cloud/network/dao/RouterNetworkVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/RouterNetworkVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/RouterNetworkVO.java diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDao.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnConnectionDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnConnectionDao.java diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnConnectionVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnConnectionVO.java diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDao.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayDao.java diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayVO.java diff --git a/engine/schema/src/com/cloud/network/dao/SslCertDao.java b/engine/schema/src/main/java/com/cloud/network/dao/SslCertDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/SslCertDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/SslCertDao.java diff --git a/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/SslCertDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/SslCertDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/SslCertVO.java b/engine/schema/src/main/java/com/cloud/network/dao/SslCertVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/SslCertVO.java rename to engine/schema/src/main/java/com/cloud/network/dao/SslCertVO.java diff --git a/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDao.java b/engine/schema/src/main/java/com/cloud/network/dao/UserIpv6AddressDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/UserIpv6AddressDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/UserIpv6AddressDao.java diff --git a/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/UserIpv6AddressDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/UserIpv6AddressDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDao.java b/engine/schema/src/main/java/com/cloud/network/dao/VirtualRouterProviderDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/VirtualRouterProviderDao.java diff --git a/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/dao/VpnUserDao.java b/engine/schema/src/main/java/com/cloud/network/dao/VpnUserDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/VpnUserDao.java rename to engine/schema/src/main/java/com/cloud/network/dao/VpnUserDao.java diff --git a/engine/schema/src/com/cloud/network/dao/VpnUserDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/VpnUserDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/dao/VpnUserDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/dao/VpnUserDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/element/OvsProviderVO.java b/engine/schema/src/main/java/com/cloud/network/element/OvsProviderVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/element/OvsProviderVO.java rename to engine/schema/src/main/java/com/cloud/network/element/OvsProviderVO.java diff --git a/engine/schema/src/com/cloud/network/element/VirtualRouterProviderVO.java b/engine/schema/src/main/java/com/cloud/network/element/VirtualRouterProviderVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/element/VirtualRouterProviderVO.java rename to engine/schema/src/main/java/com/cloud/network/element/VirtualRouterProviderVO.java diff --git a/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java b/engine/schema/src/main/java/com/cloud/network/rules/FirewallRuleVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java rename to engine/schema/src/main/java/com/cloud/network/rules/FirewallRuleVO.java diff --git a/engine/schema/src/com/cloud/network/rules/PortForwardingRuleVO.java b/engine/schema/src/main/java/com/cloud/network/rules/PortForwardingRuleVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/rules/PortForwardingRuleVO.java rename to engine/schema/src/main/java/com/cloud/network/rules/PortForwardingRuleVO.java diff --git a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java b/engine/schema/src/main/java/com/cloud/network/rules/dao/PortForwardingRulesDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java rename to engine/schema/src/main/java/com/cloud/network/rules/dao/PortForwardingRulesDao.java diff --git a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupRuleVO.java b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupRuleVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/SecurityGroupRuleVO.java rename to engine/schema/src/main/java/com/cloud/network/security/SecurityGroupRuleVO.java diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupRulesVO.java b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupRulesVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/SecurityGroupRulesVO.java rename to engine/schema/src/main/java/com/cloud/network/security/SecurityGroupRulesVO.java diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupVMMapVO.java b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVMMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/SecurityGroupVMMapVO.java rename to engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVMMapVO.java diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/SecurityGroupVO.java rename to engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVO.java diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupWork.java b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupWork.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/SecurityGroupWork.java rename to engine/schema/src/main/java/com/cloud/network/security/SecurityGroupWork.java diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupWorkVO.java b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupWorkVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/SecurityGroupWorkVO.java rename to engine/schema/src/main/java/com/cloud/network/security/SecurityGroupWorkVO.java diff --git a/engine/schema/src/com/cloud/network/security/VmRulesetLogVO.java b/engine/schema/src/main/java/com/cloud/network/security/VmRulesetLogVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/VmRulesetLogVO.java rename to engine/schema/src/main/java/com/cloud/network/security/VmRulesetLogVO.java diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDao.java b/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/dao/SecurityGroupDao.java rename to engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupDao.java diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDao.java b/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupRuleDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDao.java rename to engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupRuleDao.java diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRulesDao.java b/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupRulesDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/dao/SecurityGroupRulesDao.java rename to engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupRulesDao.java diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDao.java b/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupVMMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDao.java rename to engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupVMMapDao.java diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDao.java b/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupWorkDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDao.java rename to engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupWorkDao.java diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDao.java b/engine/schema/src/main/java/com/cloud/network/security/dao/VmRulesetLogDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDao.java rename to engine/schema/src/main/java/com/cloud/network/security/dao/VmRulesetLogDao.java diff --git a/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsDao.java b/engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLItemCidrsDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsDao.java rename to engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLItemCidrsDao.java diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsVO.java b/engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLItemCidrsVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsVO.java rename to engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLItemCidrsVO.java diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java b/engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLItemDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java rename to engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLItemDao.java diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java b/engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLItemVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java rename to engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLItemVO.java diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLVO.java b/engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/NetworkACLVO.java rename to engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLVO.java diff --git a/engine/schema/src/com/cloud/network/vpc/PrivateIpVO.java b/engine/schema/src/main/java/com/cloud/network/vpc/PrivateIpVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/PrivateIpVO.java rename to engine/schema/src/main/java/com/cloud/network/vpc/PrivateIpVO.java diff --git a/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java b/engine/schema/src/main/java/com/cloud/network/vpc/StaticRouteVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java rename to engine/schema/src/main/java/com/cloud/network/vpc/StaticRouteVO.java diff --git a/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java b/engine/schema/src/main/java/com/cloud/network/vpc/VpcGatewayVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java rename to engine/schema/src/main/java/com/cloud/network/vpc/VpcGatewayVO.java diff --git a/engine/schema/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java b/engine/schema/src/main/java/com/cloud/network/vpc/VpcOfferingServiceMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java rename to engine/schema/src/main/java/com/cloud/network/vpc/VpcOfferingServiceMapVO.java diff --git a/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java b/engine/schema/src/main/java/com/cloud/network/vpc/VpcOfferingVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java rename to engine/schema/src/main/java/com/cloud/network/vpc/VpcOfferingVO.java diff --git a/engine/schema/src/com/cloud/network/vpc/VpcServiceMapVO.java b/engine/schema/src/main/java/com/cloud/network/vpc/VpcServiceMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/VpcServiceMapVO.java rename to engine/schema/src/main/java/com/cloud/network/vpc/VpcServiceMapVO.java diff --git a/engine/schema/src/com/cloud/network/vpc/VpcVO.java b/engine/schema/src/main/java/com/cloud/network/vpc/VpcVO.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/VpcVO.java rename to engine/schema/src/main/java/com/cloud/network/vpc/VpcVO.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDao.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/NetworkACLDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDao.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/NetworkACLDao.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDao.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/PrivateIpDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDao.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/PrivateIpDao.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDao.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/StaticRouteDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDao.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/StaticRouteDao.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcDao.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/VpcDao.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcDao.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcGatewayDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcGatewayDao.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDao.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDao.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingDao.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDao.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcServiceMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDao.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcServiceMapDao.java diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingDetailsVO.java b/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingDetailsVO.java similarity index 100% rename from engine/schema/src/com/cloud/offerings/NetworkOfferingDetailsVO.java rename to engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingDetailsVO.java diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingServiceMapVO.java b/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingServiceMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/offerings/NetworkOfferingServiceMapVO.java rename to engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingServiceMapVO.java diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java b/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java similarity index 100% rename from engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java rename to engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java diff --git a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDao.java b/engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingDao.java similarity index 100% rename from engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDao.java rename to engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingDao.java diff --git a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java b/engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java rename to engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java diff --git a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDetailsDao.java b/engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDetailsDao.java rename to engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingDetailsDao.java diff --git a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDao.java b/engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingServiceMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDao.java rename to engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingServiceMapDao.java diff --git a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/projects/ProjectAccountVO.java b/engine/schema/src/main/java/com/cloud/projects/ProjectAccountVO.java similarity index 100% rename from engine/schema/src/com/cloud/projects/ProjectAccountVO.java rename to engine/schema/src/main/java/com/cloud/projects/ProjectAccountVO.java diff --git a/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java b/engine/schema/src/main/java/com/cloud/projects/ProjectInvitationVO.java similarity index 100% rename from engine/schema/src/com/cloud/projects/ProjectInvitationVO.java rename to engine/schema/src/main/java/com/cloud/projects/ProjectInvitationVO.java diff --git a/engine/schema/src/com/cloud/projects/ProjectVO.java b/engine/schema/src/main/java/com/cloud/projects/ProjectVO.java similarity index 100% rename from engine/schema/src/com/cloud/projects/ProjectVO.java rename to engine/schema/src/main/java/com/cloud/projects/ProjectVO.java diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectAccountDao.java b/engine/schema/src/main/java/com/cloud/projects/dao/ProjectAccountDao.java similarity index 100% rename from engine/schema/src/com/cloud/projects/dao/ProjectAccountDao.java rename to engine/schema/src/main/java/com/cloud/projects/dao/ProjectAccountDao.java diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java b/engine/schema/src/main/java/com/cloud/projects/dao/ProjectAccountDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java rename to engine/schema/src/main/java/com/cloud/projects/dao/ProjectAccountDaoImpl.java diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectDao.java b/engine/schema/src/main/java/com/cloud/projects/dao/ProjectDao.java similarity index 100% rename from engine/schema/src/com/cloud/projects/dao/ProjectDao.java rename to engine/schema/src/main/java/com/cloud/projects/dao/ProjectDao.java diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java b/engine/schema/src/main/java/com/cloud/projects/dao/ProjectDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java rename to engine/schema/src/main/java/com/cloud/projects/dao/ProjectDaoImpl.java diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDao.java b/engine/schema/src/main/java/com/cloud/projects/dao/ProjectInvitationDao.java similarity index 100% rename from engine/schema/src/com/cloud/projects/dao/ProjectInvitationDao.java rename to engine/schema/src/main/java/com/cloud/projects/dao/ProjectInvitationDao.java diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java b/engine/schema/src/main/java/com/cloud/projects/dao/ProjectInvitationDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java rename to engine/schema/src/main/java/com/cloud/projects/dao/ProjectInvitationDaoImpl.java diff --git a/engine/schema/src/com/cloud/secstorage/CommandExecLogDao.java b/engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogDao.java similarity index 100% rename from engine/schema/src/com/cloud/secstorage/CommandExecLogDao.java rename to engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogDao.java diff --git a/engine/schema/src/com/cloud/secstorage/CommandExecLogDaoImpl.java b/engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/secstorage/CommandExecLogDaoImpl.java rename to engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogDaoImpl.java diff --git a/engine/schema/src/com/cloud/secstorage/CommandExecLogVO.java b/engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogVO.java similarity index 100% rename from engine/schema/src/com/cloud/secstorage/CommandExecLogVO.java rename to engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogVO.java diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingDetailsVO.java b/engine/schema/src/main/java/com/cloud/service/ServiceOfferingDetailsVO.java similarity index 100% rename from engine/schema/src/com/cloud/service/ServiceOfferingDetailsVO.java rename to engine/schema/src/main/java/com/cloud/service/ServiceOfferingDetailsVO.java diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java b/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java similarity index 100% rename from engine/schema/src/com/cloud/service/ServiceOfferingVO.java rename to engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDao.java b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java similarity index 100% rename from engine/schema/src/com/cloud/service/dao/ServiceOfferingDao.java rename to engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java rename to engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDao.java b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDao.java rename to engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDetailsDao.java diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java b/engine/schema/src/main/java/com/cloud/storage/DiskOfferingVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/DiskOfferingVO.java rename to engine/schema/src/main/java/com/cloud/storage/DiskOfferingVO.java diff --git a/engine/schema/src/com/cloud/storage/GuestOSCategoryVO.java b/engine/schema/src/main/java/com/cloud/storage/GuestOSCategoryVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/GuestOSCategoryVO.java rename to engine/schema/src/main/java/com/cloud/storage/GuestOSCategoryVO.java diff --git a/engine/schema/src/com/cloud/storage/GuestOSHypervisorVO.java b/engine/schema/src/main/java/com/cloud/storage/GuestOSHypervisorVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/GuestOSHypervisorVO.java rename to engine/schema/src/main/java/com/cloud/storage/GuestOSHypervisorVO.java diff --git a/engine/schema/src/com/cloud/storage/GuestOSVO.java b/engine/schema/src/main/java/com/cloud/storage/GuestOSVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/GuestOSVO.java rename to engine/schema/src/main/java/com/cloud/storage/GuestOSVO.java diff --git a/engine/schema/src/com/cloud/storage/LaunchPermissionVO.java b/engine/schema/src/main/java/com/cloud/storage/LaunchPermissionVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/LaunchPermissionVO.java rename to engine/schema/src/main/java/com/cloud/storage/LaunchPermissionVO.java diff --git a/engine/schema/src/com/cloud/storage/SnapshotPolicyVO.java b/engine/schema/src/main/java/com/cloud/storage/SnapshotPolicyVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/SnapshotPolicyVO.java rename to engine/schema/src/main/java/com/cloud/storage/SnapshotPolicyVO.java diff --git a/engine/schema/src/com/cloud/storage/SnapshotScheduleVO.java b/engine/schema/src/main/java/com/cloud/storage/SnapshotScheduleVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/SnapshotScheduleVO.java rename to engine/schema/src/main/java/com/cloud/storage/SnapshotScheduleVO.java diff --git a/engine/schema/src/com/cloud/storage/SnapshotVO.java b/engine/schema/src/main/java/com/cloud/storage/SnapshotVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/SnapshotVO.java rename to engine/schema/src/main/java/com/cloud/storage/SnapshotVO.java diff --git a/engine/schema/src/com/cloud/storage/StoragePoolHostAssoc.java b/engine/schema/src/main/java/com/cloud/storage/StoragePoolHostAssoc.java similarity index 100% rename from engine/schema/src/com/cloud/storage/StoragePoolHostAssoc.java rename to engine/schema/src/main/java/com/cloud/storage/StoragePoolHostAssoc.java diff --git a/engine/schema/src/com/cloud/storage/StoragePoolHostVO.java b/engine/schema/src/main/java/com/cloud/storage/StoragePoolHostVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/StoragePoolHostVO.java rename to engine/schema/src/main/java/com/cloud/storage/StoragePoolHostVO.java diff --git a/engine/schema/src/com/cloud/storage/StoragePoolTagVO.java b/engine/schema/src/main/java/com/cloud/storage/StoragePoolTagVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/StoragePoolTagVO.java rename to engine/schema/src/main/java/com/cloud/storage/StoragePoolTagVO.java diff --git a/engine/schema/src/com/cloud/storage/StoragePoolWorkVO.java b/engine/schema/src/main/java/com/cloud/storage/StoragePoolWorkVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/StoragePoolWorkVO.java rename to engine/schema/src/main/java/com/cloud/storage/StoragePoolWorkVO.java diff --git a/engine/schema/src/com/cloud/storage/UploadVO.java b/engine/schema/src/main/java/com/cloud/storage/UploadVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/UploadVO.java rename to engine/schema/src/main/java/com/cloud/storage/UploadVO.java diff --git a/engine/schema/src/com/cloud/storage/VMTemplateDetailVO.java b/engine/schema/src/main/java/com/cloud/storage/VMTemplateDetailVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/VMTemplateDetailVO.java rename to engine/schema/src/main/java/com/cloud/storage/VMTemplateDetailVO.java diff --git a/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java b/engine/schema/src/main/java/com/cloud/storage/VMTemplateHostVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/VMTemplateHostVO.java rename to engine/schema/src/main/java/com/cloud/storage/VMTemplateHostVO.java diff --git a/engine/schema/src/com/cloud/storage/VMTemplateStoragePoolVO.java b/engine/schema/src/main/java/com/cloud/storage/VMTemplateStoragePoolVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/VMTemplateStoragePoolVO.java rename to engine/schema/src/main/java/com/cloud/storage/VMTemplateStoragePoolVO.java diff --git a/engine/schema/src/com/cloud/storage/VMTemplateVO.java b/engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/VMTemplateVO.java rename to engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java diff --git a/engine/schema/src/com/cloud/storage/VMTemplateZoneVO.java b/engine/schema/src/main/java/com/cloud/storage/VMTemplateZoneVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/VMTemplateZoneVO.java rename to engine/schema/src/main/java/com/cloud/storage/VMTemplateZoneVO.java diff --git a/engine/schema/src/com/cloud/storage/VolumeDetailVO.java b/engine/schema/src/main/java/com/cloud/storage/VolumeDetailVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/VolumeDetailVO.java rename to engine/schema/src/main/java/com/cloud/storage/VolumeDetailVO.java diff --git a/engine/schema/src/com/cloud/storage/VolumeHostVO.java b/engine/schema/src/main/java/com/cloud/storage/VolumeHostVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/VolumeHostVO.java rename to engine/schema/src/main/java/com/cloud/storage/VolumeHostVO.java diff --git a/engine/schema/src/com/cloud/storage/VolumeVO.java b/engine/schema/src/main/java/com/cloud/storage/VolumeVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/VolumeVO.java rename to engine/schema/src/main/java/com/cloud/storage/VolumeVO.java diff --git a/engine/schema/src/com/cloud/storage/dao/DiskOfferingDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/DiskOfferingDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/GuestOSCategoryDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSCategoryDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/GuestOSCategoryDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/GuestOSCategoryDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/GuestOSDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/GuestOSDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/GuestOSDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/GuestOSDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/GuestOSDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/GuestOSDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/LaunchPermissionDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/LaunchPermissionDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/LaunchPermissionDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/LaunchPermissionDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/LaunchPermissionDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/SnapshotDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/SnapshotDetailsDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDetailsDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/SnapshotDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDetailsVO.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java rename to engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDetailsVO.java diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotPolicyDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/SnapshotPolicyDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotScheduleDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotScheduleDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/SnapshotScheduleDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/SnapshotScheduleDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolHostDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/StoragePoolHostDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolHostDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolHostDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolHostDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolTagsDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolTagsDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/StoragePoolTagsDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolTagsDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolTagsDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolTagsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/StoragePoolTagsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolTagsDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolWorkDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolWorkDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/UploadDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/UploadDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/UploadDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/UploadDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/UploadDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/UploadDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VMTemplateDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDetailsDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateHostDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VMTemplateHostDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateHostDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateHostDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateHostDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateZoneDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VMTemplateZoneDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VolumeDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VolumeDetailsDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VolumeDetailsDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VolumeDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeHostDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VolumeHostDao.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VolumeHostDao.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VolumeHostDao.java diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VolumeHostDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java rename to engine/schema/src/main/java/com/cloud/storage/dao/VolumeHostDaoImpl.java diff --git a/engine/schema/src/com/cloud/tags/ResourceTagVO.java b/engine/schema/src/main/java/com/cloud/tags/ResourceTagVO.java similarity index 100% rename from engine/schema/src/com/cloud/tags/ResourceTagVO.java rename to engine/schema/src/main/java/com/cloud/tags/ResourceTagVO.java diff --git a/engine/schema/src/com/cloud/tags/dao/ResourceTagDao.java b/engine/schema/src/main/java/com/cloud/tags/dao/ResourceTagDao.java similarity index 100% rename from engine/schema/src/com/cloud/tags/dao/ResourceTagDao.java rename to engine/schema/src/main/java/com/cloud/tags/dao/ResourceTagDao.java diff --git a/engine/schema/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java b/engine/schema/src/main/java/com/cloud/tags/dao/ResourceTagsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/tags/dao/ResourceTagsDaoImpl.java diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseCreator.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/DatabaseCreator.java rename to engine/schema/src/main/java/com/cloud/upgrade/DatabaseCreator.java diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseIntegrityChecker.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java rename to engine/schema/src/main/java/com/cloud/upgrade/DatabaseIntegrityChecker.java diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java rename to engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/DatabaseAccessObject.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/DatabaseAccessObject.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/DatabaseAccessObject.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/DatabaseAccessObject.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/DbUpgrade.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/DbUpgrade.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/DbUpgrade.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/DbUpgrade.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/DbUpgradeUtils.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/DbUpgradeUtils.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/DbUpgradeUtils.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/DbUpgradeUtils.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/LegacyDbUpgrade.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/LegacyDbUpgrade.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/LegacyDbUpgrade.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/LegacyDbUpgrade.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade217to218.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade217to218.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade217to218.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade217to218.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade218to22.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade218to22.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to224DomainVlans.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade218to224DomainVlans.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade218to224DomainVlans.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade218to224DomainVlans.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22Premium.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade218to22Premium.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22Premium.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade218to22Premium.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2210to2211.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2210to2211.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade2210to2211.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2210to2211.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2211to2212.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2211to2212.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade2211to2212.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2211to2212.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2211to2212Premium.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2211to2212Premium.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade2211to2212Premium.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2211to2212Premium.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2212to2213.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2212to2213.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade2212to2213.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2212to2213.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2213to2214.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2213to2214.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2214to30.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2214to30.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade221to222.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade221to222.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade221to222.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade221to222.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade221to222Premium.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade221to222Premium.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade221to222Premium.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade221to222Premium.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade222to224.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade222to224.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade222to224.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade222to224.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade222to224Premium.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade222to224Premium.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade222to224Premium.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade222to224Premium.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade224to225.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade224to225.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade224to225.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade224to225.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade225to226.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade225to226.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade225to226.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade225to226.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade227to228.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade227to228.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade227to228.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade227to228.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade227to228Premium.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade227to228Premium.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade227to228Premium.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade227to228Premium.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade228to229.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade228to229.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade228to229.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade228to229.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade229to2210.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade229to2210.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade229to2210.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade229to2210.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade301to302.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade301to302.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade301to302.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade301to302.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to303.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade302to303.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade302to303.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade302to303.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade302to40.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade302to40.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade303to304.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade303to304.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade303to304.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade303to304.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade304to305.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade304to305.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade304to305.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade304to305.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade305to306.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade305to306.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade305to306.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade305to306.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade306to307.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade306to307.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade306to307.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade306to307.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade307to410.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade307to410.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade307to410.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade307to410.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade30to301.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade30to301.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade30to301.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade30to301.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade30xBase.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade30xBase.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade30xBase.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade30xBase.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade40to41.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade40to41.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade40to41.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade40to41.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade41000to41100.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41000to41100.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade41000to41100.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41000to41100.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade410to420.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade410to420.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade420to421.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade420to421.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade421to430.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade421to430.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade430to440.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade430to440.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade431to440.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade431to440.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade431to440.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade431to440.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade432to440.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade432to440.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade432to440.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade432to440.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade440to441.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade440to441.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade440to441.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade440to441.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade441to442.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade441to442.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade441to442.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade441to442.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade442to450.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade442to450.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade443to444.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade443to444.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade443to444.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade443to444.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade443to450.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade443to450.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade443to450.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade443to450.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade444to450.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade444to450.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade444to450.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade444to450.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade450to451.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade450to451.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade450to451.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade450to451.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade451to452.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade451to452.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade451to452.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade451to452.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade452to453.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade452to453.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade452to453.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade452to453.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade452to460.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade452to460.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade452to460.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade452to460.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade453to460.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade453to460.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade453to460.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade453to460.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade460to461.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade460to461.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade460to461.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade460to461.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade461to470.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade461to470.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade461to470.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade461to470.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade470to471.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade470to471.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade470to471.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade470to471.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade471to480.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade471to480.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade471to480.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade471to480.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade480to481.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade480to481.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade480to481.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade480to481.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade481to490.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade481to490.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade481to490.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade481to490.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade490to4910.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade490to4910.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade490to4910.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade490to4910.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade4910to4920.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade4910to4920.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade4910to4920.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade4910to4920.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade4920to4930.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade4920to4930.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade4920to4930.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade4920to4930.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade4930to41000.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade4930to41000.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/Upgrade4930to41000.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade4930to41000.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/UpgradeSnapshot217to224.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/UpgradeSnapshot217to224.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/UpgradeSnapshot217to224.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/UpgradeSnapshot217to224.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/UpgradeSnapshot223to224.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/UpgradeSnapshot223to224.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/UpgradeSnapshot223to224.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/UpgradeSnapshot223to224.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/VersionDao.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/VersionDao.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/VersionDao.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/VersionDao.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/VersionDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/VersionDaoImpl.java diff --git a/engine/schema/src/com/cloud/upgrade/dao/VersionVO.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/VersionVO.java similarity index 100% rename from engine/schema/src/com/cloud/upgrade/dao/VersionVO.java rename to engine/schema/src/main/java/com/cloud/upgrade/dao/VersionVO.java diff --git a/engine/schema/src/com/cloud/usage/ExternalPublicIpStatisticsVO.java b/engine/schema/src/main/java/com/cloud/usage/ExternalPublicIpStatisticsVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/ExternalPublicIpStatisticsVO.java rename to engine/schema/src/main/java/com/cloud/usage/ExternalPublicIpStatisticsVO.java diff --git a/engine/schema/src/com/cloud/usage/UsageIPAddressVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageIPAddressVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageIPAddressVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageIPAddressVO.java diff --git a/engine/schema/src/com/cloud/usage/UsageJobVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageJobVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageJobVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageJobVO.java diff --git a/engine/schema/src/com/cloud/usage/UsageLoadBalancerPolicyVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageLoadBalancerPolicyVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageLoadBalancerPolicyVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageLoadBalancerPolicyVO.java diff --git a/engine/schema/src/com/cloud/usage/UsageNetworkOfferingVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageNetworkOfferingVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageNetworkOfferingVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageNetworkOfferingVO.java diff --git a/engine/schema/src/com/cloud/usage/UsageNetworkVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageNetworkVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageNetworkVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageNetworkVO.java diff --git a/engine/schema/src/com/cloud/usage/UsagePortForwardingRuleVO.java b/engine/schema/src/main/java/com/cloud/usage/UsagePortForwardingRuleVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsagePortForwardingRuleVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsagePortForwardingRuleVO.java diff --git a/engine/schema/src/com/cloud/usage/UsageSecurityGroupVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageSecurityGroupVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageSecurityGroupVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageSecurityGroupVO.java diff --git a/engine/schema/src/com/cloud/usage/UsageStorageVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageStorageVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageStorageVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageStorageVO.java diff --git a/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageVMInstanceVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageVMInstanceVO.java diff --git a/engine/schema/src/com/cloud/usage/UsageVMSnapshotVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageVMSnapshotVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageVMSnapshotVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageVMSnapshotVO.java diff --git a/engine/schema/src/com/cloud/usage/UsageVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageVO.java diff --git a/engine/schema/src/com/cloud/usage/UsageVPNUserVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageVPNUserVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageVPNUserVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageVPNUserVO.java diff --git a/engine/schema/src/com/cloud/usage/UsageVmDiskVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageVmDiskVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageVmDiskVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageVmDiskVO.java diff --git a/engine/schema/src/com/cloud/usage/UsageVolumeVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageVolumeVO.java similarity index 100% rename from engine/schema/src/com/cloud/usage/UsageVolumeVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageVolumeVO.java diff --git a/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/ExternalPublicIpStatisticsDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/ExternalPublicIpStatisticsDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageIPAddressDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageIPAddressDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageIPAddressDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageIPAddressDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageIPAddressDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageJobDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageJobDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageJobDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageJobDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageLoadBalancerPolicyDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageLoadBalancerPolicyDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageNetworkDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworkDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageNetworkDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworkDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworkDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworkDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworkOfferingDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworkOfferingDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsagePortForwardingRuleDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsagePortForwardingRuleDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsagePortForwardingRuleDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsagePortForwardingRuleDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageSecurityGroupDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageSecurityGroupDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageSecurityGroupDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageSecurityGroupDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageStorageDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageStorageDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageStorageDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageStorageDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageStorageDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageStorageDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVMInstanceDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageVMInstanceDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVMSnapshotDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVMSnapshotDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageVMSnapshotDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageVMSnapshotDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVMSnapshotDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVMSnapshotDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageVMSnapshotDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageVMSnapshotDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVPNUserDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVPNUserDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageVPNUserDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageVPNUserDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVPNUserDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageVPNUserDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVmDiskDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageVmDiskDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageVmDiskDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVmDiskDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageVmDiskDaoImpl.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVolumeDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVolumeDao.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageVolumeDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageVolumeDao.java diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVolumeDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageVolumeDaoImpl.java diff --git a/engine/schema/src/com/cloud/user/AccountDetailVO.java b/engine/schema/src/main/java/com/cloud/user/AccountDetailVO.java similarity index 100% rename from engine/schema/src/com/cloud/user/AccountDetailVO.java rename to engine/schema/src/main/java/com/cloud/user/AccountDetailVO.java diff --git a/engine/schema/src/com/cloud/user/AccountDetailsDao.java b/engine/schema/src/main/java/com/cloud/user/AccountDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/user/AccountDetailsDao.java rename to engine/schema/src/main/java/com/cloud/user/AccountDetailsDao.java diff --git a/engine/schema/src/com/cloud/user/AccountDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/user/AccountDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/user/AccountDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/user/AccountDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/user/AccountVO.java b/engine/schema/src/main/java/com/cloud/user/AccountVO.java similarity index 100% rename from engine/schema/src/com/cloud/user/AccountVO.java rename to engine/schema/src/main/java/com/cloud/user/AccountVO.java diff --git a/engine/schema/src/com/cloud/user/SSHKeyPairVO.java b/engine/schema/src/main/java/com/cloud/user/SSHKeyPairVO.java similarity index 100% rename from engine/schema/src/com/cloud/user/SSHKeyPairVO.java rename to engine/schema/src/main/java/com/cloud/user/SSHKeyPairVO.java diff --git a/engine/schema/src/com/cloud/user/UserAccountVO.java b/engine/schema/src/main/java/com/cloud/user/UserAccountVO.java similarity index 100% rename from engine/schema/src/com/cloud/user/UserAccountVO.java rename to engine/schema/src/main/java/com/cloud/user/UserAccountVO.java diff --git a/engine/schema/src/com/cloud/user/UserStatisticsVO.java b/engine/schema/src/main/java/com/cloud/user/UserStatisticsVO.java similarity index 100% rename from engine/schema/src/com/cloud/user/UserStatisticsVO.java rename to engine/schema/src/main/java/com/cloud/user/UserStatisticsVO.java diff --git a/engine/schema/src/com/cloud/user/UserStatsLogVO.java b/engine/schema/src/main/java/com/cloud/user/UserStatsLogVO.java similarity index 100% rename from engine/schema/src/com/cloud/user/UserStatsLogVO.java rename to engine/schema/src/main/java/com/cloud/user/UserStatsLogVO.java diff --git a/engine/schema/src/com/cloud/user/UserVO.java b/engine/schema/src/main/java/com/cloud/user/UserVO.java similarity index 100% rename from engine/schema/src/com/cloud/user/UserVO.java rename to engine/schema/src/main/java/com/cloud/user/UserVO.java diff --git a/engine/schema/src/com/cloud/user/VmDiskStatisticsVO.java b/engine/schema/src/main/java/com/cloud/user/VmDiskStatisticsVO.java similarity index 100% rename from engine/schema/src/com/cloud/user/VmDiskStatisticsVO.java rename to engine/schema/src/main/java/com/cloud/user/VmDiskStatisticsVO.java diff --git a/engine/schema/src/com/cloud/user/dao/AccountDao.java b/engine/schema/src/main/java/com/cloud/user/dao/AccountDao.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/AccountDao.java rename to engine/schema/src/main/java/com/cloud/user/dao/AccountDao.java diff --git a/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java b/engine/schema/src/main/java/com/cloud/user/dao/AccountDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java rename to engine/schema/src/main/java/com/cloud/user/dao/AccountDaoImpl.java diff --git a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java b/engine/schema/src/main/java/com/cloud/user/dao/SSHKeyPairDao.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java rename to engine/schema/src/main/java/com/cloud/user/dao/SSHKeyPairDao.java diff --git a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java b/engine/schema/src/main/java/com/cloud/user/dao/SSHKeyPairDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java rename to engine/schema/src/main/java/com/cloud/user/dao/SSHKeyPairDaoImpl.java diff --git a/engine/schema/src/com/cloud/user/dao/UserAccountDao.java b/engine/schema/src/main/java/com/cloud/user/dao/UserAccountDao.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/UserAccountDao.java rename to engine/schema/src/main/java/com/cloud/user/dao/UserAccountDao.java diff --git a/engine/schema/src/com/cloud/user/dao/UserAccountDaoImpl.java b/engine/schema/src/main/java/com/cloud/user/dao/UserAccountDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/UserAccountDaoImpl.java rename to engine/schema/src/main/java/com/cloud/user/dao/UserAccountDaoImpl.java diff --git a/engine/schema/src/com/cloud/user/dao/UserDao.java b/engine/schema/src/main/java/com/cloud/user/dao/UserDao.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/UserDao.java rename to engine/schema/src/main/java/com/cloud/user/dao/UserDao.java diff --git a/engine/schema/src/com/cloud/user/dao/UserDaoImpl.java b/engine/schema/src/main/java/com/cloud/user/dao/UserDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/UserDaoImpl.java rename to engine/schema/src/main/java/com/cloud/user/dao/UserDaoImpl.java diff --git a/engine/schema/src/com/cloud/user/dao/UserStatisticsDao.java b/engine/schema/src/main/java/com/cloud/user/dao/UserStatisticsDao.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/UserStatisticsDao.java rename to engine/schema/src/main/java/com/cloud/user/dao/UserStatisticsDao.java diff --git a/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java b/engine/schema/src/main/java/com/cloud/user/dao/UserStatisticsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/user/dao/UserStatisticsDaoImpl.java diff --git a/engine/schema/src/com/cloud/user/dao/UserStatsLogDao.java b/engine/schema/src/main/java/com/cloud/user/dao/UserStatsLogDao.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/UserStatsLogDao.java rename to engine/schema/src/main/java/com/cloud/user/dao/UserStatsLogDao.java diff --git a/engine/schema/src/com/cloud/user/dao/UserStatsLogDaoImpl.java b/engine/schema/src/main/java/com/cloud/user/dao/UserStatsLogDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/UserStatsLogDaoImpl.java rename to engine/schema/src/main/java/com/cloud/user/dao/UserStatsLogDaoImpl.java diff --git a/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDao.java b/engine/schema/src/main/java/com/cloud/user/dao/VmDiskStatisticsDao.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDao.java rename to engine/schema/src/main/java/com/cloud/user/dao/VmDiskStatisticsDao.java diff --git a/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java b/engine/schema/src/main/java/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/ConsoleProxyVO.java b/engine/schema/src/main/java/com/cloud/vm/ConsoleProxyVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/ConsoleProxyVO.java rename to engine/schema/src/main/java/com/cloud/vm/ConsoleProxyVO.java diff --git a/engine/schema/src/com/cloud/vm/DomainRouterVO.java b/engine/schema/src/main/java/com/cloud/vm/DomainRouterVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/DomainRouterVO.java rename to engine/schema/src/main/java/com/cloud/vm/DomainRouterVO.java diff --git a/engine/schema/src/com/cloud/vm/InstanceGroupVMMapVO.java b/engine/schema/src/main/java/com/cloud/vm/InstanceGroupVMMapVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/InstanceGroupVMMapVO.java rename to engine/schema/src/main/java/com/cloud/vm/InstanceGroupVMMapVO.java diff --git a/engine/schema/src/com/cloud/vm/InstanceGroupVO.java b/engine/schema/src/main/java/com/cloud/vm/InstanceGroupVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/InstanceGroupVO.java rename to engine/schema/src/main/java/com/cloud/vm/InstanceGroupVO.java diff --git a/engine/schema/src/com/cloud/vm/ItWorkDao.java b/engine/schema/src/main/java/com/cloud/vm/ItWorkDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/ItWorkDao.java rename to engine/schema/src/main/java/com/cloud/vm/ItWorkDao.java diff --git a/engine/schema/src/com/cloud/vm/ItWorkDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/ItWorkDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/ItWorkDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/ItWorkDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/ItWorkVO.java b/engine/schema/src/main/java/com/cloud/vm/ItWorkVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/ItWorkVO.java rename to engine/schema/src/main/java/com/cloud/vm/ItWorkVO.java diff --git a/engine/schema/src/com/cloud/vm/NicDetailVO.java b/engine/schema/src/main/java/com/cloud/vm/NicDetailVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/NicDetailVO.java rename to engine/schema/src/main/java/com/cloud/vm/NicDetailVO.java diff --git a/engine/schema/src/com/cloud/vm/NicExtraDhcpOptionVO.java b/engine/schema/src/main/java/com/cloud/vm/NicExtraDhcpOptionVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/NicExtraDhcpOptionVO.java rename to engine/schema/src/main/java/com/cloud/vm/NicExtraDhcpOptionVO.java diff --git a/engine/schema/src/com/cloud/vm/NicVO.java b/engine/schema/src/main/java/com/cloud/vm/NicVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/NicVO.java rename to engine/schema/src/main/java/com/cloud/vm/NicVO.java diff --git a/engine/schema/src/com/cloud/vm/SecondaryStorageVmVO.java b/engine/schema/src/main/java/com/cloud/vm/SecondaryStorageVmVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/SecondaryStorageVmVO.java rename to engine/schema/src/main/java/com/cloud/vm/SecondaryStorageVmVO.java diff --git a/engine/schema/src/com/cloud/vm/UserVmCloneSettingVO.java b/engine/schema/src/main/java/com/cloud/vm/UserVmCloneSettingVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/UserVmCloneSettingVO.java rename to engine/schema/src/main/java/com/cloud/vm/UserVmCloneSettingVO.java diff --git a/engine/schema/src/com/cloud/vm/UserVmDetailVO.java b/engine/schema/src/main/java/com/cloud/vm/UserVmDetailVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/UserVmDetailVO.java rename to engine/schema/src/main/java/com/cloud/vm/UserVmDetailVO.java diff --git a/engine/schema/src/com/cloud/vm/UserVmVO.java b/engine/schema/src/main/java/com/cloud/vm/UserVmVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/UserVmVO.java rename to engine/schema/src/main/java/com/cloud/vm/UserVmVO.java diff --git a/engine/schema/src/com/cloud/vm/VMInstanceVO.java b/engine/schema/src/main/java/com/cloud/vm/VMInstanceVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/VMInstanceVO.java rename to engine/schema/src/main/java/com/cloud/vm/VMInstanceVO.java diff --git a/engine/schema/src/com/cloud/vm/dao/ConsoleProxyDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/ConsoleProxyDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/ConsoleProxyDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/ConsoleProxyDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/ConsoleProxyDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/ConsoleProxyDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/DomainRouterDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/DomainRouterDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/DomainRouterDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/DomainRouterDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/dao/InstanceGroupDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/InstanceGroupDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/InstanceGroupDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/InstanceGroupDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/InstanceGroupDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/InstanceGroupDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/dao/InstanceGroupVMMapDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/InstanceGroupVMMapDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/InstanceGroupVMMapDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/InstanceGroupVMMapDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/dao/NicDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/NicDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/dao/NicDetailsDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/NicDetailsDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/NicDetailsDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/NicDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/dao/NicExtraDhcpOptionDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicExtraDhcpOptionDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/NicExtraDhcpOptionDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/NicExtraDhcpOptionDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/NicExtraDhcpOptionDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicExtraDhcpOptionDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/NicExtraDhcpOptionDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/NicExtraDhcpOptionDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicIpAliasDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/NicIpAliasDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicIpAliasDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/NicIpAliasDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicIpAliasVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java rename to engine/schema/src/main/java/com/cloud/vm/dao/NicIpAliasVO.java diff --git a/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicSecondaryIpDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/NicSecondaryIpDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/NicSecondaryIpDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicSecondaryIpDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/NicSecondaryIpDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/NicSecondaryIpDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicSecondaryIpVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java rename to engine/schema/src/main/java/com/cloud/vm/dao/NicSecondaryIpVO.java diff --git a/engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/SecondaryStorageVmDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/SecondaryStorageVmDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmCloneSettingDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/UserVmCloneSettingDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/UserVmDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/UserVmDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmData.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmData.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/UserVmData.java rename to engine/schema/src/main/java/com/cloud/vm/dao/UserVmData.java diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/dao/VMInstanceDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/VMInstanceDao.java rename to engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java diff --git a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java b/engine/schema/src/main/java/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java rename to engine/schema/src/main/java/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java diff --git a/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java b/engine/schema/src/main/java/com/cloud/vm/snapshot/VMSnapshotVO.java similarity index 100% rename from engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java rename to engine/schema/src/main/java/com/cloud/vm/snapshot/VMSnapshotVO.java diff --git a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDao.java b/engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDao.java rename to engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDao.java diff --git a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java diff --git a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDao.java b/engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDao.java similarity index 100% rename from engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDao.java rename to engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDao.java diff --git a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/acl/RolePermissionVO.java b/engine/schema/src/main/java/org/apache/cloudstack/acl/RolePermissionVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/acl/RolePermissionVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/acl/RolePermissionVO.java diff --git a/engine/schema/src/org/apache/cloudstack/acl/RoleVO.java b/engine/schema/src/main/java/org/apache/cloudstack/acl/RoleVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/acl/RoleVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/acl/RoleVO.java diff --git a/engine/schema/src/org/apache/cloudstack/acl/dao/RoleDao.java b/engine/schema/src/main/java/org/apache/cloudstack/acl/dao/RoleDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/acl/dao/RoleDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/acl/dao/RoleDao.java diff --git a/engine/schema/src/org/apache/cloudstack/acl/dao/RoleDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/acl/dao/RoleDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/acl/dao/RoleDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/acl/dao/RoleDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/acl/dao/RolePermissionsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/acl/dao/RolePermissionsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/acl/dao/RolePermissionsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/acl/dao/RolePermissionsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/acl/dao/RolePermissionsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/acl/dao/RolePermissionsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/acl/dao/RolePermissionsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/acl/dao/RolePermissionsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupDomainMapVO.java b/engine/schema/src/main/java/org/apache/cloudstack/affinity/AffinityGroupDomainMapVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupDomainMapVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/affinity/AffinityGroupDomainMapVO.java diff --git a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java b/engine/schema/src/main/java/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java diff --git a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVO.java b/engine/schema/src/main/java/org/apache/cloudstack/affinity/AffinityGroupVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/affinity/AffinityGroupVO.java diff --git a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDao.java b/engine/schema/src/main/java/org/apache/cloudstack/affinity/dao/AffinityGroupDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/affinity/dao/AffinityGroupDao.java diff --git a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDao.java b/engine/schema/src/main/java/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDao.java diff --git a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDao.java b/engine/schema/src/main/java/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDao.java diff --git a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/annotation/AnnotationVO.java b/engine/schema/src/main/java/org/apache/cloudstack/annotation/AnnotationVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/annotation/AnnotationVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/annotation/AnnotationVO.java diff --git a/engine/schema/src/org/apache/cloudstack/annotation/dao/AnnotationDao.java b/engine/schema/src/main/java/org/apache/cloudstack/annotation/dao/AnnotationDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/annotation/dao/AnnotationDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/annotation/dao/AnnotationDao.java diff --git a/engine/schema/src/org/apache/cloudstack/annotation/dao/AnnotationDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/annotation/dao/AnnotationDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/annotation/dao/AnnotationDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/annotation/dao/AnnotationDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDao.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDao.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/ha/HAConfigVO.java b/engine/schema/src/main/java/org/apache/cloudstack/ha/HAConfigVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/ha/HAConfigVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/ha/HAConfigVO.java diff --git a/engine/schema/src/org/apache/cloudstack/ha/dao/HAConfigDao.java b/engine/schema/src/main/java/org/apache/cloudstack/ha/dao/HAConfigDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/ha/dao/HAConfigDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/ha/dao/HAConfigDao.java diff --git a/engine/schema/src/org/apache/cloudstack/ha/dao/HAConfigDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/ha/dao/HAConfigDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/ha/dao/HAConfigDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/ha/dao/HAConfigDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/lb/ApplicationLoadBalancerRuleVO.java b/engine/schema/src/main/java/org/apache/cloudstack/lb/ApplicationLoadBalancerRuleVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/lb/ApplicationLoadBalancerRuleVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/lb/ApplicationLoadBalancerRuleVO.java diff --git a/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDao.java b/engine/schema/src/main/java/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDao.java diff --git a/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementVO.java b/engine/schema/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementVO.java diff --git a/engine/schema/src/org/apache/cloudstack/outofbandmanagement/dao/OutOfBandManagementDao.java b/engine/schema/src/main/java/org/apache/cloudstack/outofbandmanagement/dao/OutOfBandManagementDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/outofbandmanagement/dao/OutOfBandManagementDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/outofbandmanagement/dao/OutOfBandManagementDao.java diff --git a/engine/schema/src/org/apache/cloudstack/outofbandmanagement/dao/OutOfBandManagementDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/outofbandmanagement/dao/OutOfBandManagementDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/outofbandmanagement/dao/OutOfBandManagementDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/outofbandmanagement/dao/OutOfBandManagementDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpDao.java b/engine/schema/src/main/java/org/apache/cloudstack/region/PortableIpDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/PortableIpDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/PortableIpDao.java diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/region/PortableIpDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/PortableIpDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/PortableIpDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDao.java b/engine/schema/src/main/java/org/apache/cloudstack/region/PortableIpRangeDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/PortableIpRangeDao.java diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeVO.java b/engine/schema/src/main/java/org/apache/cloudstack/region/PortableIpRangeVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/PortableIpRangeVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/PortableIpRangeVO.java diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpVO.java b/engine/schema/src/main/java/org/apache/cloudstack/region/PortableIpVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/PortableIpVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/PortableIpVO.java diff --git a/engine/schema/src/org/apache/cloudstack/region/RegionSyncVO.java b/engine/schema/src/main/java/org/apache/cloudstack/region/RegionSyncVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/RegionSyncVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/RegionSyncVO.java diff --git a/engine/schema/src/org/apache/cloudstack/region/RegionVO.java b/engine/schema/src/main/java/org/apache/cloudstack/region/RegionVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/RegionVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/RegionVO.java diff --git a/engine/schema/src/org/apache/cloudstack/region/dao/RegionDao.java b/engine/schema/src/main/java/org/apache/cloudstack/region/dao/RegionDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/dao/RegionDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/dao/RegionDao.java diff --git a/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/region/dao/RegionDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/dao/RegionDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDao.java b/engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDao.java diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java b/engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleDao.java b/engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleDao.java diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java b/engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmGroupDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/AutoScaleVmGroupDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmGroupDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/AutoScaleVmGroupDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/DiskOfferingDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/DiskOfferingDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/DiskOfferingDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/DiskOfferingDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/GuestOsDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/GuestOsDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/GuestOsDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/GuestOsDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/LBHealthCheckPolicyDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/LBHealthCheckPolicyDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/LBHealthCheckPolicyDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/LBHealthCheckPolicyDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/LBStickinessPolicyDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/LBStickinessPolicyDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/LBStickinessPolicyDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/LBStickinessPolicyDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteCustomerGatewayDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/Site2SiteCustomerGatewayDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteCustomerGatewayDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/Site2SiteCustomerGatewayDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnConnectionDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/Site2SiteVpnConnectionDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnConnectionDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/Site2SiteVpnConnectionDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnGatewayDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/Site2SiteVpnGatewayDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnGatewayDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/Site2SiteVpnGatewayDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/UserDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/UserDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/UserDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/UserDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/VpcDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/VpcDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/VpcDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcGatewayDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/VpcGatewayDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/VpcGatewayDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/VpcGatewayDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/GuestOsDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/GuestOsDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/GuestOsDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/GuestOsDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/GuestOsDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/GuestOsDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/GuestOsDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/GuestOsDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/UserDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/UserDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDao.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDao.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailsDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailsDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDao.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDao.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailVO.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailsDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailsDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailsDao.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolVO.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/StoragePoolVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/StoragePoolVO.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java similarity index 100% rename from engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java rename to engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java diff --git a/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml similarity index 100% rename from engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml rename to engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml diff --git a/engine/schema/resources/META-INF/cloudstack/system/spring-engine-schema-system-checkers-context.xml b/engine/schema/src/main/resources/META-INF/cloudstack/system/spring-engine-schema-system-checkers-context.xml similarity index 100% rename from engine/schema/resources/META-INF/cloudstack/system/spring-engine-schema-system-checkers-context.xml rename to engine/schema/src/main/resources/META-INF/cloudstack/system/spring-engine-schema-system-checkers-context.xml diff --git a/engine/schema/resources/META-INF/db/create-default-role-api-mappings.sql b/engine/schema/src/main/resources/META-INF/db/create-default-role-api-mappings.sql similarity index 100% rename from engine/schema/resources/META-INF/db/create-default-role-api-mappings.sql rename to engine/schema/src/main/resources/META-INF/db/create-default-role-api-mappings.sql diff --git a/engine/schema/resources/META-INF/db/data-217to218.sql b/engine/schema/src/main/resources/META-INF/db/data-217to218.sql similarity index 100% rename from engine/schema/resources/META-INF/db/data-217to218.sql rename to engine/schema/src/main/resources/META-INF/db/data-217to218.sql diff --git a/engine/schema/resources/META-INF/db/schema-20to21.sql b/engine/schema/src/main/resources/META-INF/db/schema-20to21.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-20to21.sql rename to engine/schema/src/main/resources/META-INF/db/schema-20to21.sql diff --git a/engine/schema/resources/META-INF/db/schema-217to218.sql b/engine/schema/src/main/resources/META-INF/db/schema-217to218.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-217to218.sql rename to engine/schema/src/main/resources/META-INF/db/schema-217to218.sql diff --git a/engine/schema/resources/META-INF/db/schema-21to22-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-21to22-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-21to22-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-21to22-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-21to22-premium.sql b/engine/schema/src/main/resources/META-INF/db/schema-21to22-premium.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-21to22-premium.sql rename to engine/schema/src/main/resources/META-INF/db/schema-21to22-premium.sql diff --git a/engine/schema/resources/META-INF/db/schema-21to22.sql b/engine/schema/src/main/resources/META-INF/db/schema-21to22.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-21to22.sql rename to engine/schema/src/main/resources/META-INF/db/schema-21to22.sql diff --git a/engine/schema/resources/META-INF/db/schema-2210to2211.sql b/engine/schema/src/main/resources/META-INF/db/schema-2210to2211.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-2210to2211.sql rename to engine/schema/src/main/resources/META-INF/db/schema-2210to2211.sql diff --git a/engine/schema/resources/META-INF/db/schema-2211to2212-premium.sql b/engine/schema/src/main/resources/META-INF/db/schema-2211to2212-premium.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-2211to2212-premium.sql rename to engine/schema/src/main/resources/META-INF/db/schema-2211to2212-premium.sql diff --git a/engine/schema/resources/META-INF/db/schema-2211to2212.sql b/engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-2211to2212.sql rename to engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql diff --git a/engine/schema/resources/META-INF/db/schema-2212to2213.sql b/engine/schema/src/main/resources/META-INF/db/schema-2212to2213.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-2212to2213.sql rename to engine/schema/src/main/resources/META-INF/db/schema-2212to2213.sql diff --git a/engine/schema/resources/META-INF/db/schema-2213to2214.sql b/engine/schema/src/main/resources/META-INF/db/schema-2213to2214.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-2213to2214.sql rename to engine/schema/src/main/resources/META-INF/db/schema-2213to2214.sql diff --git a/engine/schema/resources/META-INF/db/schema-2214to30-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-2214to30-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-2214to30-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-2214to30-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-2214to30.sql b/engine/schema/src/main/resources/META-INF/db/schema-2214to30.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-2214to30.sql rename to engine/schema/src/main/resources/META-INF/db/schema-2214to30.sql diff --git a/engine/schema/resources/META-INF/db/schema-221to222-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-221to222-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-221to222-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-221to222-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-221to222-premium.sql b/engine/schema/src/main/resources/META-INF/db/schema-221to222-premium.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-221to222-premium.sql rename to engine/schema/src/main/resources/META-INF/db/schema-221to222-premium.sql diff --git a/engine/schema/resources/META-INF/db/schema-221to222.sql b/engine/schema/src/main/resources/META-INF/db/schema-221to222.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-221to222.sql rename to engine/schema/src/main/resources/META-INF/db/schema-221to222.sql diff --git a/engine/schema/resources/META-INF/db/schema-222to224-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-222to224-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-222to224-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-222to224-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-222to224-premium.sql b/engine/schema/src/main/resources/META-INF/db/schema-222to224-premium.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-222to224-premium.sql rename to engine/schema/src/main/resources/META-INF/db/schema-222to224-premium.sql diff --git a/engine/schema/resources/META-INF/db/schema-222to224.sql b/engine/schema/src/main/resources/META-INF/db/schema-222to224.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-222to224.sql rename to engine/schema/src/main/resources/META-INF/db/schema-222to224.sql diff --git a/engine/schema/resources/META-INF/db/schema-224to225-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-224to225-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-224to225-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-224to225-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-224to225.sql b/engine/schema/src/main/resources/META-INF/db/schema-224to225.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-224to225.sql rename to engine/schema/src/main/resources/META-INF/db/schema-224to225.sql diff --git a/engine/schema/resources/META-INF/db/schema-225to226.sql b/engine/schema/src/main/resources/META-INF/db/schema-225to226.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-225to226.sql rename to engine/schema/src/main/resources/META-INF/db/schema-225to226.sql diff --git a/engine/schema/resources/META-INF/db/schema-227to228-premium.sql b/engine/schema/src/main/resources/META-INF/db/schema-227to228-premium.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-227to228-premium.sql rename to engine/schema/src/main/resources/META-INF/db/schema-227to228-premium.sql diff --git a/engine/schema/resources/META-INF/db/schema-227to228.sql b/engine/schema/src/main/resources/META-INF/db/schema-227to228.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-227to228.sql rename to engine/schema/src/main/resources/META-INF/db/schema-227to228.sql diff --git a/engine/schema/resources/META-INF/db/schema-228to229.sql b/engine/schema/src/main/resources/META-INF/db/schema-228to229.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-228to229.sql rename to engine/schema/src/main/resources/META-INF/db/schema-228to229.sql diff --git a/engine/schema/resources/META-INF/db/schema-229to2210.sql b/engine/schema/src/main/resources/META-INF/db/schema-229to2210.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-229to2210.sql rename to engine/schema/src/main/resources/META-INF/db/schema-229to2210.sql diff --git a/engine/schema/resources/META-INF/db/schema-22beta1to22beta2.sql b/engine/schema/src/main/resources/META-INF/db/schema-22beta1to22beta2.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-22beta1to22beta2.sql rename to engine/schema/src/main/resources/META-INF/db/schema-22beta1to22beta2.sql diff --git a/engine/schema/resources/META-INF/db/schema-22beta3to22beta4.sql b/engine/schema/src/main/resources/META-INF/db/schema-22beta3to22beta4.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-22beta3to22beta4.sql rename to engine/schema/src/main/resources/META-INF/db/schema-22beta3to22beta4.sql diff --git a/engine/schema/resources/META-INF/db/schema-301to302-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-301to302-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-301to302-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-301to302-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-301to302.sql b/engine/schema/src/main/resources/META-INF/db/schema-301to302.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-301to302.sql rename to engine/schema/src/main/resources/META-INF/db/schema-301to302.sql diff --git a/engine/schema/resources/META-INF/db/schema-302to303.sql b/engine/schema/src/main/resources/META-INF/db/schema-302to303.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-302to303.sql rename to engine/schema/src/main/resources/META-INF/db/schema-302to303.sql diff --git a/engine/schema/resources/META-INF/db/schema-302to40-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-302to40-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-302to40-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-302to40-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-302to40.sql b/engine/schema/src/main/resources/META-INF/db/schema-302to40.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-302to40.sql rename to engine/schema/src/main/resources/META-INF/db/schema-302to40.sql diff --git a/engine/schema/resources/META-INF/db/schema-304to305-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-304to305-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-304to305-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-304to305-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-304to305.sql b/engine/schema/src/main/resources/META-INF/db/schema-304to305.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-304to305.sql rename to engine/schema/src/main/resources/META-INF/db/schema-304to305.sql diff --git a/engine/schema/resources/META-INF/db/schema-305to306-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-305to306-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-305to306-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-305to306-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-305to306.sql b/engine/schema/src/main/resources/META-INF/db/schema-305to306.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-305to306.sql rename to engine/schema/src/main/resources/META-INF/db/schema-305to306.sql diff --git a/engine/schema/resources/META-INF/db/schema-306to307.sql b/engine/schema/src/main/resources/META-INF/db/schema-306to307.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-306to307.sql rename to engine/schema/src/main/resources/META-INF/db/schema-306to307.sql diff --git a/engine/schema/resources/META-INF/db/schema-307to410-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-307to410-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-307to410-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-307to410-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-307to410.sql b/engine/schema/src/main/resources/META-INF/db/schema-307to410.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-307to410.sql rename to engine/schema/src/main/resources/META-INF/db/schema-307to410.sql diff --git a/engine/schema/resources/META-INF/db/schema-30to301.sql b/engine/schema/src/main/resources/META-INF/db/schema-30to301.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-30to301.sql rename to engine/schema/src/main/resources/META-INF/db/schema-30to301.sql diff --git a/engine/schema/resources/META-INF/db/schema-40to410-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-40to410-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-40to410-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-40to410-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-40to410.sql b/engine/schema/src/main/resources/META-INF/db/schema-40to410.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-40to410.sql rename to engine/schema/src/main/resources/META-INF/db/schema-40to410.sql diff --git a/engine/schema/resources/META-INF/db/schema-41000to41100-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41000to41100-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-41000to41100-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-41000to41100-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-41000to41100.sql b/engine/schema/src/main/resources/META-INF/db/schema-41000to41100.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-41000to41100.sql rename to engine/schema/src/main/resources/META-INF/db/schema-41000to41100.sql diff --git a/engine/schema/resources/META-INF/db/schema-410to420-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-410to420-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-410to420-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-410to420-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-410to420.sql b/engine/schema/src/main/resources/META-INF/db/schema-410to420.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-410to420.sql rename to engine/schema/src/main/resources/META-INF/db/schema-410to420.sql diff --git a/engine/schema/resources/META-INF/db/schema-420to421.sql b/engine/schema/src/main/resources/META-INF/db/schema-420to421.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-420to421.sql rename to engine/schema/src/main/resources/META-INF/db/schema-420to421.sql diff --git a/engine/schema/resources/META-INF/db/schema-421to430-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-421to430-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-421to430-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-421to430-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-421to430.sql b/engine/schema/src/main/resources/META-INF/db/schema-421to430.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-421to430.sql rename to engine/schema/src/main/resources/META-INF/db/schema-421to430.sql diff --git a/engine/schema/resources/META-INF/db/schema-430to440-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-430to440-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-430to440-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-430to440-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-430to440.sql b/engine/schema/src/main/resources/META-INF/db/schema-430to440.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-430to440.sql rename to engine/schema/src/main/resources/META-INF/db/schema-430to440.sql diff --git a/engine/schema/resources/META-INF/db/schema-440to441-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-440to441-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-440to441-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-440to441-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-440to441.sql b/engine/schema/src/main/resources/META-INF/db/schema-440to441.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-440to441.sql rename to engine/schema/src/main/resources/META-INF/db/schema-440to441.sql diff --git a/engine/schema/resources/META-INF/db/schema-441to442.sql b/engine/schema/src/main/resources/META-INF/db/schema-441to442.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-441to442.sql rename to engine/schema/src/main/resources/META-INF/db/schema-441to442.sql diff --git a/engine/schema/resources/META-INF/db/schema-442to450-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-442to450-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-442to450-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-442to450-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-442to450.sql b/engine/schema/src/main/resources/META-INF/db/schema-442to450.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-442to450.sql rename to engine/schema/src/main/resources/META-INF/db/schema-442to450.sql diff --git a/engine/schema/resources/META-INF/db/schema-443to444.sql b/engine/schema/src/main/resources/META-INF/db/schema-443to444.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-443to444.sql rename to engine/schema/src/main/resources/META-INF/db/schema-443to444.sql diff --git a/engine/schema/resources/META-INF/db/schema-450to451-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-450to451-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-450to451-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-450to451-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-450to451.sql b/engine/schema/src/main/resources/META-INF/db/schema-450to451.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-450to451.sql rename to engine/schema/src/main/resources/META-INF/db/schema-450to451.sql diff --git a/engine/schema/resources/META-INF/db/schema-451to452-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-451to452-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-451to452-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-451to452-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-451to452.sql b/engine/schema/src/main/resources/META-INF/db/schema-451to452.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-451to452.sql rename to engine/schema/src/main/resources/META-INF/db/schema-451to452.sql diff --git a/engine/schema/resources/META-INF/db/schema-452to453-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-452to453-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-452to453-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-452to453-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-452to453.sql b/engine/schema/src/main/resources/META-INF/db/schema-452to453.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-452to453.sql rename to engine/schema/src/main/resources/META-INF/db/schema-452to453.sql diff --git a/engine/schema/resources/META-INF/db/schema-452to460-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-452to460-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-452to460-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-452to460-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-452to460.sql b/engine/schema/src/main/resources/META-INF/db/schema-452to460.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-452to460.sql rename to engine/schema/src/main/resources/META-INF/db/schema-452to460.sql diff --git a/engine/schema/resources/META-INF/db/schema-460to461-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-460to461-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-460to461-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-460to461-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-460to461.sql b/engine/schema/src/main/resources/META-INF/db/schema-460to461.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-460to461.sql rename to engine/schema/src/main/resources/META-INF/db/schema-460to461.sql diff --git a/engine/schema/resources/META-INF/db/schema-461to470-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-461to470-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-461to470-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-461to470-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-461to470.sql b/engine/schema/src/main/resources/META-INF/db/schema-461to470.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-461to470.sql rename to engine/schema/src/main/resources/META-INF/db/schema-461to470.sql diff --git a/engine/schema/resources/META-INF/db/schema-470to471-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-470to471-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-470to471-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-470to471-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-470to471.sql b/engine/schema/src/main/resources/META-INF/db/schema-470to471.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-470to471.sql rename to engine/schema/src/main/resources/META-INF/db/schema-470to471.sql diff --git a/engine/schema/resources/META-INF/db/schema-471to480-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-471to480-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-471to480-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-471to480-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-471to480.sql b/engine/schema/src/main/resources/META-INF/db/schema-471to480.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-471to480.sql rename to engine/schema/src/main/resources/META-INF/db/schema-471to480.sql diff --git a/engine/schema/resources/META-INF/db/schema-480to481-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-480to481-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-480to481-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-480to481-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-480to481.sql b/engine/schema/src/main/resources/META-INF/db/schema-480to481.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-480to481.sql rename to engine/schema/src/main/resources/META-INF/db/schema-480to481.sql diff --git a/engine/schema/resources/META-INF/db/schema-481to490-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-481to490-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-481to490-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-481to490-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-481to490.sql b/engine/schema/src/main/resources/META-INF/db/schema-481to490.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-481to490.sql rename to engine/schema/src/main/resources/META-INF/db/schema-481to490.sql diff --git a/engine/schema/resources/META-INF/db/schema-490to4910-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-490to4910-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-490to4910-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-490to4910-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-490to4910.sql b/engine/schema/src/main/resources/META-INF/db/schema-490to4910.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-490to4910.sql rename to engine/schema/src/main/resources/META-INF/db/schema-490to4910.sql diff --git a/engine/schema/resources/META-INF/db/schema-4910to4920-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-4910to4920-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-4910to4920-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-4910to4920-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-4910to4920.sql b/engine/schema/src/main/resources/META-INF/db/schema-4910to4920.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-4910to4920.sql rename to engine/schema/src/main/resources/META-INF/db/schema-4910to4920.sql diff --git a/engine/schema/resources/META-INF/db/schema-4920to4930-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-4920to4930-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-4920to4930-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-4920to4930-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-4920to4930.sql b/engine/schema/src/main/resources/META-INF/db/schema-4920to4930.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-4920to4930.sql rename to engine/schema/src/main/resources/META-INF/db/schema-4920to4930.sql diff --git a/engine/schema/resources/META-INF/db/schema-4930to41000-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-4930to41000-cleanup.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-4930to41000-cleanup.sql rename to engine/schema/src/main/resources/META-INF/db/schema-4930to41000-cleanup.sql diff --git a/engine/schema/resources/META-INF/db/schema-4930to41000.sql b/engine/schema/src/main/resources/META-INF/db/schema-4930to41000.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-4930to41000.sql rename to engine/schema/src/main/resources/META-INF/db/schema-4930to41000.sql diff --git a/engine/schema/resources/META-INF/db/schema-level.sql b/engine/schema/src/main/resources/META-INF/db/schema-level.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-level.sql rename to engine/schema/src/main/resources/META-INF/db/schema-level.sql diff --git a/engine/schema/resources/META-INF/db/schema-snapshot-217to224.sql b/engine/schema/src/main/resources/META-INF/db/schema-snapshot-217to224.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-snapshot-217to224.sql rename to engine/schema/src/main/resources/META-INF/db/schema-snapshot-217to224.sql diff --git a/engine/schema/resources/META-INF/db/schema-snapshot-223to224.sql b/engine/schema/src/main/resources/META-INF/db/schema-snapshot-223to224.sql similarity index 100% rename from engine/schema/resources/META-INF/db/schema-snapshot-223to224.sql rename to engine/schema/src/main/resources/META-INF/db/schema-snapshot-223to224.sql diff --git a/engine/schema/test/com/cloud/storage/dao/StoragePoolTagsDaoImplTest.java b/engine/schema/src/test/java/com/cloud/storage/dao/StoragePoolTagsDaoImplTest.java similarity index 100% rename from engine/schema/test/com/cloud/storage/dao/StoragePoolTagsDaoImplTest.java rename to engine/schema/src/test/java/com/cloud/storage/dao/StoragePoolTagsDaoImplTest.java diff --git a/engine/schema/test/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java b/engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java similarity index 100% rename from engine/schema/test/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java rename to engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java diff --git a/engine/schema/test/com/cloud/upgrade/dao/DatabaseAccessObjectTest.java b/engine/schema/src/test/java/com/cloud/upgrade/dao/DatabaseAccessObjectTest.java similarity index 100% rename from engine/schema/test/com/cloud/upgrade/dao/DatabaseAccessObjectTest.java rename to engine/schema/src/test/java/com/cloud/upgrade/dao/DatabaseAccessObjectTest.java diff --git a/engine/schema/test/com/cloud/upgrade/dao/DbUpgradeUtilsTest.java b/engine/schema/src/test/java/com/cloud/upgrade/dao/DbUpgradeUtilsTest.java similarity index 100% rename from engine/schema/test/com/cloud/upgrade/dao/DbUpgradeUtilsTest.java rename to engine/schema/src/test/java/com/cloud/upgrade/dao/DbUpgradeUtilsTest.java diff --git a/engine/schema/test/com/cloud/usage/dao/UsageStorageDaoImplTest.java b/engine/schema/src/test/java/com/cloud/usage/dao/UsageStorageDaoImplTest.java similarity index 100% rename from engine/schema/test/com/cloud/usage/dao/UsageStorageDaoImplTest.java rename to engine/schema/src/test/java/com/cloud/usage/dao/UsageStorageDaoImplTest.java diff --git a/engine/schema/test/com/cloud/vm/dao/VMInstanceDaoImplTest.java b/engine/schema/src/test/java/com/cloud/vm/dao/VMInstanceDaoImplTest.java similarity index 100% rename from engine/schema/test/com/cloud/vm/dao/VMInstanceDaoImplTest.java rename to engine/schema/src/test/java/com/cloud/vm/dao/VMInstanceDaoImplTest.java diff --git a/engine/schema/test/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImplTest.java b/engine/schema/src/test/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImplTest.java similarity index 100% rename from engine/schema/test/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImplTest.java rename to engine/schema/src/test/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImplTest.java diff --git a/engine/schema/test/resources/db.properties b/engine/schema/src/test/resources/db.properties similarity index 100% rename from engine/schema/test/resources/db.properties rename to engine/schema/src/test/resources/db.properties diff --git a/engine/storage/cache/src/org/apache/cloudstack/storage/cache/allocator/StorageCacheAllocator.java b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/allocator/StorageCacheAllocator.java similarity index 100% rename from engine/storage/cache/src/org/apache/cloudstack/storage/cache/allocator/StorageCacheAllocator.java rename to engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/allocator/StorageCacheAllocator.java diff --git a/engine/storage/cache/src/org/apache/cloudstack/storage/cache/allocator/StorageCacheRandomAllocator.java b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/allocator/StorageCacheRandomAllocator.java similarity index 100% rename from engine/storage/cache/src/org/apache/cloudstack/storage/cache/allocator/StorageCacheRandomAllocator.java rename to engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/allocator/StorageCacheRandomAllocator.java diff --git a/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java similarity index 100% rename from engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java rename to engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java diff --git a/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithm.java b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithm.java similarity index 100% rename from engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithm.java rename to engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithm.java diff --git a/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java similarity index 100% rename from engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java rename to engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java diff --git a/engine/storage/cache/resources/META-INF/cloudstack/core/spring-engine-storage-cache-core-context.xml b/engine/storage/cache/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-cache-core-context.xml similarity index 100% rename from engine/storage/cache/resources/META-INF/cloudstack/core/spring-engine-storage-cache-core-context.xml rename to engine/storage/cache/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-cache-core-context.xml diff --git a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java similarity index 100% rename from engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java rename to engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java diff --git a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java similarity index 100% rename from engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java rename to engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java diff --git a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java similarity index 100% rename from engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java rename to engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java diff --git a/engine/storage/datamotion/resources/META-INF/cloudstack/core/spring-engine-storage-datamotion-core-context.xml b/engine/storage/datamotion/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-datamotion-core-context.xml similarity index 100% rename from engine/storage/datamotion/resources/META-INF/cloudstack/core/spring-engine-storage-datamotion-core-context.xml rename to engine/storage/datamotion/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-datamotion-core-context.xml diff --git a/engine/storage/datamotion/resources/META-INF/cloudstack/storage/spring-engine-storage-datamotion-storage-context.xml b/engine/storage/datamotion/src/main/resources/META-INF/cloudstack/storage/spring-engine-storage-datamotion-storage-context.xml similarity index 100% rename from engine/storage/datamotion/resources/META-INF/cloudstack/storage/spring-engine-storage-datamotion-storage-context.xml rename to engine/storage/datamotion/src/main/resources/META-INF/cloudstack/storage/spring-engine-storage-datamotion-storage-context.xml diff --git a/engine/storage/datamotion/test/org/apache/cloudstack/storage/motion/AncientDataMotionStrategyTest.java b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategyTest.java similarity index 100% rename from engine/storage/datamotion/test/org/apache/cloudstack/storage/motion/AncientDataMotionStrategyTest.java rename to engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategyTest.java diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java similarity index 100% rename from engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java rename to engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java similarity index 100% rename from engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java rename to engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageStoreProviderManagerImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/manager/ImageStoreProviderManagerImpl.java similarity index 100% rename from engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageStoreProviderManagerImpl.java rename to engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/manager/ImageStoreProviderManagerImpl.java diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java similarity index 100% rename from engine/storage/image/src/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java rename to engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java similarity index 100% rename from engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java rename to engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/lifecycle/ImageStoreLifeCycle.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/lifecycle/ImageStoreLifeCycle.java similarity index 100% rename from engine/storage/image/src/org/apache/cloudstack/storage/image/store/lifecycle/ImageStoreLifeCycle.java rename to engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/lifecycle/ImageStoreLifeCycle.java diff --git a/engine/storage/image/resources/META-INF/cloudstack/core/spring-engine-storage-image-core-context.xml b/engine/storage/image/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-image-core-context.xml similarity index 100% rename from engine/storage/image/resources/META-INF/cloudstack/core/spring-engine-storage-image-core-context.xml rename to engine/storage/image/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-image-core-context.xml diff --git a/engine/storage/integration-test/test/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java b/engine/storage/integration-test/src/test/java/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java similarity index 100% rename from engine/storage/integration-test/test/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java rename to engine/storage/integration-test/src/test/java/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/MockLocalNfsSecondaryStorageResource.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/MockLocalNfsSecondaryStorageResource.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/MockLocalNfsSecondaryStorageResource.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/MockLocalNfsSecondaryStorageResource.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTestConfiguration.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/allocator/StorageAllocatorTestConfiguration.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTestConfiguration.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/allocator/StorageAllocatorTestConfiguration.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRUTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRUTest.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRUTest.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRUTest.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AllTests.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/AllTests.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AllTests.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/AllTests.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AopTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/AopTest.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AopTest.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/AopTest.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AopTestAdvice.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/AopTestAdvice.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AopTestAdvice.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/AopTestAdvice.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/ChildTestConfiguration.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/ChildTestConfiguration.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/DirectAgentTest.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/DirectAgentTest.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/EndpointSelectorTest.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/EndpointSelectorTest.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockRpcCallBack.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/MockRpcCallBack.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockRpcCallBack.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/MockRpcCallBack.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/S3TemplateTest.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/S3TemplateTest.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTest.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTest.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageFactoryBean.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/StorageFactoryBean.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageFactoryBean.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/StorageFactoryBean.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/StorageTest.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageTest.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/StorageTest.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/TemplateTest.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/TemplateTest.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestConfiguration.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/TestConfiguration.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestConfiguration.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/TestConfiguration.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestHttp.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/TestHttp.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestHttp.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/TestHttp.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNG.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/TestNG.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNG.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/TestNG.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNGAop.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/TestNGAop.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNGAop.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/TestNGAop.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeServiceTest.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeServiceTest.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTestVmware.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTestVmware.java diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/XenEndpoint.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/XenEndpoint.java similarity index 100% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/XenEndpoint.java rename to engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/XenEndpoint.java diff --git a/engine/storage/integration-test/test/resources/StorageAllocatorTestContext.xml b/engine/storage/integration-test/src/test/resources/StorageAllocatorTestContext.xml similarity index 100% rename from engine/storage/integration-test/test/resources/StorageAllocatorTestContext.xml rename to engine/storage/integration-test/src/test/resources/StorageAllocatorTestContext.xml diff --git a/engine/storage/integration-test/test/resources/component.xml b/engine/storage/integration-test/src/test/resources/component.xml similarity index 100% rename from engine/storage/integration-test/test/resources/component.xml rename to engine/storage/integration-test/src/test/resources/component.xml diff --git a/engine/storage/integration-test/test/resource/fakeDriverTestContext.xml b/engine/storage/integration-test/src/test/resources/fakeDriverTestContext.xml similarity index 100% rename from engine/storage/integration-test/test/resource/fakeDriverTestContext.xml rename to engine/storage/integration-test/src/test/resources/fakeDriverTestContext.xml diff --git a/engine/storage/integration-test/test/resources/s3_testng.xml b/engine/storage/integration-test/src/test/resources/s3_testng.xml similarity index 100% rename from engine/storage/integration-test/test/resources/s3_testng.xml rename to engine/storage/integration-test/src/test/resources/s3_testng.xml diff --git a/engine/storage/integration-test/test/resources/storageContext.xml b/engine/storage/integration-test/src/test/resources/storageContext.xml similarity index 100% rename from engine/storage/integration-test/test/resources/storageContext.xml rename to engine/storage/integration-test/src/test/resources/storageContext.xml diff --git a/engine/storage/integration-test/test/resources/testng.xml b/engine/storage/integration-test/src/test/resources/testng.xml similarity index 100% rename from engine/storage/integration-test/test/resources/testng.xml rename to engine/storage/integration-test/src/test/resources/testng.xml diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotBackupException.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotBackupException.java similarity index 100% rename from engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotBackupException.java rename to engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotBackupException.java diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java similarity index 100% rename from engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java rename to engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java similarity index 100% rename from engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java rename to engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java similarity index 100% rename from engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java rename to engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManager.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManager.java similarity index 100% rename from engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManager.java rename to engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManager.java diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java similarity index 100% rename from engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java rename to engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStrategyBase.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotStrategyBase.java similarity index 100% rename from engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStrategyBase.java rename to engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotStrategyBase.java diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java similarity index 100% rename from engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java rename to engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java similarity index 100% rename from engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java rename to engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java similarity index 100% rename from engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java rename to engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java diff --git a/engine/storage/snapshot/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml b/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml similarity index 100% rename from engine/storage/snapshot/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml rename to engine/storage/snapshot/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml diff --git a/engine/storage/snapshot/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml b/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml similarity index 100% rename from engine/storage/snapshot/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml rename to engine/storage/snapshot/src/main/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml diff --git a/engine/storage/snapshot/test/src/SnapshotDataFactoryTest.java b/engine/storage/snapshot/src/test/java/src/SnapshotDataFactoryTest.java similarity index 100% rename from engine/storage/snapshot/test/src/SnapshotDataFactoryTest.java rename to engine/storage/snapshot/src/test/java/src/SnapshotDataFactoryTest.java diff --git a/engine/storage/snapshot/test/src/VMSnapshotStrategyTest.java b/engine/storage/snapshot/src/test/java/src/VMSnapshotStrategyTest.java similarity index 100% rename from engine/storage/snapshot/test/src/VMSnapshotStrategyTest.java rename to engine/storage/snapshot/src/test/java/src/VMSnapshotStrategyTest.java diff --git a/engine/storage/snapshot/test/resources/SnapshotManagerTestContext.xml b/engine/storage/snapshot/src/test/resources/SnapshotManagerTestContext.xml similarity index 100% rename from engine/storage/snapshot/test/resources/SnapshotManagerTestContext.xml rename to engine/storage/snapshot/src/test/resources/SnapshotManagerTestContext.xml diff --git a/engine/storage/snapshot/test/resources/db.properties b/engine/storage/snapshot/src/test/resources/db.properties similarity index 100% rename from engine/storage/snapshot/test/resources/db.properties rename to engine/storage/snapshot/src/test/resources/db.properties diff --git a/engine/storage/src/org/apache/cloudstack/storage/BaseType.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/BaseType.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/BaseType.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/BaseType.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/EndPoint.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/EndPoint.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/EndPoint.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/EndPoint.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/LocalHostEndpoint.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/LocalHostEndpoint.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/LocalHostEndpoint.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/LocalHostEndpoint.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/RemoteHostEndPoint.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/RemoteHostEndPoint.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/UseLocalForRootAllocator.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/UseLocalForRootAllocator.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/allocator/UseLocalForRootAllocator.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/UseLocalForRootAllocator.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/backup/SnapshotOnBackupStoreInfo.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/backup/SnapshotOnBackupStoreInfo.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/backup/SnapshotOnBackupStoreInfo.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/backup/SnapshotOnBackupStoreInfo.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/backup/datastore/BackupStoreInfo.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/backup/datastore/BackupStoreInfo.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/backup/datastore/BackupStoreInfo.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/backup/datastore/BackupStoreInfo.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManager.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManager.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManager.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManager.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/DataStore.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataStore.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/datastore/DataStore.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataStore.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManager.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManager.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManager.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManager.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreProviderManager.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/PrimaryDataStoreProviderManager.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreProviderManager.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/PrimaryDataStoreProviderManager.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/TemplateInDataStore.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/TemplateInDataStore.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/datastore/TemplateInDataStore.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/TemplateInDataStore.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/protocol/DataStoreProtocol.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/protocol/DataStoreProtocol.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/datastore/protocol/DataStoreProtocol.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/protocol/DataStoreProtocol.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDao.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/db/ObjectInDataStoreDao.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDao.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/db/ObjectInDataStoreDao.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelper.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/helper/HypervisorHelper.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelper.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/helper/HypervisorHelper.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/helper/StorageStrategyFactoryImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/helper/StorageStrategyFactoryImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/helper/StorageStrategyFactoryImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/helper/StorageStrategyFactoryImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/ImageStoreDriver.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/ImageStoreDriver.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/ImageStoreDriver.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/ImageStoreDriver.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/NfsImageStoreDriverImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/NfsImageStoreDriverImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/NfsImageStoreDriverImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/NfsImageStoreDriverImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/TemplateEntityImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/TemplateEntityImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/datastore/ImageStoreHelper.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreHelper.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/datastore/ImageStoreHelper.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreHelper.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/datastore/ImageStoreProviderManager.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreProviderManager.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/datastore/ImageStoreProviderManager.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreProviderManager.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/BAREMETAL.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/BAREMETAL.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/format/BAREMETAL.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/BAREMETAL.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/ISO.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/ISO.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/format/ISO.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/ISO.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/ImageFormat.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/ImageFormat.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/format/ImageFormat.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/ImageFormat.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/ImageFormatHelper.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/ImageFormatHelper.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/format/ImageFormatHelper.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/ImageFormatHelper.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/OVA.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/OVA.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/format/OVA.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/OVA.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/QCOW2.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/QCOW2.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/format/QCOW2.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/QCOW2.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/RAW.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/RAW.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/format/RAW.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/RAW.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/Unknown.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/Unknown.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/format/Unknown.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/Unknown.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/VHD.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/VHD.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/format/VHD.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/VHD.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/VHDX.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/VHDX.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/format/VHDX.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/format/VHDX.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/motion/ImageMotionService.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/motion/ImageMotionService.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/image/motion/ImageMotionService.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/image/motion/ImageMotionService.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotHelper.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotHelper.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotHelper.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotHelper.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/TemplateOnPrimaryDataStoreInfo.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/volume/TemplateOnPrimaryDataStoreInfo.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/volume/TemplateOnPrimaryDataStoreInfo.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/volume/TemplateOnPrimaryDataStoreInfo.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/VolumeEvent.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/volume/VolumeEvent.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/volume/VolumeEvent.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/volume/VolumeEvent.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java similarity index 100% rename from engine/storage/src/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java rename to engine/storage/src/main/java/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java diff --git a/engine/storage/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml b/engine/storage/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml similarity index 100% rename from engine/storage/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml rename to engine/storage/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml diff --git a/engine/storage/resources/META-INF/cloudstack/storage-allocator/module.properties b/engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator/module.properties similarity index 100% rename from engine/storage/resources/META-INF/cloudstack/storage-allocator/module.properties rename to engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator/module.properties diff --git a/engine/storage/resources/META-INF/cloudstack/storage-allocator/spring-engine-storage-storage-allocator-context.xml b/engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator/spring-engine-storage-storage-allocator-context.xml similarity index 100% rename from engine/storage/resources/META-INF/cloudstack/storage-allocator/spring-engine-storage-storage-allocator-context.xml rename to engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator/spring-engine-storage-storage-allocator-context.xml diff --git a/engine/storage/test/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriorityTest.java b/engine/storage/src/test/java/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriorityTest.java similarity index 100% rename from engine/storage/test/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriorityTest.java rename to engine/storage/src/test/java/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriorityTest.java diff --git a/engine/storage/test/org/apache/cloudstack/storage/BaseTypeTest.java b/engine/storage/src/test/java/org/apache/cloudstack/storage/BaseTypeTest.java similarity index 100% rename from engine/storage/test/org/apache/cloudstack/storage/BaseTypeTest.java rename to engine/storage/src/test/java/org/apache/cloudstack/storage/BaseTypeTest.java diff --git a/engine/storage/storage.ucls b/engine/storage/storage.ucls index 197432efd860..7f3c9fb77a32 100644 --- a/engine/storage/storage.ucls +++ b/engine/storage/storage.ucls @@ -20,7 +20,7 @@ generalizations="true" realizations="true" associations="true" dependencies="false" nesting-relationships="true"> @@ -30,7 +30,7 @@ @@ -40,7 +40,7 @@ @@ -51,7 +51,7 @@ @@ -61,7 +61,7 @@ @@ -72,7 +72,7 @@ @@ -83,7 +83,7 @@ @@ -94,7 +94,7 @@ @@ -104,7 +104,7 @@ + file="/cloud-engine-storage/src/main/java/org/apache/cloudstack/storage/datastore/PrimaryDataStore.java" binary="false"> @@ -114,7 +114,7 @@ @@ -125,7 +125,7 @@ @@ -136,7 +136,7 @@ @@ -147,7 +147,7 @@ @@ -158,7 +158,7 @@ @@ -169,7 +169,7 @@ @@ -180,7 +180,7 @@ @@ -191,7 +191,7 @@ @@ -202,7 +202,7 @@ @@ -213,7 +213,7 @@ diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java similarity index 100% rename from engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java rename to engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/PrimaryDataStoreProviderManagerImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/manager/PrimaryDataStoreProviderManagerImpl.java similarity index 100% rename from engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/PrimaryDataStoreProviderManagerImpl.java rename to engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/manager/PrimaryDataStoreProviderManagerImpl.java diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/data model.ucls b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/manager/data model.ucls similarity index 88% rename from engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/data model.ucls rename to engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/manager/data model.ucls index 8d7a696957df..b28a5cca654c 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/data model.ucls +++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/manager/data model.ucls @@ -20,7 +20,7 @@ under the License. associations="true" dependencies="false" nesting-relationships="true"> + file="/cloud-engine-api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataObject.java" binary="false"> @@ -29,7 +29,7 @@ under the License. + file="/cloud-engine-api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java" binary="false"> @@ -38,7 +38,7 @@ under the License. + file="/cloud-engine-api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotInfo.java" binary="false"> @@ -47,7 +47,7 @@ under the License. + file="/cloud-engine-api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java" binary="false"> diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java similarity index 100% rename from engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java rename to engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/type/DataStoreType.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/type/DataStoreType.java similarity index 100% rename from engine/storage/volume/src/org/apache/cloudstack/storage/datastore/type/DataStoreType.java rename to engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/type/DataStoreType.java diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/type/ISCSI.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/type/ISCSI.java similarity index 100% rename from engine/storage/volume/src/org/apache/cloudstack/storage/datastore/type/ISCSI.java rename to engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/type/ISCSI.java diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/type/NetworkFileSystem.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/type/NetworkFileSystem.java similarity index 100% rename from engine/storage/volume/src/org/apache/cloudstack/storage/datastore/type/NetworkFileSystem.java rename to engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/type/NetworkFileSystem.java diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/type/SharedMount.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/type/SharedMount.java similarity index 100% rename from engine/storage/volume/src/org/apache/cloudstack/storage/datastore/type/SharedMount.java rename to engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/type/SharedMount.java diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java similarity index 100% rename from engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java rename to engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java similarity index 100% rename from engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java rename to engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java similarity index 100% rename from engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java rename to engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java diff --git a/engine/storage/volume/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml b/engine/storage/volume/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml similarity index 100% rename from engine/storage/volume/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml rename to engine/storage/volume/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml diff --git a/engine/storage/volume/test/org/apache/cloudstack/storage/volume/VolumeObjectTest.java b/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeObjectTest.java similarity index 100% rename from engine/storage/volume/test/org/apache/cloudstack/storage/volume/VolumeObjectTest.java rename to engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeObjectTest.java diff --git a/engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/ConfiguratorTest.java b/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/test/ConfiguratorTest.java similarity index 100% rename from engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/ConfiguratorTest.java rename to engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/test/ConfiguratorTest.java diff --git a/engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/Server.java b/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/test/Server.java similarity index 100% rename from engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/Server.java rename to engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/test/Server.java diff --git a/engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/Server1.java b/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/test/Server1.java similarity index 100% rename from engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/Server1.java rename to engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/test/Server1.java diff --git a/engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/TestConfiguration.java b/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/test/TestConfiguration.java similarity index 100% rename from engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/TestConfiguration.java rename to engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/test/TestConfiguration.java diff --git a/engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/TestInProcessAsync.java b/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/test/TestInProcessAsync.java similarity index 100% rename from engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/TestInProcessAsync.java rename to engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/test/TestInProcessAsync.java diff --git a/engine/storage/volume/test/resource/testContext.xml b/engine/storage/volume/src/test/resource/testContext.xml similarity index 100% rename from engine/storage/volume/test/resource/testContext.xml rename to engine/storage/volume/src/test/resource/testContext.xml diff --git a/framework/ca/src/org/apache/cloudstack/framework/ca/CAProvider.java b/framework/ca/src/main/java/org/apache/cloudstack/framework/ca/CAProvider.java similarity index 100% rename from framework/ca/src/org/apache/cloudstack/framework/ca/CAProvider.java rename to framework/ca/src/main/java/org/apache/cloudstack/framework/ca/CAProvider.java diff --git a/framework/ca/src/org/apache/cloudstack/framework/ca/CAService.java b/framework/ca/src/main/java/org/apache/cloudstack/framework/ca/CAService.java similarity index 100% rename from framework/ca/src/org/apache/cloudstack/framework/ca/CAService.java rename to framework/ca/src/main/java/org/apache/cloudstack/framework/ca/CAService.java diff --git a/framework/ca/src/org/apache/cloudstack/framework/ca/Certificate.java b/framework/ca/src/main/java/org/apache/cloudstack/framework/ca/Certificate.java similarity index 100% rename from framework/ca/src/org/apache/cloudstack/framework/ca/Certificate.java rename to framework/ca/src/main/java/org/apache/cloudstack/framework/ca/Certificate.java diff --git a/framework/cluster/src/com/cloud/cluster/ActiveFencingException.java b/framework/cluster/src/main/java/com/cloud/cluster/ActiveFencingException.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ActiveFencingException.java rename to framework/cluster/src/main/java/com/cloud/cluster/ActiveFencingException.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterFenceManager.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterFenceManager.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterFenceManager.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterFenceManager.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterFenceManagerImpl.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterFenceManagerImpl.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterFenceManagerImpl.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterFenceManagerImpl.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterInvalidSessionException.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterInvalidSessionException.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterInvalidSessionException.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterInvalidSessionException.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterManager.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterManager.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterManager.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterManager.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterManagerListener.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerListener.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterManagerListener.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerListener.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterManagerMBean.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerMBean.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterManagerMBean.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerMBean.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterManagerMBeanImpl.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerMBeanImpl.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterManagerMBeanImpl.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerMBeanImpl.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterManagerMessage.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerMessage.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterManagerMessage.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerMessage.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterNodeJoinEventArgs.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterNodeJoinEventArgs.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterNodeJoinEventArgs.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterNodeJoinEventArgs.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterNodeLeftEventArgs.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterNodeLeftEventArgs.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterNodeLeftEventArgs.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterNodeLeftEventArgs.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterService.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterService.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterService.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterService.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterServiceAdapter.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceAdapter.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterServiceAdapter.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceAdapter.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterServicePdu.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterServicePdu.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterServicePdu.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterServicePdu.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterServiceRequestPdu.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceRequestPdu.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterServiceRequestPdu.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceRequestPdu.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterServiceServletAdapter.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletAdapter.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterServiceServletAdapter.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletAdapter.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterServiceServletContainer.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletContainer.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterServiceServletContainer.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletContainer.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterServiceServletHttpHandler.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletHttpHandler.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterServiceServletHttpHandler.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletHttpHandler.java diff --git a/framework/cluster/src/com/cloud/cluster/ClusterServiceServletImpl.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletImpl.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ClusterServiceServletImpl.java rename to framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletImpl.java diff --git a/framework/cluster/src/com/cloud/cluster/ManagementServerHost.java b/framework/cluster/src/main/java/com/cloud/cluster/ManagementServerHost.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ManagementServerHost.java rename to framework/cluster/src/main/java/com/cloud/cluster/ManagementServerHost.java diff --git a/framework/cluster/src/com/cloud/cluster/ManagementServerHostPeerVO.java b/framework/cluster/src/main/java/com/cloud/cluster/ManagementServerHostPeerVO.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ManagementServerHostPeerVO.java rename to framework/cluster/src/main/java/com/cloud/cluster/ManagementServerHostPeerVO.java diff --git a/framework/cluster/src/com/cloud/cluster/ManagementServerHostVO.java b/framework/cluster/src/main/java/com/cloud/cluster/ManagementServerHostVO.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/ManagementServerHostVO.java rename to framework/cluster/src/main/java/com/cloud/cluster/ManagementServerHostVO.java diff --git a/framework/cluster/src/com/cloud/cluster/RemoteMethodConstants.java b/framework/cluster/src/main/java/com/cloud/cluster/RemoteMethodConstants.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/RemoteMethodConstants.java rename to framework/cluster/src/main/java/com/cloud/cluster/RemoteMethodConstants.java diff --git a/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostDao.java b/framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostDao.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostDao.java rename to framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostDao.java diff --git a/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java b/framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java rename to framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java diff --git a/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostPeerDao.java b/framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostPeerDao.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostPeerDao.java rename to framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostPeerDao.java diff --git a/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java b/framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java similarity index 100% rename from framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java rename to framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java diff --git a/framework/cluster/resources/META-INF/cloudstack/core/spring-framework-cluster-core-context.xml b/framework/cluster/src/main/resources/META-INF/cloudstack/core/spring-framework-cluster-core-context.xml similarity index 100% rename from framework/cluster/resources/META-INF/cloudstack/core/spring-framework-cluster-core-context.xml rename to framework/cluster/src/main/resources/META-INF/cloudstack/core/spring-framework-cluster-core-context.xml diff --git a/framework/cluster/test/com/cloud/cluster/ClusterServiceServletAdapterTest.java b/framework/cluster/src/test/java/com/cloud/cluster/ClusterServiceServletAdapterTest.java similarity index 100% rename from framework/cluster/test/com/cloud/cluster/ClusterServiceServletAdapterTest.java rename to framework/cluster/src/test/java/com/cloud/cluster/ClusterServiceServletAdapterTest.java diff --git a/framework/config/src/org/apache/cloudstack/config/Configuration.java b/framework/config/src/main/java/org/apache/cloudstack/config/Configuration.java similarity index 100% rename from framework/config/src/org/apache/cloudstack/config/Configuration.java rename to framework/config/src/main/java/org/apache/cloudstack/config/Configuration.java diff --git a/framework/config/src/org/apache/cloudstack/framework/config/ConfigDepot.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigDepot.java similarity index 100% rename from framework/config/src/org/apache/cloudstack/framework/config/ConfigDepot.java rename to framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigDepot.java diff --git a/framework/config/src/org/apache/cloudstack/framework/config/ConfigDepotAdmin.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigDepotAdmin.java similarity index 100% rename from framework/config/src/org/apache/cloudstack/framework/config/ConfigDepotAdmin.java rename to framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigDepotAdmin.java diff --git a/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java similarity index 100% rename from framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java rename to framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java diff --git a/framework/config/src/org/apache/cloudstack/framework/config/Configurable.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/Configurable.java similarity index 100% rename from framework/config/src/org/apache/cloudstack/framework/config/Configurable.java rename to framework/config/src/main/java/org/apache/cloudstack/framework/config/Configurable.java diff --git a/framework/config/src/org/apache/cloudstack/framework/config/ScopedConfigStorage.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/ScopedConfigStorage.java similarity index 100% rename from framework/config/src/org/apache/cloudstack/framework/config/ScopedConfigStorage.java rename to framework/config/src/main/java/org/apache/cloudstack/framework/config/ScopedConfigStorage.java diff --git a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java similarity index 100% rename from framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java rename to framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java diff --git a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java similarity index 100% rename from framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java rename to framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java diff --git a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java similarity index 100% rename from framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java rename to framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java diff --git a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java similarity index 100% rename from framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java rename to framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java diff --git a/framework/config/resources/META-INF/cloudstack/system/spring-framework-config-system-context-inheritable.xml b/framework/config/src/main/resources/META-INF/cloudstack/system/spring-framework-config-system-context-inheritable.xml similarity index 100% rename from framework/config/resources/META-INF/cloudstack/system/spring-framework-config-system-context-inheritable.xml rename to framework/config/src/main/resources/META-INF/cloudstack/system/spring-framework-config-system-context-inheritable.xml diff --git a/framework/config/resources/META-INF/cloudstack/system/spring-framework-config-system-context.xml b/framework/config/src/main/resources/META-INF/cloudstack/system/spring-framework-config-system-context.xml similarity index 100% rename from framework/config/resources/META-INF/cloudstack/system/spring-framework-config-system-context.xml rename to framework/config/src/main/resources/META-INF/cloudstack/system/spring-framework-config-system-context.xml diff --git a/framework/config/test/org/apache/cloudstack/framework/config/ConfigKeyTest.java b/framework/config/src/test/java/org/apache/cloudstack/framework/config/ConfigKeyTest.java similarity index 100% rename from framework/config/test/org/apache/cloudstack/framework/config/ConfigKeyTest.java rename to framework/config/src/test/java/org/apache/cloudstack/framework/config/ConfigKeyTest.java diff --git a/framework/config/test/org/apache/cloudstack/framework/config/impl/ConfigDepotAdminTest.java b/framework/config/src/test/java/org/apache/cloudstack/framework/config/impl/ConfigDepotAdminTest.java similarity index 100% rename from framework/config/test/org/apache/cloudstack/framework/config/impl/ConfigDepotAdminTest.java rename to framework/config/src/test/java/org/apache/cloudstack/framework/config/impl/ConfigDepotAdminTest.java diff --git a/framework/db/src/com/cloud/dao/EntityManagerImpl.java b/framework/db/src/main/java/com/cloud/dao/EntityManagerImpl.java similarity index 100% rename from framework/db/src/com/cloud/dao/EntityManagerImpl.java rename to framework/db/src/main/java/com/cloud/dao/EntityManagerImpl.java diff --git a/framework/db/src/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java b/framework/db/src/main/java/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java similarity index 100% rename from framework/db/src/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java rename to framework/db/src/main/java/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java diff --git a/framework/db/src/com/cloud/utils/db/Attribute.java b/framework/db/src/main/java/com/cloud/utils/db/Attribute.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/Attribute.java rename to framework/db/src/main/java/com/cloud/utils/db/Attribute.java diff --git a/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java b/framework/db/src/main/java/com/cloud/utils/db/ConnectionConcierge.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/ConnectionConcierge.java rename to framework/db/src/main/java/com/cloud/utils/db/ConnectionConcierge.java diff --git a/framework/db/src/com/cloud/utils/db/ConnectionConciergeMBean.java b/framework/db/src/main/java/com/cloud/utils/db/ConnectionConciergeMBean.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/ConnectionConciergeMBean.java rename to framework/db/src/main/java/com/cloud/utils/db/ConnectionConciergeMBean.java diff --git a/framework/db/src/com/cloud/utils/db/DB.java b/framework/db/src/main/java/com/cloud/utils/db/DB.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/DB.java rename to framework/db/src/main/java/com/cloud/utils/db/DB.java diff --git a/framework/db/src/com/cloud/utils/db/DbUtil.java b/framework/db/src/main/java/com/cloud/utils/db/DbUtil.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/DbUtil.java rename to framework/db/src/main/java/com/cloud/utils/db/DbUtil.java diff --git a/framework/db/src/com/cloud/utils/db/DriverLoader.java b/framework/db/src/main/java/com/cloud/utils/db/DriverLoader.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/DriverLoader.java rename to framework/db/src/main/java/com/cloud/utils/db/DriverLoader.java diff --git a/framework/db/src/com/cloud/utils/db/EcInfo.java b/framework/db/src/main/java/com/cloud/utils/db/EcInfo.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/EcInfo.java rename to framework/db/src/main/java/com/cloud/utils/db/EcInfo.java diff --git a/framework/db/src/com/cloud/utils/db/Encrypt.java b/framework/db/src/main/java/com/cloud/utils/db/Encrypt.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/Encrypt.java rename to framework/db/src/main/java/com/cloud/utils/db/Encrypt.java diff --git a/framework/db/src/com/cloud/utils/db/Filter.java b/framework/db/src/main/java/com/cloud/utils/db/Filter.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/Filter.java rename to framework/db/src/main/java/com/cloud/utils/db/Filter.java diff --git a/framework/db/src/com/cloud/utils/db/GenericDao.java b/framework/db/src/main/java/com/cloud/utils/db/GenericDao.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/GenericDao.java rename to framework/db/src/main/java/com/cloud/utils/db/GenericDao.java diff --git a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java b/framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/GenericDaoBase.java rename to framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java diff --git a/framework/db/src/com/cloud/utils/db/GenericQueryBuilder.java b/framework/db/src/main/java/com/cloud/utils/db/GenericQueryBuilder.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/GenericQueryBuilder.java rename to framework/db/src/main/java/com/cloud/utils/db/GenericQueryBuilder.java diff --git a/framework/db/src/com/cloud/utils/db/GenericSearchBuilder.java b/framework/db/src/main/java/com/cloud/utils/db/GenericSearchBuilder.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/GenericSearchBuilder.java rename to framework/db/src/main/java/com/cloud/utils/db/GenericSearchBuilder.java diff --git a/framework/db/src/com/cloud/utils/db/GlobalLock.java b/framework/db/src/main/java/com/cloud/utils/db/GlobalLock.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/GlobalLock.java rename to framework/db/src/main/java/com/cloud/utils/db/GlobalLock.java diff --git a/framework/db/src/com/cloud/utils/db/GroupBy.java b/framework/db/src/main/java/com/cloud/utils/db/GroupBy.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/GroupBy.java rename to framework/db/src/main/java/com/cloud/utils/db/GroupBy.java diff --git a/framework/db/src/com/cloud/utils/db/JoinBuilder.java b/framework/db/src/main/java/com/cloud/utils/db/JoinBuilder.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/JoinBuilder.java rename to framework/db/src/main/java/com/cloud/utils/db/JoinBuilder.java diff --git a/framework/db/src/com/cloud/utils/db/JoinType.java b/framework/db/src/main/java/com/cloud/utils/db/JoinType.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/JoinType.java rename to framework/db/src/main/java/com/cloud/utils/db/JoinType.java diff --git a/framework/db/src/com/cloud/utils/db/Merovingian2.java b/framework/db/src/main/java/com/cloud/utils/db/Merovingian2.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/Merovingian2.java rename to framework/db/src/main/java/com/cloud/utils/db/Merovingian2.java diff --git a/framework/db/src/com/cloud/utils/db/MerovingianMBean.java b/framework/db/src/main/java/com/cloud/utils/db/MerovingianMBean.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/MerovingianMBean.java rename to framework/db/src/main/java/com/cloud/utils/db/MerovingianMBean.java diff --git a/framework/db/src/com/cloud/utils/db/QueryBuilder.java b/framework/db/src/main/java/com/cloud/utils/db/QueryBuilder.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/QueryBuilder.java rename to framework/db/src/main/java/com/cloud/utils/db/QueryBuilder.java diff --git a/framework/db/src/com/cloud/utils/db/ScriptRunner.java b/framework/db/src/main/java/com/cloud/utils/db/ScriptRunner.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/ScriptRunner.java rename to framework/db/src/main/java/com/cloud/utils/db/ScriptRunner.java diff --git a/framework/db/src/com/cloud/utils/db/SearchBase.java b/framework/db/src/main/java/com/cloud/utils/db/SearchBase.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/SearchBase.java rename to framework/db/src/main/java/com/cloud/utils/db/SearchBase.java diff --git a/framework/db/src/com/cloud/utils/db/SearchBuilder.java b/framework/db/src/main/java/com/cloud/utils/db/SearchBuilder.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/SearchBuilder.java rename to framework/db/src/main/java/com/cloud/utils/db/SearchBuilder.java diff --git a/framework/db/src/com/cloud/utils/db/SearchCriteria.java b/framework/db/src/main/java/com/cloud/utils/db/SearchCriteria.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/SearchCriteria.java rename to framework/db/src/main/java/com/cloud/utils/db/SearchCriteria.java diff --git a/framework/db/src/com/cloud/utils/db/SequenceFetcher.java b/framework/db/src/main/java/com/cloud/utils/db/SequenceFetcher.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/SequenceFetcher.java rename to framework/db/src/main/java/com/cloud/utils/db/SequenceFetcher.java diff --git a/framework/db/src/com/cloud/utils/db/SqlGenerator.java b/framework/db/src/main/java/com/cloud/utils/db/SqlGenerator.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/SqlGenerator.java rename to framework/db/src/main/java/com/cloud/utils/db/SqlGenerator.java diff --git a/framework/db/src/com/cloud/utils/db/StateMachine.java b/framework/db/src/main/java/com/cloud/utils/db/StateMachine.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/StateMachine.java rename to framework/db/src/main/java/com/cloud/utils/db/StateMachine.java diff --git a/framework/db/src/com/cloud/utils/db/Transaction.java b/framework/db/src/main/java/com/cloud/utils/db/Transaction.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/Transaction.java rename to framework/db/src/main/java/com/cloud/utils/db/Transaction.java diff --git a/framework/db/src/com/cloud/utils/db/TransactionAttachment.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionAttachment.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/TransactionAttachment.java rename to framework/db/src/main/java/com/cloud/utils/db/TransactionAttachment.java diff --git a/framework/db/src/com/cloud/utils/db/TransactionCallback.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionCallback.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/TransactionCallback.java rename to framework/db/src/main/java/com/cloud/utils/db/TransactionCallback.java diff --git a/framework/db/src/com/cloud/utils/db/TransactionCallbackNoReturn.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionCallbackNoReturn.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/TransactionCallbackNoReturn.java rename to framework/db/src/main/java/com/cloud/utils/db/TransactionCallbackNoReturn.java diff --git a/framework/db/src/com/cloud/utils/db/TransactionCallbackWithException.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionCallbackWithException.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/TransactionCallbackWithException.java rename to framework/db/src/main/java/com/cloud/utils/db/TransactionCallbackWithException.java diff --git a/framework/db/src/com/cloud/utils/db/TransactionCallbackWithExceptionNoReturn.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionCallbackWithExceptionNoReturn.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/TransactionCallbackWithExceptionNoReturn.java rename to framework/db/src/main/java/com/cloud/utils/db/TransactionCallbackWithExceptionNoReturn.java diff --git a/framework/db/src/com/cloud/utils/db/TransactionContextBuilder.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionContextBuilder.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/TransactionContextBuilder.java rename to framework/db/src/main/java/com/cloud/utils/db/TransactionContextBuilder.java diff --git a/framework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionContextInterceptor.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java rename to framework/db/src/main/java/com/cloud/utils/db/TransactionContextInterceptor.java diff --git a/framework/db/src/com/cloud/utils/db/TransactionContextListener.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionContextListener.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/TransactionContextListener.java rename to framework/db/src/main/java/com/cloud/utils/db/TransactionContextListener.java diff --git a/framework/db/src/com/cloud/utils/db/TransactionLegacy.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/TransactionLegacy.java rename to framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java diff --git a/framework/db/src/com/cloud/utils/db/TransactionMBean.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionMBean.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/TransactionMBean.java rename to framework/db/src/main/java/com/cloud/utils/db/TransactionMBean.java diff --git a/framework/db/src/com/cloud/utils/db/TransactionMBeanImpl.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionMBeanImpl.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/TransactionMBeanImpl.java rename to framework/db/src/main/java/com/cloud/utils/db/TransactionMBeanImpl.java diff --git a/framework/db/src/com/cloud/utils/db/TransactionStatus.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionStatus.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/TransactionStatus.java rename to framework/db/src/main/java/com/cloud/utils/db/TransactionStatus.java diff --git a/framework/db/src/com/cloud/utils/db/UpdateBuilder.java b/framework/db/src/main/java/com/cloud/utils/db/UpdateBuilder.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/UpdateBuilder.java rename to framework/db/src/main/java/com/cloud/utils/db/UpdateBuilder.java diff --git a/framework/db/src/com/cloud/utils/db/UpdateFilter.java b/framework/db/src/main/java/com/cloud/utils/db/UpdateFilter.java similarity index 100% rename from framework/db/src/com/cloud/utils/db/UpdateFilter.java rename to framework/db/src/main/java/com/cloud/utils/db/UpdateFilter.java diff --git a/framework/db/resources/META-INF/cloudstack/system/spring-framework-db-system-context.xml b/framework/db/src/main/resources/META-INF/cloudstack/system/spring-framework-db-system-context.xml similarity index 100% rename from framework/db/resources/META-INF/cloudstack/system/spring-framework-db-system-context.xml rename to framework/db/src/main/resources/META-INF/cloudstack/system/spring-framework-db-system-context.xml diff --git a/framework/db/test/db.properties b/framework/db/src/test/db.properties similarity index 100% rename from framework/db/test/db.properties rename to framework/db/src/test/db.properties diff --git a/framework/db/test/com/cloud/utils/DbUtilTest.java b/framework/db/src/test/java/com/cloud/utils/DbUtilTest.java similarity index 100% rename from framework/db/test/com/cloud/utils/DbUtilTest.java rename to framework/db/src/test/java/com/cloud/utils/DbUtilTest.java diff --git a/framework/db/test/com/cloud/utils/db/DbAnnotatedBase.java b/framework/db/src/test/java/com/cloud/utils/db/DbAnnotatedBase.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/DbAnnotatedBase.java rename to framework/db/src/test/java/com/cloud/utils/db/DbAnnotatedBase.java diff --git a/framework/db/test/com/cloud/utils/db/DbAnnotatedBaseDerived.java b/framework/db/src/test/java/com/cloud/utils/db/DbAnnotatedBaseDerived.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/DbAnnotatedBaseDerived.java rename to framework/db/src/test/java/com/cloud/utils/db/DbAnnotatedBaseDerived.java diff --git a/framework/db/test/com/cloud/utils/db/DbTestDao.java b/framework/db/src/test/java/com/cloud/utils/db/DbTestDao.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/DbTestDao.java rename to framework/db/src/test/java/com/cloud/utils/db/DbTestDao.java diff --git a/framework/db/test/com/cloud/utils/db/DbTestUtils.java b/framework/db/src/test/java/com/cloud/utils/db/DbTestUtils.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/DbTestUtils.java rename to framework/db/src/test/java/com/cloud/utils/db/DbTestUtils.java diff --git a/framework/db/test/com/cloud/utils/db/DbTestVO.java b/framework/db/src/test/java/com/cloud/utils/db/DbTestVO.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/DbTestVO.java rename to framework/db/src/test/java/com/cloud/utils/db/DbTestVO.java diff --git a/framework/db/test/com/cloud/utils/db/DummyComponent.java b/framework/db/src/test/java/com/cloud/utils/db/DummyComponent.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/DummyComponent.java rename to framework/db/src/test/java/com/cloud/utils/db/DummyComponent.java diff --git a/framework/db/test/com/cloud/utils/db/ElementCollectionTest.java b/framework/db/src/test/java/com/cloud/utils/db/ElementCollectionTest.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/ElementCollectionTest.java rename to framework/db/src/test/java/com/cloud/utils/db/ElementCollectionTest.java diff --git a/framework/db/test/com/cloud/utils/db/FilterTest.java b/framework/db/src/test/java/com/cloud/utils/db/FilterTest.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/FilterTest.java rename to framework/db/src/test/java/com/cloud/utils/db/FilterTest.java diff --git a/framework/db/test/com/cloud/utils/db/GenericDaoBaseTest.java b/framework/db/src/test/java/com/cloud/utils/db/GenericDaoBaseTest.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/GenericDaoBaseTest.java rename to framework/db/src/test/java/com/cloud/utils/db/GenericDaoBaseTest.java diff --git a/framework/db/test/com/cloud/utils/db/GlobalLockTest.java b/framework/db/src/test/java/com/cloud/utils/db/GlobalLockTest.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/GlobalLockTest.java rename to framework/db/src/test/java/com/cloud/utils/db/GlobalLockTest.java diff --git a/framework/db/test/com/cloud/utils/db/GroupByTest.java b/framework/db/src/test/java/com/cloud/utils/db/GroupByTest.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/GroupByTest.java rename to framework/db/src/test/java/com/cloud/utils/db/GroupByTest.java diff --git a/framework/db/test/com/cloud/utils/db/Merovingian2Test.java b/framework/db/src/test/java/com/cloud/utils/db/Merovingian2Test.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/Merovingian2Test.java rename to framework/db/src/test/java/com/cloud/utils/db/Merovingian2Test.java diff --git a/framework/db/test/com/cloud/utils/db/TestTransaction.java b/framework/db/src/test/java/com/cloud/utils/db/TestTransaction.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/TestTransaction.java rename to framework/db/src/test/java/com/cloud/utils/db/TestTransaction.java diff --git a/framework/db/test/com/cloud/utils/db/TransactionContextBuilderTest.java b/framework/db/src/test/java/com/cloud/utils/db/TransactionContextBuilderTest.java similarity index 100% rename from framework/db/test/com/cloud/utils/db/TransactionContextBuilderTest.java rename to framework/db/src/test/java/com/cloud/utils/db/TransactionContextBuilderTest.java diff --git a/framework/db/test/resources/db.properties b/framework/db/src/test/resources/db.properties similarity index 100% rename from framework/db/test/resources/db.properties rename to framework/db/src/test/resources/db.properties diff --git a/framework/direct-download/src/org/apache/cloudstack/framework/agent/direct/download/DirectDownloadService.java b/framework/direct-download/src/main/java/org/apache/cloudstack/framework/agent/direct/download/DirectDownloadService.java similarity index 100% rename from framework/direct-download/src/org/apache/cloudstack/framework/agent/direct/download/DirectDownloadService.java rename to framework/direct-download/src/main/java/org/apache/cloudstack/framework/agent/direct/download/DirectDownloadService.java diff --git a/framework/events/src/org/apache/cloudstack/framework/events/Event.java b/framework/events/src/main/java/org/apache/cloudstack/framework/events/Event.java similarity index 100% rename from framework/events/src/org/apache/cloudstack/framework/events/Event.java rename to framework/events/src/main/java/org/apache/cloudstack/framework/events/Event.java diff --git a/framework/events/src/org/apache/cloudstack/framework/events/EventBus.java b/framework/events/src/main/java/org/apache/cloudstack/framework/events/EventBus.java similarity index 100% rename from framework/events/src/org/apache/cloudstack/framework/events/EventBus.java rename to framework/events/src/main/java/org/apache/cloudstack/framework/events/EventBus.java diff --git a/framework/events/src/org/apache/cloudstack/framework/events/EventBusException.java b/framework/events/src/main/java/org/apache/cloudstack/framework/events/EventBusException.java similarity index 100% rename from framework/events/src/org/apache/cloudstack/framework/events/EventBusException.java rename to framework/events/src/main/java/org/apache/cloudstack/framework/events/EventBusException.java diff --git a/framework/events/src/org/apache/cloudstack/framework/events/EventSubscriber.java b/framework/events/src/main/java/org/apache/cloudstack/framework/events/EventSubscriber.java similarity index 100% rename from framework/events/src/org/apache/cloudstack/framework/events/EventSubscriber.java rename to framework/events/src/main/java/org/apache/cloudstack/framework/events/EventSubscriber.java diff --git a/framework/events/src/org/apache/cloudstack/framework/events/EventTopic.java b/framework/events/src/main/java/org/apache/cloudstack/framework/events/EventTopic.java similarity index 100% rename from framework/events/src/org/apache/cloudstack/framework/events/EventTopic.java rename to framework/events/src/main/java/org/apache/cloudstack/framework/events/EventTopic.java diff --git a/framework/ipc/src/com/cloud/agent/manager/Commands.java b/framework/ipc/src/main/java/com/cloud/agent/manager/Commands.java similarity index 100% rename from framework/ipc/src/com/cloud/agent/manager/Commands.java rename to framework/ipc/src/main/java/com/cloud/agent/manager/Commands.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallFuture.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/async/AsyncCallFuture.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallFuture.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/async/AsyncCallFuture.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDriver.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/async/AsyncCallbackDriver.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDriver.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/async/AsyncCallbackDriver.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCompletionCallback.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/async/AsyncCompletionCallback.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCompletionCallback.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/async/AsyncCompletionCallback.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncRpcContext.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/async/AsyncRpcContext.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/async/AsyncRpcContext.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/async/AsyncRpcContext.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/async/InplaceAsyncCallbackDriver.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/async/InplaceAsyncCallbackDriver.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/async/InplaceAsyncCallbackDriver.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/async/InplaceAsyncCallbackDriver.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/client/ClientMessageBus.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/client/ClientMessageBus.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/client/ClientMessageBus.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/client/ClientMessageBus.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportConnection.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/client/ClientTransportConnection.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportConnection.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/client/ClientTransportConnection.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportEndpoint.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/client/ClientTransportEndpoint.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportEndpoint.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/client/ClientTransportEndpoint.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportEndpointSite.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/client/ClientTransportEndpointSite.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportEndpointSite.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/client/ClientTransportEndpointSite.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportProvider.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/client/ClientTransportProvider.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportProvider.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/client/ClientTransportProvider.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBus.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageBus.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBus.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageBus.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageBusBase.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageBusBase.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusEndpoint.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageBusEndpoint.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusEndpoint.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageBusEndpoint.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDetector.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageDetector.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDetector.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageDetector.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDispatcher.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageDispatcher.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDispatcher.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageDispatcher.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageHandler.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageHandler.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageHandler.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageHandler.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageSubscriber.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageSubscriber.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageSubscriber.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageSubscriber.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/PublishScope.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/PublishScope.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/messagebus/PublishScope.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/PublishScope.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallRequestPdu.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcCallRequestPdu.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallRequestPdu.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcCallRequestPdu.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallResponsePdu.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcCallResponsePdu.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallResponsePdu.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcCallResponsePdu.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallbackDispatcher.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcCallbackDispatcher.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallbackDispatcher.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcCallbackDispatcher.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallbackListener.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcCallbackListener.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallbackListener.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcCallbackListener.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCall.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcClientCall.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCall.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcClientCall.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcException.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcException.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcException.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcException.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcIOException.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcIOException.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcIOException.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcIOException.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProvider.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcProvider.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProvider.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcProvider.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServerCall.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcServerCall.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServerCall.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcServerCall.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServerCallImpl.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcServerCallImpl.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServerCallImpl.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcServerCallImpl.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceDispatcher.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcServiceDispatcher.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceDispatcher.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcServiceDispatcher.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceEndpoint.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcServiceEndpoint.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceEndpoint.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcServiceEndpoint.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceHandler.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcServiceHandler.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceHandler.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcServiceHandler.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcTimeoutException.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcTimeoutException.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcTimeoutException.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcTimeoutException.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/serializer/JsonMessageSerializer.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/serializer/JsonMessageSerializer.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/serializer/JsonMessageSerializer.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/serializer/JsonMessageSerializer.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/serializer/MessageSerializer.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/serializer/MessageSerializer.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/serializer/MessageSerializer.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/serializer/MessageSerializer.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireName.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/serializer/OnwireName.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireName.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/serializer/OnwireName.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/server/ServerMessageBus.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/server/ServerMessageBus.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/server/ServerMessageBus.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/server/ServerMessageBus.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/server/ServerTransportProvider.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/server/ServerTransportProvider.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportAddress.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportAddress.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddressMapper.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportAddressMapper.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddressMapper.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportAddressMapper.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAttachRequestPdu.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportAttachRequestPdu.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAttachRequestPdu.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportAttachRequestPdu.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAttachResponsePdu.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportAttachResponsePdu.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAttachResponsePdu.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportAttachResponsePdu.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportConnectRequestPdu.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportConnectRequestPdu.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/transport/TransportConnectRequestPdu.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportConnectRequestPdu.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportConnectResponsePdu.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportConnectResponsePdu.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/transport/TransportConnectResponsePdu.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportConnectResponsePdu.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportDataPdu.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportDataPdu.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/transport/TransportDataPdu.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportDataPdu.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportEndpoint.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportEndpoint.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/transport/TransportEndpoint.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportEndpoint.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportEndpointSite.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportEndpointSite.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/transport/TransportEndpointSite.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportEndpointSite.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportMultiplexier.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportMultiplexier.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/transport/TransportMultiplexier.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportMultiplexier.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportPdu.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportPdu.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/transport/TransportPdu.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportPdu.java diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportProvider.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportProvider.java similarity index 100% rename from framework/ipc/src/org/apache/cloudstack/framework/transport/TransportProvider.java rename to framework/ipc/src/main/java/org/apache/cloudstack/framework/transport/TransportProvider.java diff --git a/framework/ipc/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml b/framework/ipc/src/main/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml similarity index 100% rename from framework/ipc/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml rename to framework/ipc/src/main/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml diff --git a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleCallee.java b/framework/ipc/src/test/java/org/apache/cloudstack/framework/codestyle/AsyncSampleCallee.java similarity index 100% rename from framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleCallee.java rename to framework/ipc/src/test/java/org/apache/cloudstack/framework/codestyle/AsyncSampleCallee.java diff --git a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java b/framework/ipc/src/test/java/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java similarity index 100% rename from framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java rename to framework/ipc/src/test/java/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java diff --git a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java b/framework/ipc/src/test/java/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java similarity index 100% rename from framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java rename to framework/ipc/src/test/java/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java diff --git a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServer.java b/framework/ipc/src/test/java/org/apache/cloudstack/framework/sampleserver/SampleManagementServer.java similarity index 100% rename from framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServer.java rename to framework/ipc/src/test/java/org/apache/cloudstack/framework/sampleserver/SampleManagementServer.java diff --git a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServerApp.java b/framework/ipc/src/test/java/org/apache/cloudstack/framework/sampleserver/SampleManagementServerApp.java similarity index 100% rename from framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServerApp.java rename to framework/ipc/src/test/java/org/apache/cloudstack/framework/sampleserver/SampleManagementServerApp.java diff --git a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java b/framework/ipc/src/test/java/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java similarity index 100% rename from framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java rename to framework/ipc/src/test/java/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java diff --git a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java b/framework/ipc/src/test/java/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java similarity index 100% rename from framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java rename to framework/ipc/src/test/java/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java diff --git a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareAnswer.java b/framework/ipc/src/test/java/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareAnswer.java similarity index 100% rename from framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareAnswer.java rename to framework/ipc/src/test/java/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareAnswer.java diff --git a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareCommand.java b/framework/ipc/src/test/java/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareCommand.java similarity index 100% rename from framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareCommand.java rename to framework/ipc/src/test/java/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareCommand.java diff --git a/framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java b/framework/ipc/src/test/java/org/apache/cloudstack/messagebus/TestMessageBus.java similarity index 100% rename from framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java rename to framework/ipc/src/test/java/org/apache/cloudstack/messagebus/TestMessageBus.java diff --git a/framework/ipc/test/resources/MessageBusTestContext.xml b/framework/ipc/src/test/resources/MessageBusTestContext.xml similarity index 100% rename from framework/ipc/test/resources/MessageBusTestContext.xml rename to framework/ipc/src/test/resources/MessageBusTestContext.xml diff --git a/framework/ipc/test/resources/SampleManagementServerAppContext.xml b/framework/ipc/src/test/resources/SampleManagementServerAppContext.xml similarity index 100% rename from framework/ipc/test/resources/SampleManagementServerAppContext.xml rename to framework/ipc/src/test/resources/SampleManagementServerAppContext.xml diff --git a/framework/ipc/test/resources/log4j-cloud.xml b/framework/ipc/src/test/resources/log4j-cloud.xml similarity index 100% rename from framework/ipc/test/resources/log4j-cloud.xml rename to framework/ipc/src/test/resources/log4j-cloud.xml diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJob.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/AsyncJob.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJob.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/AsyncJob.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobDispatcher.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/AsyncJobDispatcher.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobDispatcher.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/AsyncJobDispatcher.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobMBean.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/AsyncJobMBean.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobMBean.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/AsyncJobMBean.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobManager.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/AsyncJobManager.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobManager.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/AsyncJobManager.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/Outcome.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/Outcome.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/Outcome.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/Outcome.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDao.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobDao.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDao.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobDao.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDao.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDao.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDao.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDao.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDaoImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDaoImpl.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDaoImpl.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDaoImpl.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobJournalDao.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobJournalDao.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobJournalDao.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobJournalDao.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobJournalDaoImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobJournalDaoImpl.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobJournalDaoImpl.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobJournalDaoImpl.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueDao.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/SyncQueueDao.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueDao.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/SyncQueueDao.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueDaoImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/SyncQueueDaoImpl.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueDaoImpl.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/SyncQueueDaoImpl.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDao.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDao.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDao.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDao.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDaoImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDaoImpl.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDaoImpl.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDaoImpl.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDao.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDao.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDao.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDao.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobJoinMapVO.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobJoinMapVO.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobJoinMapVO.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobJoinMapVO.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobJournalVO.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobJournalVO.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobJournalVO.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobJournalVO.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMBeanImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobMBeanImpl.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMBeanImpl.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobMBeanImpl.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobVO.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobVO.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobVO.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobVO.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/OutcomeImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/OutcomeImpl.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/OutcomeImpl.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/OutcomeImpl.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItem.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/SyncQueueItem.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItem.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/SyncQueueItem.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItemVO.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/SyncQueueItemVO.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItemVO.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/SyncQueueItemVO.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManager.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/SyncQueueManager.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManager.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/SyncQueueManager.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueVO.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/SyncQueueVO.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueVO.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/SyncQueueVO.java diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/VmWorkJobVO.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/VmWorkJobVO.java similarity index 100% rename from framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/VmWorkJobVO.java rename to framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/VmWorkJobVO.java diff --git a/framework/jobs/resources/META-INF/cloudstack/core/spring-framework-jobs-core-context.xml b/framework/jobs/src/main/resources/META-INF/cloudstack/core/spring-framework-jobs-core-context.xml similarity index 100% rename from framework/jobs/resources/META-INF/cloudstack/core/spring-framework-jobs-core-context.xml rename to framework/jobs/src/main/resources/META-INF/cloudstack/core/spring-framework-jobs-core-context.xml diff --git a/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobManagerTest.java b/framework/jobs/src/test/java/org/apache/cloudstack/framework/jobs/AsyncJobManagerTest.java similarity index 100% rename from framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobManagerTest.java rename to framework/jobs/src/test/java/org/apache/cloudstack/framework/jobs/AsyncJobManagerTest.java diff --git a/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobManagerTestConfiguration.java b/framework/jobs/src/test/java/org/apache/cloudstack/framework/jobs/AsyncJobManagerTestConfiguration.java similarity index 100% rename from framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobManagerTestConfiguration.java rename to framework/jobs/src/test/java/org/apache/cloudstack/framework/jobs/AsyncJobManagerTestConfiguration.java diff --git a/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobTestDashboard.java b/framework/jobs/src/test/java/org/apache/cloudstack/framework/jobs/AsyncJobTestDashboard.java similarity index 100% rename from framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobTestDashboard.java rename to framework/jobs/src/test/java/org/apache/cloudstack/framework/jobs/AsyncJobTestDashboard.java diff --git a/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobTestDispatcher.java b/framework/jobs/src/test/java/org/apache/cloudstack/framework/jobs/AsyncJobTestDispatcher.java similarity index 100% rename from framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobTestDispatcher.java rename to framework/jobs/src/test/java/org/apache/cloudstack/framework/jobs/AsyncJobTestDispatcher.java diff --git a/framework/jobs/test/resources/AsyncJobManagerTestContext.xml b/framework/jobs/src/test/resources/AsyncJobManagerTestContext.xml similarity index 100% rename from framework/jobs/test/resources/AsyncJobManagerTestContext.xml rename to framework/jobs/src/test/resources/AsyncJobManagerTestContext.xml diff --git a/framework/jobs/test/resources/commonContext.xml b/framework/jobs/src/test/resources/commonContext.xml similarity index 100% rename from framework/jobs/test/resources/commonContext.xml rename to framework/jobs/src/test/resources/commonContext.xml diff --git a/framework/jobs/test/resources/db.properties b/framework/jobs/src/test/resources/db.properties similarity index 100% rename from framework/jobs/test/resources/db.properties rename to framework/jobs/src/test/resources/db.properties diff --git a/framework/jobs/test/resources/log4j.properties b/framework/jobs/src/test/resources/log4j.properties similarity index 100% rename from framework/jobs/test/resources/log4j.properties rename to framework/jobs/src/test/resources/log4j.properties diff --git a/framework/managed-context/pom.xml b/framework/managed-context/pom.xml index 1f7950ac8139..4081ad5be454 100644 --- a/framework/managed-context/pom.xml +++ b/framework/managed-context/pom.xml @@ -23,9 +23,9 @@ Apache CloudStack Framework - Managed Context org.apache.cloudstack - cloud-maven-standard + cloudstack 4.12.0.0-SNAPSHOT - ../../maven-standard/pom.xml + ../../pom.xml diff --git a/framework/quota/src/org/apache/cloudstack/quota/QuotaAlertManager.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaAlertManager.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/QuotaAlertManager.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaAlertManager.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/QuotaManager.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManager.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/QuotaManager.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManager.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/QuotaStatement.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaStatement.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/QuotaStatement.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaStatement.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaStatementImpl.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaStatementImpl.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/constant/QuotaConfig.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/constant/QuotaConfig.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/constant/QuotaConfig.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/constant/QuotaConfig.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/constant/QuotaTypes.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/constant/QuotaTypes.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/constant/QuotaTypes.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/constant/QuotaTypes.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaAccountDao.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDao.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/QuotaAccountDao.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDao.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaAccountDaoImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDaoImpl.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/QuotaAccountDaoImpl.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDaoImpl.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaBalanceDao.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaBalanceDao.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/QuotaBalanceDao.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaBalanceDao.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaBalanceDaoImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaBalanceDaoImpl.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/QuotaBalanceDaoImpl.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaBalanceDaoImpl.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaCreditsDao.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaCreditsDao.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/QuotaCreditsDao.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaCreditsDao.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaCreditsDaoImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaCreditsDaoImpl.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/QuotaCreditsDaoImpl.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaCreditsDaoImpl.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaEmailTemplatesDao.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaEmailTemplatesDao.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/QuotaEmailTemplatesDao.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaEmailTemplatesDao.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaEmailTemplatesDaoImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaEmailTemplatesDaoImpl.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/QuotaEmailTemplatesDaoImpl.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaEmailTemplatesDaoImpl.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaTariffDao.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaTariffDao.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/QuotaTariffDao.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaTariffDao.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaTariffDaoImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaTariffDaoImpl.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/QuotaTariffDaoImpl.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaTariffDaoImpl.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaUsageDao.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaUsageDao.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/QuotaUsageDao.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaUsageDao.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaUsageDaoImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaUsageDaoImpl.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/QuotaUsageDaoImpl.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaUsageDaoImpl.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/ServiceOfferingDao.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/ServiceOfferingDao.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/ServiceOfferingDao.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/ServiceOfferingDao.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/ServiceOfferingDaoImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/ServiceOfferingDaoImpl.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/ServiceOfferingDaoImpl.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/ServiceOfferingDaoImpl.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/UserVmDetailsDao.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/UserVmDetailsDao.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/UserVmDetailsDao.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/UserVmDetailsDao.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/UserVmDetailsDaoImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/UserVmDetailsDaoImpl.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/dao/UserVmDetailsDaoImpl.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/UserVmDetailsDaoImpl.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/vo/QuotaAccountVO.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaAccountVO.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/vo/QuotaAccountVO.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaAccountVO.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/vo/QuotaBalanceVO.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaBalanceVO.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/vo/QuotaBalanceVO.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaBalanceVO.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/vo/QuotaCreditsVO.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaCreditsVO.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/vo/QuotaCreditsVO.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaCreditsVO.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/vo/QuotaEmailTemplatesVO.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaEmailTemplatesVO.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/vo/QuotaEmailTemplatesVO.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaEmailTemplatesVO.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/vo/QuotaTariffVO.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaTariffVO.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/vo/QuotaTariffVO.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaTariffVO.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/vo/QuotaUsageVO.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaUsageVO.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/vo/QuotaUsageVO.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaUsageVO.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java diff --git a/framework/quota/src/org/apache/cloudstack/quota/vo/UserVmDetailVO.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/UserVmDetailVO.java similarity index 100% rename from framework/quota/src/org/apache/cloudstack/quota/vo/UserVmDetailVO.java rename to framework/quota/src/main/java/org/apache/cloudstack/quota/vo/UserVmDetailVO.java diff --git a/framework/quota/resources/META-INF/cloudstack/quota/spring-framework-quota-context.xml b/framework/quota/src/main/resources/META-INF/cloudstack/quota/spring-framework-quota-context.xml similarity index 100% rename from framework/quota/resources/META-INF/cloudstack/quota/spring-framework-quota-context.xml rename to framework/quota/src/main/resources/META-INF/cloudstack/quota/spring-framework-quota-context.xml diff --git a/framework/quota/test/org/apache/cloudstack/quota/QuotaAlertManagerImplTest.java b/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaAlertManagerImplTest.java similarity index 100% rename from framework/quota/test/org/apache/cloudstack/quota/QuotaAlertManagerImplTest.java rename to framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaAlertManagerImplTest.java diff --git a/framework/quota/test/org/apache/cloudstack/quota/QuotaManagerImplTest.java b/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaManagerImplTest.java similarity index 100% rename from framework/quota/test/org/apache/cloudstack/quota/QuotaManagerImplTest.java rename to framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaManagerImplTest.java diff --git a/framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java b/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaStatementTest.java similarity index 100% rename from framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java rename to framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaStatementTest.java diff --git a/framework/quota/test/org/apache/cloudstack/quota/constant/QuotaTypesTest.java b/framework/quota/src/test/java/org/apache/cloudstack/quota/constant/QuotaTypesTest.java similarity index 100% rename from framework/quota/test/org/apache/cloudstack/quota/constant/QuotaTypesTest.java rename to framework/quota/src/test/java/org/apache/cloudstack/quota/constant/QuotaTypesTest.java diff --git a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationIntrospector.java b/framework/rest/src/main/java/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationIntrospector.java similarity index 100% rename from framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationIntrospector.java rename to framework/rest/src/main/java/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationIntrospector.java diff --git a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationModule.java b/framework/rest/src/main/java/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationModule.java similarity index 100% rename from framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationModule.java rename to framework/rest/src/main/java/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationModule.java diff --git a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UriSerializer.java b/framework/rest/src/main/java/org/apache/cloudstack/framework/ws/jackson/UriSerializer.java similarity index 100% rename from framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UriSerializer.java rename to framework/rest/src/main/java/org/apache/cloudstack/framework/ws/jackson/UriSerializer.java diff --git a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UrisSerializer.java b/framework/rest/src/main/java/org/apache/cloudstack/framework/ws/jackson/UrisSerializer.java similarity index 100% rename from framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UrisSerializer.java rename to framework/rest/src/main/java/org/apache/cloudstack/framework/ws/jackson/UrisSerializer.java diff --git a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/Url.java b/framework/rest/src/main/java/org/apache/cloudstack/framework/ws/jackson/Url.java similarity index 100% rename from framework/rest/src/org/apache/cloudstack/framework/ws/jackson/Url.java rename to framework/rest/src/main/java/org/apache/cloudstack/framework/ws/jackson/Url.java diff --git a/framework/rest/test/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationTest.java b/framework/rest/src/test/java/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationTest.java similarity index 100% rename from framework/rest/test/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationTest.java rename to framework/rest/src/test/java/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationTest.java diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keys/KeysManager.java b/framework/security/src/main/java/org/apache/cloudstack/framework/security/keys/KeysManager.java similarity index 100% rename from framework/security/src/org/apache/cloudstack/framework/security/keys/KeysManager.java rename to framework/security/src/main/java/org/apache/cloudstack/framework/security/keys/KeysManager.java diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keys/KeysManagerImpl.java b/framework/security/src/main/java/org/apache/cloudstack/framework/security/keys/KeysManagerImpl.java similarity index 100% rename from framework/security/src/org/apache/cloudstack/framework/security/keys/KeysManagerImpl.java rename to framework/security/src/main/java/org/apache/cloudstack/framework/security/keys/KeysManagerImpl.java diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDao.java b/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreDao.java similarity index 100% rename from framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDao.java rename to framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreDao.java diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java b/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java similarity index 100% rename from framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java rename to framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManager.java b/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManager.java similarity index 100% rename from framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManager.java rename to framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManager.java diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java b/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java similarity index 100% rename from framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java rename to framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreVO.java b/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreVO.java similarity index 100% rename from framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreVO.java rename to framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreVO.java diff --git a/framework/security/resources/META-INF/cloudstack/core/spring-framework-security-core-context.xml b/framework/security/src/main/resources/META-INF/cloudstack/core/spring-framework-security-core-context.xml similarity index 100% rename from framework/security/resources/META-INF/cloudstack/core/spring-framework-security-core-context.xml rename to framework/security/src/main/resources/META-INF/cloudstack/core/spring-framework-security-core-context.xml diff --git a/framework/spring/lifecycle/pom.xml b/framework/spring/lifecycle/pom.xml index d2b9ffe63601..4f06922ab4d0 100644 --- a/framework/spring/lifecycle/pom.xml +++ b/framework/spring/lifecycle/pom.xml @@ -15,9 +15,9 @@ Apache CloudStack Framework - Spring Life Cycle org.apache.cloudstack - cloud-maven-standard + cloudstack 4.12.0.0-SNAPSHOT - ../../../maven-standard/pom.xml + ../../../pom.xml diff --git a/framework/spring/module/pom.xml b/framework/spring/module/pom.xml index bdbf9fb0080f..617e35ae1886 100644 --- a/framework/spring/module/pom.xml +++ b/framework/spring/module/pom.xml @@ -23,9 +23,9 @@ Apache CloudStack Framework - Spring Module org.apache.cloudstack - cloud-maven-standard + cloudstack 4.12.0.0-SNAPSHOT - ../../../maven-standard/pom.xml + ../../../pom.xml diff --git a/maven-standard/pom.xml b/maven-standard/pom.xml deleted file mode 100644 index e33931c03f19..000000000000 --- a/maven-standard/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - cloud-maven-standard - Apache CloudStack Maven Conventions Parent - Historically ACS was built with a custom build system mixing ant and wscript. When the conversion to maven was done the existing directory structure in git was kept. So the src, testing, and resources folders in ACS don't follow the standard maven conventions. This parent pom forces the folders back to the standard conventions - pom - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - ../pom.xml - - - ${basedir}/src/main/java - ${basedir}/src/main/scripts - ${basedir}/src/test/java - ${basedir}/target/classes - ${basedir}/target/test-classes - - - ${basedir}/src/main/resources - - - - - ${basedir}/src/test/resources - - - - diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 898118fa96df..ba1798e7dacb 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -259,7 +259,7 @@ cp build/gitrev.txt ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts cp packaging/centos63/cloudstack-sccs ${RPM_BUILD_ROOT}/usr/bin mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts/network/cisco -cp -r plugins/network-elements/cisco-vnmc/scripts/network/cisco/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts/network/cisco +cp -r plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts/network/cisco # Management mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/ diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index f16858a4a8f1..481c86c3baf7 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -226,7 +226,7 @@ cp build/gitrev.txt ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts cp packaging/centos7/cloudstack-sccs ${RPM_BUILD_ROOT}/usr/bin mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts/network/cisco -cp -r plugins/network-elements/cisco-vnmc/scripts/network/cisco/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts/network/cisco +cp -r plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts/network/cisco # Management mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/ diff --git a/plugins/acl/dynamic-role-based/src/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessChecker.java b/plugins/acl/dynamic-role-based/src/main/java/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessChecker.java similarity index 100% rename from plugins/acl/dynamic-role-based/src/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessChecker.java rename to plugins/acl/dynamic-role-based/src/main/java/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessChecker.java diff --git a/plugins/acl/dynamic-role-based/resources/META-INF/cloudstack/acl-dynamic-role-based/module.properties b/plugins/acl/dynamic-role-based/src/main/resources/META-INF/cloudstack/acl-dynamic-role-based/module.properties similarity index 100% rename from plugins/acl/dynamic-role-based/resources/META-INF/cloudstack/acl-dynamic-role-based/module.properties rename to plugins/acl/dynamic-role-based/src/main/resources/META-INF/cloudstack/acl-dynamic-role-based/module.properties diff --git a/plugins/acl/dynamic-role-based/resources/META-INF/cloudstack/acl-dynamic-role-based/spring-acl-dynamic-role-based-context.xml b/plugins/acl/dynamic-role-based/src/main/resources/META-INF/cloudstack/acl-dynamic-role-based/spring-acl-dynamic-role-based-context.xml similarity index 100% rename from plugins/acl/dynamic-role-based/resources/META-INF/cloudstack/acl-dynamic-role-based/spring-acl-dynamic-role-based-context.xml rename to plugins/acl/dynamic-role-based/src/main/resources/META-INF/cloudstack/acl-dynamic-role-based/spring-acl-dynamic-role-based-context.xml diff --git a/plugins/acl/dynamic-role-based/test/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessCheckerTest.java b/plugins/acl/dynamic-role-based/src/test/java/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessCheckerTest.java similarity index 100% rename from plugins/acl/dynamic-role-based/test/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessCheckerTest.java rename to plugins/acl/dynamic-role-based/src/test/java/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessCheckerTest.java diff --git a/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java b/plugins/acl/static-role-based/src/main/java/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java similarity index 100% rename from plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java rename to plugins/acl/static-role-based/src/main/java/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java diff --git a/plugins/acl/static-role-based/resources/META-INF/cloudstack/acl-static-role-based/module.properties b/plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/module.properties similarity index 100% rename from plugins/acl/static-role-based/resources/META-INF/cloudstack/acl-static-role-based/module.properties rename to plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/module.properties diff --git a/plugins/acl/static-role-based/resources/META-INF/cloudstack/acl-static-role-based/spring-acl-static-role-based-context.xml b/plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/spring-acl-static-role-based-context.xml similarity index 100% rename from plugins/acl/static-role-based/resources/META-INF/cloudstack/acl-static-role-based/spring-acl-static-role-based-context.xml rename to plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/spring-acl-static-role-based-context.xml diff --git a/plugins/affinity-group-processors/explicit-dedication/pom.xml b/plugins/affinity-group-processors/explicit-dedication/pom.xml index 5ad4b6da6fc8..3d19ca89fe1a 100644 --- a/plugins/affinity-group-processors/explicit-dedication/pom.xml +++ b/plugins/affinity-group-processors/explicit-dedication/pom.xml @@ -28,6 +28,5 @@ install - src diff --git a/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java b/plugins/affinity-group-processors/explicit-dedication/src/main/java/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java similarity index 100% rename from plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java rename to plugins/affinity-group-processors/explicit-dedication/src/main/java/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java diff --git a/plugins/affinity-group-processors/explicit-dedication/resources/META-INF/cloudstack/explicit-dedication/module.properties b/plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/module.properties similarity index 100% rename from plugins/affinity-group-processors/explicit-dedication/resources/META-INF/cloudstack/explicit-dedication/module.properties rename to plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/module.properties diff --git a/plugins/affinity-group-processors/explicit-dedication/resources/META-INF/cloudstack/explicit-dedication/spring-explicit-dedication-context.xml b/plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/spring-explicit-dedication-context.xml similarity index 100% rename from plugins/affinity-group-processors/explicit-dedication/resources/META-INF/cloudstack/explicit-dedication/spring-explicit-dedication-context.xml rename to plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/spring-explicit-dedication-context.xml diff --git a/plugins/affinity-group-processors/host-anti-affinity/pom.xml b/plugins/affinity-group-processors/host-anti-affinity/pom.xml index 23d7cc7cf03d..2ddbd7b2bb4e 100644 --- a/plugins/affinity-group-processors/host-anti-affinity/pom.xml +++ b/plugins/affinity-group-processors/host-anti-affinity/pom.xml @@ -28,6 +28,5 @@ install - src diff --git a/plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java b/plugins/affinity-group-processors/host-anti-affinity/src/main/java/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java similarity index 100% rename from plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java rename to plugins/affinity-group-processors/host-anti-affinity/src/main/java/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java diff --git a/plugins/affinity-group-processors/host-anti-affinity/resources/META-INF/cloudstack/host-anti-affinity/module.properties b/plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/module.properties similarity index 100% rename from plugins/affinity-group-processors/host-anti-affinity/resources/META-INF/cloudstack/host-anti-affinity/module.properties rename to plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/module.properties diff --git a/plugins/affinity-group-processors/host-anti-affinity/resources/META-INF/cloudstack/host-anti-affinity/spring-host-anti-affinity-context.xml b/plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/spring-host-anti-affinity-context.xml similarity index 100% rename from plugins/affinity-group-processors/host-anti-affinity/resources/META-INF/cloudstack/host-anti-affinity/spring-host-anti-affinity-context.xml rename to plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/spring-host-anti-affinity-context.xml diff --git a/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/CsSnmpConstants.java b/plugins/alert-handlers/snmp-alerts/src/main/java/org/apache/cloudstack/alert/snmp/CsSnmpConstants.java similarity index 100% rename from plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/CsSnmpConstants.java rename to plugins/alert-handlers/snmp-alerts/src/main/java/org/apache/cloudstack/alert/snmp/CsSnmpConstants.java diff --git a/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayout.java b/plugins/alert-handlers/snmp-alerts/src/main/java/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayout.java similarity index 100% rename from plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayout.java rename to plugins/alert-handlers/snmp-alerts/src/main/java/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayout.java diff --git a/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpHelper.java b/plugins/alert-handlers/snmp-alerts/src/main/java/org/apache/cloudstack/alert/snmp/SnmpHelper.java similarity index 100% rename from plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpHelper.java rename to plugins/alert-handlers/snmp-alerts/src/main/java/org/apache/cloudstack/alert/snmp/SnmpHelper.java diff --git a/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpTrapAppender.java b/plugins/alert-handlers/snmp-alerts/src/main/java/org/apache/cloudstack/alert/snmp/SnmpTrapAppender.java similarity index 100% rename from plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpTrapAppender.java rename to plugins/alert-handlers/snmp-alerts/src/main/java/org/apache/cloudstack/alert/snmp/SnmpTrapAppender.java diff --git a/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpTrapInfo.java b/plugins/alert-handlers/snmp-alerts/src/main/java/org/apache/cloudstack/alert/snmp/SnmpTrapInfo.java similarity index 100% rename from plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpTrapInfo.java rename to plugins/alert-handlers/snmp-alerts/src/main/java/org/apache/cloudstack/alert/snmp/SnmpTrapInfo.java diff --git a/plugins/alert-handlers/snmp-alerts/test/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayoutTest.java b/plugins/alert-handlers/snmp-alerts/src/test/java/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayoutTest.java similarity index 100% rename from plugins/alert-handlers/snmp-alerts/test/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayoutTest.java rename to plugins/alert-handlers/snmp-alerts/src/test/java/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayoutTest.java diff --git a/plugins/alert-handlers/snmp-alerts/test/org/apache/cloudstack/alert/snmp/SnmpTrapAppenderTest.java b/plugins/alert-handlers/snmp-alerts/src/test/java/org/apache/cloudstack/alert/snmp/SnmpTrapAppenderTest.java similarity index 100% rename from plugins/alert-handlers/snmp-alerts/test/org/apache/cloudstack/alert/snmp/SnmpTrapAppenderTest.java rename to plugins/alert-handlers/snmp-alerts/src/test/java/org/apache/cloudstack/alert/snmp/SnmpTrapAppenderTest.java diff --git a/plugins/alert-handlers/syslog-alerts/src/org/apache/cloudstack/syslog/AlertsSyslogAppender.java b/plugins/alert-handlers/syslog-alerts/src/main/java/org/apache/cloudstack/syslog/AlertsSyslogAppender.java similarity index 100% rename from plugins/alert-handlers/syslog-alerts/src/org/apache/cloudstack/syslog/AlertsSyslogAppender.java rename to plugins/alert-handlers/syslog-alerts/src/main/java/org/apache/cloudstack/syslog/AlertsSyslogAppender.java diff --git a/plugins/alert-handlers/syslog-alerts/test/org/apache/cloudstack/syslog/AlertsSyslogAppenderTest.java b/plugins/alert-handlers/syslog-alerts/src/test/java/org/apache/cloudstack/syslog/AlertsSyslogAppenderTest.java similarity index 100% rename from plugins/alert-handlers/syslog-alerts/test/org/apache/cloudstack/syslog/AlertsSyslogAppenderTest.java rename to plugins/alert-handlers/syslog-alerts/src/test/java/org/apache/cloudstack/syslog/AlertsSyslogAppenderTest.java diff --git a/plugins/api/discovery/src/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java b/plugins/api/discovery/src/main/java/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java similarity index 100% rename from plugins/api/discovery/src/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java rename to plugins/api/discovery/src/main/java/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java diff --git a/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiDiscoveryResponse.java b/plugins/api/discovery/src/main/java/org/apache/cloudstack/api/response/ApiDiscoveryResponse.java similarity index 100% rename from plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiDiscoveryResponse.java rename to plugins/api/discovery/src/main/java/org/apache/cloudstack/api/response/ApiDiscoveryResponse.java diff --git a/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiParameterResponse.java b/plugins/api/discovery/src/main/java/org/apache/cloudstack/api/response/ApiParameterResponse.java similarity index 100% rename from plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiParameterResponse.java rename to plugins/api/discovery/src/main/java/org/apache/cloudstack/api/response/ApiParameterResponse.java diff --git a/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiResponseResponse.java b/plugins/api/discovery/src/main/java/org/apache/cloudstack/api/response/ApiResponseResponse.java similarity index 100% rename from plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiResponseResponse.java rename to plugins/api/discovery/src/main/java/org/apache/cloudstack/api/response/ApiResponseResponse.java diff --git a/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryService.java b/plugins/api/discovery/src/main/java/org/apache/cloudstack/discovery/ApiDiscoveryService.java similarity index 100% rename from plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryService.java rename to plugins/api/discovery/src/main/java/org/apache/cloudstack/discovery/ApiDiscoveryService.java diff --git a/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java b/plugins/api/discovery/src/main/java/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java similarity index 100% rename from plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java rename to plugins/api/discovery/src/main/java/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java diff --git a/plugins/api/discovery/test/org/apache/cloudstack/discovery/ApiDiscoveryTest.java b/plugins/api/discovery/src/test/java/org/apache/cloudstack/discovery/ApiDiscoveryTest.java similarity index 100% rename from plugins/api/discovery/test/org/apache/cloudstack/discovery/ApiDiscoveryTest.java rename to plugins/api/discovery/src/test/java/org/apache/cloudstack/discovery/ApiDiscoveryTest.java diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java b/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java similarity index 100% rename from plugins/api/rate-limit/src/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java rename to plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java b/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java similarity index 100% rename from plugins/api/rate-limit/src/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java rename to plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/api/response/ApiLimitResponse.java b/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/response/ApiLimitResponse.java similarity index 100% rename from plugins/api/rate-limit/src/org/apache/cloudstack/api/response/ApiLimitResponse.java rename to plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/response/ApiLimitResponse.java diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitService.java b/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/ratelimit/ApiRateLimitService.java similarity index 100% rename from plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitService.java rename to plugins/api/rate-limit/src/main/java/org/apache/cloudstack/ratelimit/ApiRateLimitService.java diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java b/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java similarity index 100% rename from plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java rename to plugins/api/rate-limit/src/main/java/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/EhcacheLimitStore.java b/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/ratelimit/EhcacheLimitStore.java similarity index 100% rename from plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/EhcacheLimitStore.java rename to plugins/api/rate-limit/src/main/java/org/apache/cloudstack/ratelimit/EhcacheLimitStore.java diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/LimitStore.java b/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/ratelimit/LimitStore.java similarity index 100% rename from plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/LimitStore.java rename to plugins/api/rate-limit/src/main/java/org/apache/cloudstack/ratelimit/LimitStore.java diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/StoreEntry.java b/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/ratelimit/StoreEntry.java similarity index 100% rename from plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/StoreEntry.java rename to plugins/api/rate-limit/src/main/java/org/apache/cloudstack/ratelimit/StoreEntry.java diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/StoreEntryImpl.java b/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/ratelimit/StoreEntryImpl.java similarity index 100% rename from plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/StoreEntryImpl.java rename to plugins/api/rate-limit/src/main/java/org/apache/cloudstack/ratelimit/StoreEntryImpl.java diff --git a/plugins/api/rate-limit/resources/META-INF/cloudstack/rate-limit/module.properties b/plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/module.properties similarity index 100% rename from plugins/api/rate-limit/resources/META-INF/cloudstack/rate-limit/module.properties rename to plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/module.properties diff --git a/plugins/api/rate-limit/resources/META-INF/cloudstack/rate-limit/spring-rate-limit-context.xml b/plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/spring-rate-limit-context.xml similarity index 100% rename from plugins/api/rate-limit/resources/META-INF/cloudstack/rate-limit/spring-rate-limit-context.xml rename to plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/spring-rate-limit-context.xml diff --git a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/ApiRateLimitTest.java b/plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/ApiRateLimitTest.java similarity index 100% rename from plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/ApiRateLimitTest.java rename to plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/ApiRateLimitTest.java diff --git a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/APITest.java b/plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/APITest.java similarity index 100% rename from plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/APITest.java rename to plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/APITest.java diff --git a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/LoginResponse.java b/plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/LoginResponse.java similarity index 100% rename from plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/LoginResponse.java rename to plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/LoginResponse.java diff --git a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/RateLimitIntegrationTest.java b/plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/RateLimitIntegrationTest.java similarity index 100% rename from plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/RateLimitIntegrationTest.java rename to plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/RateLimitIntegrationTest.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/command/admin/solidfire/GetPathForVolumeCmd.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetPathForVolumeCmd.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/command/admin/solidfire/GetPathForVolumeCmd.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetPathForVolumeCmd.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireAccountIdCmd.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireAccountIdCmd.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireAccountIdCmd.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireAccountIdCmd.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeAccessGroupIdCmd.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeAccessGroupIdCmd.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeAccessGroupIdCmd.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeAccessGroupIdCmd.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeSizeCmd.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeSizeCmd.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeSizeCmd.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeSizeCmd.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeSnapshotDetailsCmd.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeSnapshotDetailsCmd.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeSnapshotDetailsCmd.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeSnapshotDetailsCmd.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeiScsiNameCmd.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeiScsiNameCmd.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeiScsiNameCmd.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeiScsiNameCmd.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/response/solidfire/ApiPathForVolumeResponse.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/response/solidfire/ApiPathForVolumeResponse.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/response/solidfire/ApiPathForVolumeResponse.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/response/solidfire/ApiPathForVolumeResponse.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/response/solidfire/ApiSolidFireAccountIdResponse.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/response/solidfire/ApiSolidFireAccountIdResponse.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/response/solidfire/ApiSolidFireAccountIdResponse.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/response/solidfire/ApiSolidFireAccountIdResponse.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/response/solidfire/ApiSolidFireVolumeAccessGroupIdResponse.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/response/solidfire/ApiSolidFireVolumeAccessGroupIdResponse.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/response/solidfire/ApiSolidFireVolumeAccessGroupIdResponse.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/response/solidfire/ApiSolidFireVolumeAccessGroupIdResponse.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/response/solidfire/ApiSolidFireVolumeSizeResponse.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/response/solidfire/ApiSolidFireVolumeSizeResponse.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/response/solidfire/ApiSolidFireVolumeSizeResponse.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/response/solidfire/ApiSolidFireVolumeSizeResponse.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/response/solidfire/ApiVolumeSnapshotDetailsResponse.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/response/solidfire/ApiVolumeSnapshotDetailsResponse.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/response/solidfire/ApiVolumeSnapshotDetailsResponse.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/response/solidfire/ApiVolumeSnapshotDetailsResponse.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/response/solidfire/ApiVolumeiScsiNameResponse.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/response/solidfire/ApiVolumeiScsiNameResponse.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/response/solidfire/ApiVolumeiScsiNameResponse.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/response/solidfire/ApiVolumeiScsiNameResponse.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/solidfire/ApiSolidFireIntegrationTestService.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/solidfire/ApiSolidFireIntegrationTestService.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/solidfire/ApiSolidFireIntegrationTestService.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/solidfire/ApiSolidFireIntegrationTestService.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/solidfire/ApiSolidFireIntegrationTestServiceImpl.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/solidfire/ApiSolidFireIntegrationTestServiceImpl.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/api/solidfire/ApiSolidFireIntegrationTestServiceImpl.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/solidfire/ApiSolidFireIntegrationTestServiceImpl.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/solidfire/SolidFireIntegrationTestManager.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/solidfire/SolidFireIntegrationTestManager.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/solidfire/SolidFireIntegrationTestManager.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/solidfire/SolidFireIntegrationTestManager.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/solidfire/SolidFireIntegrationTestManagerImpl.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/solidfire/SolidFireIntegrationTestManagerImpl.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/solidfire/SolidFireIntegrationTestManagerImpl.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/solidfire/SolidFireIntegrationTestManagerImpl.java diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/util/solidfire/SolidFireIntegrationTestUtil.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/util/solidfire/SolidFireIntegrationTestUtil.java similarity index 100% rename from plugins/api/solidfire-intg-test/src/org/apache/cloudstack/util/solidfire/SolidFireIntegrationTestUtil.java rename to plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/util/solidfire/SolidFireIntegrationTestUtil.java diff --git a/plugins/api/solidfire-intg-test/resources/META-INF/cloudstack/solidfire-intg-test/module.properties b/plugins/api/solidfire-intg-test/src/main/resources/META-INF/cloudstack/solidfire-intg-test/module.properties similarity index 100% rename from plugins/api/solidfire-intg-test/resources/META-INF/cloudstack/solidfire-intg-test/module.properties rename to plugins/api/solidfire-intg-test/src/main/resources/META-INF/cloudstack/solidfire-intg-test/module.properties diff --git a/plugins/api/solidfire-intg-test/resources/META-INF/cloudstack/solidfire-intg-test/spring-solidfire-intg-test-context.xml b/plugins/api/solidfire-intg-test/src/main/resources/META-INF/cloudstack/solidfire-intg-test/spring-solidfire-intg-test-context.xml similarity index 100% rename from plugins/api/solidfire-intg-test/resources/META-INF/cloudstack/solidfire-intg-test/spring-solidfire-intg-test-context.xml rename to plugins/api/solidfire-intg-test/src/main/resources/META-INF/cloudstack/solidfire-intg-test/spring-solidfire-intg-test-context.xml diff --git a/plugins/api/vmware-sioc/src/org/apache/cloudstack/api/command/admin/sioc/UpdateSiocInfoCmd.java b/plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/api/command/admin/sioc/UpdateSiocInfoCmd.java similarity index 100% rename from plugins/api/vmware-sioc/src/org/apache/cloudstack/api/command/admin/sioc/UpdateSiocInfoCmd.java rename to plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/api/command/admin/sioc/UpdateSiocInfoCmd.java diff --git a/plugins/api/vmware-sioc/src/org/apache/cloudstack/api/response/sioc/ApiUpdateSiocInfoResponse.java b/plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/api/response/sioc/ApiUpdateSiocInfoResponse.java similarity index 100% rename from plugins/api/vmware-sioc/src/org/apache/cloudstack/api/response/sioc/ApiUpdateSiocInfoResponse.java rename to plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/api/response/sioc/ApiUpdateSiocInfoResponse.java diff --git a/plugins/api/vmware-sioc/src/org/apache/cloudstack/api/sioc/ApiSiocService.java b/plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/api/sioc/ApiSiocService.java similarity index 100% rename from plugins/api/vmware-sioc/src/org/apache/cloudstack/api/sioc/ApiSiocService.java rename to plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/api/sioc/ApiSiocService.java diff --git a/plugins/api/vmware-sioc/src/org/apache/cloudstack/api/sioc/ApiSiocServiceImpl.java b/plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/api/sioc/ApiSiocServiceImpl.java similarity index 100% rename from plugins/api/vmware-sioc/src/org/apache/cloudstack/api/sioc/ApiSiocServiceImpl.java rename to plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/api/sioc/ApiSiocServiceImpl.java diff --git a/plugins/api/vmware-sioc/src/org/apache/cloudstack/sioc/SiocManager.java b/plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/sioc/SiocManager.java similarity index 100% rename from plugins/api/vmware-sioc/src/org/apache/cloudstack/sioc/SiocManager.java rename to plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/sioc/SiocManager.java diff --git a/plugins/api/vmware-sioc/src/org/apache/cloudstack/sioc/SiocManagerImpl.java b/plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/sioc/SiocManagerImpl.java similarity index 100% rename from plugins/api/vmware-sioc/src/org/apache/cloudstack/sioc/SiocManagerImpl.java rename to plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/sioc/SiocManagerImpl.java diff --git a/plugins/api/vmware-sioc/src/org/apache/cloudstack/util/LoginInfo.java b/plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/util/LoginInfo.java similarity index 100% rename from plugins/api/vmware-sioc/src/org/apache/cloudstack/util/LoginInfo.java rename to plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/util/LoginInfo.java diff --git a/plugins/api/vmware-sioc/src/org/apache/cloudstack/util/vmware/VMwareUtil.java b/plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/util/vmware/VMwareUtil.java similarity index 100% rename from plugins/api/vmware-sioc/src/org/apache/cloudstack/util/vmware/VMwareUtil.java rename to plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/util/vmware/VMwareUtil.java diff --git a/plugins/api/vmware-sioc/resources/META-INF/cloudstack/vmware-sioc/module.properties b/plugins/api/vmware-sioc/src/main/resources/META-INF/cloudstack/vmware-sioc/module.properties similarity index 100% rename from plugins/api/vmware-sioc/resources/META-INF/cloudstack/vmware-sioc/module.properties rename to plugins/api/vmware-sioc/src/main/resources/META-INF/cloudstack/vmware-sioc/module.properties diff --git a/plugins/api/vmware-sioc/resources/META-INF/cloudstack/vmware-sioc/spring-sioc-context.xml b/plugins/api/vmware-sioc/src/main/resources/META-INF/cloudstack/vmware-sioc/spring-sioc-context.xml similarity index 100% rename from plugins/api/vmware-sioc/resources/META-INF/cloudstack/vmware-sioc/spring-sioc-context.xml rename to plugins/api/vmware-sioc/src/main/resources/META-INF/cloudstack/vmware-sioc/spring-sioc-context.xml diff --git a/plugins/ca/root-ca/src/org/apache/cloudstack/ca/provider/RootCACustomTrustManager.java b/plugins/ca/root-ca/src/main/java/org/apache/cloudstack/ca/provider/RootCACustomTrustManager.java similarity index 100% rename from plugins/ca/root-ca/src/org/apache/cloudstack/ca/provider/RootCACustomTrustManager.java rename to plugins/ca/root-ca/src/main/java/org/apache/cloudstack/ca/provider/RootCACustomTrustManager.java diff --git a/plugins/ca/root-ca/src/org/apache/cloudstack/ca/provider/RootCAProvider.java b/plugins/ca/root-ca/src/main/java/org/apache/cloudstack/ca/provider/RootCAProvider.java similarity index 100% rename from plugins/ca/root-ca/src/org/apache/cloudstack/ca/provider/RootCAProvider.java rename to plugins/ca/root-ca/src/main/java/org/apache/cloudstack/ca/provider/RootCAProvider.java diff --git a/plugins/ca/root-ca/resources/META-INF/cloudstack/root-ca/module.properties b/plugins/ca/root-ca/src/main/resources/META-INF/cloudstack/root-ca/module.properties similarity index 100% rename from plugins/ca/root-ca/resources/META-INF/cloudstack/root-ca/module.properties rename to plugins/ca/root-ca/src/main/resources/META-INF/cloudstack/root-ca/module.properties diff --git a/plugins/ca/root-ca/resources/META-INF/cloudstack/root-ca/spring-root-ca-context.xml b/plugins/ca/root-ca/src/main/resources/META-INF/cloudstack/root-ca/spring-root-ca-context.xml similarity index 100% rename from plugins/ca/root-ca/resources/META-INF/cloudstack/root-ca/spring-root-ca-context.xml rename to plugins/ca/root-ca/src/main/resources/META-INF/cloudstack/root-ca/spring-root-ca-context.xml diff --git a/plugins/ca/root-ca/test/org/apache/cloudstack/ca/provider/RootCACustomTrustManagerTest.java b/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCACustomTrustManagerTest.java similarity index 100% rename from plugins/ca/root-ca/test/org/apache/cloudstack/ca/provider/RootCACustomTrustManagerTest.java rename to plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCACustomTrustManagerTest.java diff --git a/plugins/ca/root-ca/test/org/apache/cloudstack/ca/provider/RootCAProviderTest.java b/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java similarity index 100% rename from plugins/ca/root-ca/test/org/apache/cloudstack/ca/provider/RootCAProviderTest.java rename to plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java diff --git a/plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java b/plugins/database/mysql-ha/src/main/java/com/cloud/utils/db/StaticStrategy.java similarity index 100% rename from plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java rename to plugins/database/mysql-ha/src/main/java/com/cloud/utils/db/StaticStrategy.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaBalanceCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaBalanceCmd.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaBalanceCmd.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaBalanceCmd.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaCreditsCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaCreditsCmd.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmd.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmd.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmd.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmd.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmd.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmd.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaEnabledCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEnabledCmd.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaEnabledCmd.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEnabledCmd.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaStatementCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaStatementCmd.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaStatementCmd.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaStatementCmd.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaSummaryCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaSummaryCmd.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaTariffListCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffListCmd.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaTariffListCmd.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffListCmd.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaUpdateCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaUpdateCmd.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaUpdateCmd.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaUpdateCmd.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaBalanceResponse.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaBalanceResponse.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaBalanceResponse.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaBalanceResponse.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaCreditsResponse.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaCreditsResponse.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaCreditsResponse.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaCreditsResponse.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaEmailTemplateResponse.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaEmailTemplateResponse.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaEmailTemplateResponse.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaEmailTemplateResponse.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaEnabledResponse.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaEnabledResponse.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaEnabledResponse.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaEnabledResponse.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilder.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilder.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilder.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilder.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaStatementItemResponse.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaStatementItemResponse.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaStatementItemResponse.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaStatementItemResponse.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaStatementResponse.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaStatementResponse.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaStatementResponse.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaStatementResponse.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaSummaryResponse.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaSummaryResponse.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaSummaryResponse.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaSummaryResponse.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaTariffResponse.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaTariffResponse.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaTariffResponse.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaTariffResponse.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaTypeResponse.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaTypeResponse.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaTypeResponse.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaTypeResponse.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaUpdateResponse.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaUpdateResponse.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaUpdateResponse.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaUpdateResponse.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaService.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/quota/QuotaService.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/quota/QuotaService.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/quota/QuotaService.java diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaServiceImpl.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/quota/QuotaServiceImpl.java similarity index 100% rename from plugins/database/quota/src/org/apache/cloudstack/quota/QuotaServiceImpl.java rename to plugins/database/quota/src/main/java/org/apache/cloudstack/quota/QuotaServiceImpl.java diff --git a/plugins/database/quota/resources/META-INF/cloudstack/quota/module.properties b/plugins/database/quota/src/main/resources/META-INF/cloudstack/quota/module.properties similarity index 100% rename from plugins/database/quota/resources/META-INF/cloudstack/quota/module.properties rename to plugins/database/quota/src/main/resources/META-INF/cloudstack/quota/module.properties diff --git a/plugins/database/quota/resources/META-INF/cloudstack/quota/spring-quota-context.xml b/plugins/database/quota/src/main/resources/META-INF/cloudstack/quota/spring-quota-context.xml similarity index 100% rename from plugins/database/quota/resources/META-INF/cloudstack/quota/spring-quota-context.xml rename to plugins/database/quota/src/main/resources/META-INF/cloudstack/quota/spring-quota-context.xml diff --git a/plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaBalanceCmdTest.java b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaBalanceCmdTest.java similarity index 100% rename from plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaBalanceCmdTest.java rename to plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaBalanceCmdTest.java diff --git a/plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaCreditsCmdTest.java b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaCreditsCmdTest.java similarity index 100% rename from plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaCreditsCmdTest.java rename to plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaCreditsCmdTest.java diff --git a/plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmdTest.java b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmdTest.java similarity index 100% rename from plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmdTest.java rename to plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmdTest.java diff --git a/plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmdTest.java b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmdTest.java similarity index 100% rename from plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmdTest.java rename to plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmdTest.java diff --git a/plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaStatementCmdTest.java b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaStatementCmdTest.java similarity index 100% rename from plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaStatementCmdTest.java rename to plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaStatementCmdTest.java diff --git a/plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaTariffListCmdTest.java b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaTariffListCmdTest.java similarity index 100% rename from plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaTariffListCmdTest.java rename to plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaTariffListCmdTest.java diff --git a/plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaTariffUpdateCmdTest.java b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaTariffUpdateCmdTest.java similarity index 100% rename from plugins/database/quota/test/org/apache/cloudstack/api/command/QuotaTariffUpdateCmdTest.java rename to plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaTariffUpdateCmdTest.java diff --git a/plugins/database/quota/test/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java similarity index 100% rename from plugins/database/quota/test/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java rename to plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java diff --git a/plugins/database/quota/test/org/apache/cloudstack/quota/QuotaServiceImplTest.java b/plugins/database/quota/src/test/java/org/apache/cloudstack/quota/QuotaServiceImplTest.java similarity index 100% rename from plugins/database/quota/test/org/apache/cloudstack/quota/QuotaServiceImplTest.java rename to plugins/database/quota/src/test/java/org/apache/cloudstack/quota/QuotaServiceImplTest.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateClusterCmd.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateClusterCmd.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateHostCmd.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateHostCmd.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicatePodCmd.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicatePodCmd.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateZoneCmd.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateZoneCmd.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateClusterResponse.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/response/DedicateClusterResponse.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateClusterResponse.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/response/DedicateClusterResponse.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateHostResponse.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/response/DedicateHostResponse.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateHostResponse.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/response/DedicateHostResponse.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicatePodResponse.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/response/DedicatePodResponse.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicatePodResponse.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/response/DedicatePodResponse.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateZoneResponse.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/response/DedicateZoneResponse.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateZoneResponse.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/response/DedicateZoneResponse.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedService.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedService.java similarity index 100% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedService.java rename to plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedService.java diff --git a/plugins/dedicated-resources/resources/META-INF/cloudstack/core/spring-dedicated-resources-core-context.xml b/plugins/dedicated-resources/src/main/resources/META-INF/cloudstack/core/spring-dedicated-resources-core-context.xml similarity index 100% rename from plugins/dedicated-resources/resources/META-INF/cloudstack/core/spring-dedicated-resources-core-context.xml rename to plugins/dedicated-resources/src/main/resources/META-INF/cloudstack/core/spring-dedicated-resources-core-context.xml diff --git a/plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java b/plugins/dedicated-resources/src/test/java/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java similarity index 100% rename from plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java rename to plugins/dedicated-resources/src/test/java/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java diff --git a/plugins/dedicated-resources/test/resource/dedicatedContext.xml b/plugins/dedicated-resources/src/test/resources/dedicatedContext.xml similarity index 100% rename from plugins/dedicated-resources/test/resource/dedicatedContext.xml rename to plugins/dedicated-resources/src/test/resources/dedicatedContext.xml diff --git a/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java b/plugins/deployment-planners/implicit-dedication/src/main/java/com/cloud/deploy/ImplicitDedicationPlanner.java similarity index 100% rename from plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java rename to plugins/deployment-planners/implicit-dedication/src/main/java/com/cloud/deploy/ImplicitDedicationPlanner.java diff --git a/plugins/deployment-planners/implicit-dedication/resources/META-INF/cloudstack/implicit-dedication/module.properties b/plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/module.properties similarity index 100% rename from plugins/deployment-planners/implicit-dedication/resources/META-INF/cloudstack/implicit-dedication/module.properties rename to plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/module.properties diff --git a/plugins/deployment-planners/implicit-dedication/resources/META-INF/cloudstack/implicit-dedication/spring-implicit-dedication-context.xml b/plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/spring-implicit-dedication-context.xml similarity index 100% rename from plugins/deployment-planners/implicit-dedication/resources/META-INF/cloudstack/implicit-dedication/spring-implicit-dedication-context.xml rename to plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/spring-implicit-dedication-context.xml diff --git a/plugins/deployment-planners/implicit-dedication/test/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java b/plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java similarity index 100% rename from plugins/deployment-planners/implicit-dedication/test/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java rename to plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java diff --git a/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java b/plugins/deployment-planners/user-concentrated-pod/src/main/java/com/cloud/deploy/UserConcentratedPodPlanner.java similarity index 100% rename from plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java rename to plugins/deployment-planners/user-concentrated-pod/src/main/java/com/cloud/deploy/UserConcentratedPodPlanner.java diff --git a/plugins/deployment-planners/user-concentrated-pod/resources/META-INF/cloudstack/user-concentrated-pod/module.properties b/plugins/deployment-planners/user-concentrated-pod/src/main/resources/META-INF/cloudstack/user-concentrated-pod/module.properties similarity index 100% rename from plugins/deployment-planners/user-concentrated-pod/resources/META-INF/cloudstack/user-concentrated-pod/module.properties rename to plugins/deployment-planners/user-concentrated-pod/src/main/resources/META-INF/cloudstack/user-concentrated-pod/module.properties diff --git a/plugins/deployment-planners/user-concentrated-pod/resources/META-INF/cloudstack/user-concentrated-pod/spring-user-concentrated-pod-context.xml b/plugins/deployment-planners/user-concentrated-pod/src/main/resources/META-INF/cloudstack/user-concentrated-pod/spring-user-concentrated-pod-context.xml similarity index 100% rename from plugins/deployment-planners/user-concentrated-pod/resources/META-INF/cloudstack/user-concentrated-pod/spring-user-concentrated-pod-context.xml rename to plugins/deployment-planners/user-concentrated-pod/src/main/resources/META-INF/cloudstack/user-concentrated-pod/spring-user-concentrated-pod-context.xml diff --git a/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java b/plugins/deployment-planners/user-dispersing/src/main/java/com/cloud/deploy/UserDispersingPlanner.java similarity index 100% rename from plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java rename to plugins/deployment-planners/user-dispersing/src/main/java/com/cloud/deploy/UserDispersingPlanner.java diff --git a/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java b/plugins/event-bus/inmemory/src/main/java/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java similarity index 100% rename from plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java rename to plugins/event-bus/inmemory/src/main/java/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java diff --git a/plugins/event-bus/inmemory/test/org/apache/cloudstack/mom/inmemory/InMemoryEventBusTest.java b/plugins/event-bus/inmemory/src/test/java/org/apache/cloudstack/mom/inmemory/InMemoryEventBusTest.java similarity index 100% rename from plugins/event-bus/inmemory/test/org/apache/cloudstack/mom/inmemory/InMemoryEventBusTest.java rename to plugins/event-bus/inmemory/src/test/java/org/apache/cloudstack/mom/inmemory/InMemoryEventBusTest.java diff --git a/plugins/event-bus/kafka/src/org/apache/cloudstack/mom/kafka/KafkaEventBus.java b/plugins/event-bus/kafka/src/main/java/org/apache/cloudstack/mom/kafka/KafkaEventBus.java similarity index 100% rename from plugins/event-bus/kafka/src/org/apache/cloudstack/mom/kafka/KafkaEventBus.java rename to plugins/event-bus/kafka/src/main/java/org/apache/cloudstack/mom/kafka/KafkaEventBus.java diff --git a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java b/plugins/event-bus/rabbitmq/src/main/java/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java similarity index 100% rename from plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java rename to plugins/event-bus/rabbitmq/src/main/java/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/AssociateLunCmd.java b/plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/AssociateLunCmd.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/AssociateLunCmd.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/AssociateLunCmd.java diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateLunCmd.java b/plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/CreateLunCmd.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateLunCmd.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/CreateLunCmd.java diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java b/plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java b/plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java b/plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyLunCmd.java b/plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/DestroyLunCmd.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyLunCmd.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/DestroyLunCmd.java diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java b/plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DissociateLunCmd.java b/plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/DissociateLunCmd.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DissociateLunCmd.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/DissociateLunCmd.java diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java b/plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/ListLunsCmd.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/ListLunsCmd.java diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java b/plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java b/plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java b/plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/LunVO.java b/plugins/file-systems/netapp/src/main/java/com/cloud/netapp/LunVO.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/netapp/LunVO.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/netapp/LunVO.java diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappAllocator.java b/plugins/file-systems/netapp/src/main/java/com/cloud/netapp/NetappAllocator.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/netapp/NetappAllocator.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/netapp/NetappAllocator.java diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java b/plugins/file-systems/netapp/src/main/java/com/cloud/netapp/NetappDefaultAllocatorImpl.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/netapp/NetappDefaultAllocatorImpl.java diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManager.java b/plugins/file-systems/netapp/src/main/java/com/cloud/netapp/NetappManager.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/netapp/NetappManager.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/netapp/NetappManager.java diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java b/plugins/file-systems/netapp/src/main/java/com/cloud/netapp/NetappManagerImpl.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/netapp/NetappManagerImpl.java diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappVolumeVO.java b/plugins/file-systems/netapp/src/main/java/com/cloud/netapp/NetappVolumeVO.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/netapp/NetappVolumeVO.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/netapp/NetappVolumeVO.java diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/PoolVO.java b/plugins/file-systems/netapp/src/main/java/com/cloud/netapp/PoolVO.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/netapp/PoolVO.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/netapp/PoolVO.java diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDao.java b/plugins/file-systems/netapp/src/main/java/com/cloud/netapp/dao/LunDao.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDao.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/netapp/dao/LunDao.java diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDaoImpl.java b/plugins/file-systems/netapp/src/main/java/com/cloud/netapp/dao/LunDaoImpl.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDaoImpl.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/netapp/dao/LunDaoImpl.java diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/PoolDao.java b/plugins/file-systems/netapp/src/main/java/com/cloud/netapp/dao/PoolDao.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/netapp/dao/PoolDao.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/netapp/dao/PoolDao.java diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/PoolDaoImpl.java b/plugins/file-systems/netapp/src/main/java/com/cloud/netapp/dao/PoolDaoImpl.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/netapp/dao/PoolDaoImpl.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/netapp/dao/PoolDaoImpl.java diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDao.java b/plugins/file-systems/netapp/src/main/java/com/cloud/netapp/dao/VolumeDao.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDao.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/netapp/dao/VolumeDao.java diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java b/plugins/file-systems/netapp/src/main/java/com/cloud/netapp/dao/VolumeDaoImpl.java similarity index 100% rename from plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java rename to plugins/file-systems/netapp/src/main/java/com/cloud/netapp/dao/VolumeDaoImpl.java diff --git a/plugins/ha-planners/skip-heurestics/src/com/cloud/deploy/SkipHeuresticsPlanner.java b/plugins/ha-planners/skip-heurestics/src/main/java/com/cloud/deploy/SkipHeuresticsPlanner.java similarity index 100% rename from plugins/ha-planners/skip-heurestics/src/com/cloud/deploy/SkipHeuresticsPlanner.java rename to plugins/ha-planners/skip-heurestics/src/main/java/com/cloud/deploy/SkipHeuresticsPlanner.java diff --git a/plugins/ha-planners/skip-heurestics/resources/META-INF/cloudstack/skip-heurestics/module.properties b/plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/module.properties similarity index 100% rename from plugins/ha-planners/skip-heurestics/resources/META-INF/cloudstack/skip-heurestics/module.properties rename to plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/module.properties diff --git a/plugins/ha-planners/skip-heurestics/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml b/plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml similarity index 100% rename from plugins/ha-planners/skip-heurestics/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml rename to plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml diff --git a/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java b/plugins/host-allocators/random/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java similarity index 100% rename from plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java rename to plugins/host-allocators/random/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java diff --git a/plugins/host-allocators/random/resources/META-INF/cloudstack/host-allocator-random/module.properties b/plugins/host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random/module.properties similarity index 100% rename from plugins/host-allocators/random/resources/META-INF/cloudstack/host-allocator-random/module.properties rename to plugins/host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random/module.properties diff --git a/plugins/host-allocators/random/resources/META-INF/cloudstack/host-allocator-random/spring-host-allocator-random-context.xml b/plugins/host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random/spring-host-allocator-random-context.xml similarity index 100% rename from plugins/host-allocators/random/resources/META-INF/cloudstack/host-allocator-random/spring-host-allocator-random-context.xml rename to plugins/host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random/spring-host-allocator-random-context.xml diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDao.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalDhcpDao.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDao.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalDhcpDao.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpVO.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalDhcpVO.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpVO.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalDhcpVO.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDao.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalPxeDao.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDao.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalPxeDao.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeVO.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalPxeVO.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeVO.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalPxeVO.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctDao.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalRctDao.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctDao.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalRctDao.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctDaoImpl.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalRctDaoImpl.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctDaoImpl.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalRctDaoImpl.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctVO.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalRctVO.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctVO.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalRctVO.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BareMetalDiscoverer.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BareMetalDiscoverer.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalGuru.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BareMetalGuru.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalGuru.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BareMetalGuru.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BareMetalPlanner.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BareMetalPlanner.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BaremetalManager.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BaremetalManager.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BaremetalManagerImpl.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BaremetalManagerImpl.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalRct.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BaremetalRct.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalRct.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BaremetalRct.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BaremetalVlanManager.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BaremetalVlanManager.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPxeServiceBase.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalPxeServiceBase.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPxeServiceBase.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalPxeServiceBase.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalResourceBase.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalResourceBase.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResourceBase.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpResourceBase.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResourceBase.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpResourceBase.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResponse.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpResponse.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResponse.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpResponse.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpdResource.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpdResource.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpdResource.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpdResource.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeElement.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeElement.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManager.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeManager.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManager.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeManager.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxePingResponse.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxePingResponse.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxePingResponse.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxePingResponse.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResourceBase.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeResourceBase.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResourceBase.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeResourceBase.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResponse.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeResponse.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResponse.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeResponse.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeService.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeService.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeService.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeService.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalRctResponse.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalRctResponse.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalRctResponse.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalRctResponse.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalSwitchBackend.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalSwitchBackend.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalSwitchBackend.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalSwitchBackend.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalVirtualRouterCommands.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalVirtualRouterCommands.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalVirtualRouterCommands.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalVirtualRouterCommands.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalVlanStruct.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalVlanStruct.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalVlanStruct.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalVlanStruct.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/Force10BaremetalSwitchBackend.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/Force10BaremetalSwitchBackend.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/Force10BaremetalSwitchBackend.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/Force10BaremetalSwitchBackend.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/SecurityGroupHttpClient.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/SecurityGroupHttpClient.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/SecurityGroupHttpClient.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/SecurityGroupHttpClient.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/schema/ObjectFactory.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/schema/ObjectFactory.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/schema/ObjectFactory.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/schema/ObjectFactory.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/schema/SecurityGroupRule.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/schema/SecurityGroupRule.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/schema/SecurityGroupRule.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/schema/SecurityGroupRule.java diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/schema/SecurityGroupVmRuleSet.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/schema/SecurityGroupVmRuleSet.java similarity index 100% rename from plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/schema/SecurityGroupVmRuleSet.java rename to plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/schema/SecurityGroupVmRuleSet.java diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java similarity index 100% rename from plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java rename to plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalHostCmd.java similarity index 100% rename from plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java rename to plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalHostCmd.java diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java similarity index 100% rename from plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java rename to plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxeCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalPxeCmd.java similarity index 100% rename from plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxeCmd.java rename to plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalPxeCmd.java diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java similarity index 100% rename from plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java rename to plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalRctCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalRctCmd.java similarity index 100% rename from plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalRctCmd.java rename to plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalRctCmd.java diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/BaremetalProvisionDoneNotificationCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/BaremetalProvisionDoneNotificationCmd.java similarity index 100% rename from plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/BaremetalProvisionDoneNotificationCmd.java rename to plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/BaremetalProvisionDoneNotificationCmd.java diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java similarity index 100% rename from plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java rename to plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java similarity index 100% rename from plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java rename to plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java similarity index 100% rename from plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java rename to plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalRctCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalRctCmd.java similarity index 100% rename from plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalRctCmd.java rename to plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalRctCmd.java diff --git a/plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-compute/module.properties b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-compute/module.properties similarity index 100% rename from plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-compute/module.properties rename to plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-compute/module.properties diff --git a/plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-compute/spring-baremetal-compute-context.xml b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-compute/spring-baremetal-compute-context.xml similarity index 100% rename from plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-compute/spring-baremetal-compute-context.xml rename to plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-compute/spring-baremetal-compute-context.xml diff --git a/plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-discoverer/module.properties b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-discoverer/module.properties similarity index 100% rename from plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-discoverer/module.properties rename to plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-discoverer/module.properties diff --git a/plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-discoverer/spring-baremetal-discoverer-context.xml b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-discoverer/spring-baremetal-discoverer-context.xml similarity index 100% rename from plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-discoverer/spring-baremetal-discoverer-context.xml rename to plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-discoverer/spring-baremetal-discoverer-context.xml diff --git a/plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-network/module.properties b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-network/module.properties similarity index 100% rename from plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-network/module.properties rename to plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-network/module.properties diff --git a/plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-network/spring-baremetal-network-context.xml b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-network/spring-baremetal-network-context.xml similarity index 100% rename from plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-network/spring-baremetal-network-context.xml rename to plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-network/spring-baremetal-network-context.xml diff --git a/plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-planner/module.properties b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-planner/module.properties similarity index 100% rename from plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-planner/module.properties rename to plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-planner/module.properties diff --git a/plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-planner/spring-baremetal-planner-context.xml b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-planner/spring-baremetal-planner-context.xml similarity index 100% rename from plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-planner/spring-baremetal-planner-context.xml rename to plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-planner/spring-baremetal-planner-context.xml diff --git a/plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-storage/module.properties b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-storage/module.properties similarity index 100% rename from plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-storage/module.properties rename to plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-storage/module.properties diff --git a/plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-storage/spring-baremetal-storage-context.xml b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-storage/spring-baremetal-storage-context.xml similarity index 100% rename from plugins/hypervisors/baremetal/resources/META-INF/cloudstack/baremetal-storage/spring-baremetal-storage-context.xml rename to plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-storage/spring-baremetal-storage-context.xml diff --git a/plugins/hypervisors/baremetal/resources/META-INF/cloudstack/core/spring-baremetal-core-context.xml b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/core/spring-baremetal-core-context.xml similarity index 100% rename from plugins/hypervisors/baremetal/resources/META-INF/cloudstack/core/spring-baremetal-core-context.xml rename to plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/core/spring-baremetal-core-context.xml diff --git a/plugins/hypervisors/baremetal/resources/security_group_agent/cs-sgagent b/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/cs-sgagent similarity index 100% rename from plugins/hypervisors/baremetal/resources/security_group_agent/cs-sgagent rename to plugins/hypervisors/baremetal/src/main/resources/security_group_agent/cs-sgagent diff --git a/plugins/hypervisors/baremetal/resources/security_group_agent/security_group_agent/__init__.py b/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/security_group_agent/__init__.py similarity index 100% rename from plugins/hypervisors/baremetal/resources/security_group_agent/security_group_agent/__init__.py rename to plugins/hypervisors/baremetal/src/main/resources/security_group_agent/security_group_agent/__init__.py diff --git a/plugins/hypervisors/baremetal/resources/security_group_agent/security_group_agent/cs_sg_agent.py b/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/security_group_agent/cs_sg_agent.py similarity index 100% rename from plugins/hypervisors/baremetal/resources/security_group_agent/security_group_agent/cs_sg_agent.py rename to plugins/hypervisors/baremetal/src/main/resources/security_group_agent/security_group_agent/cs_sg_agent.py diff --git a/plugins/hypervisors/baremetal/resources/security_group_agent/security_group_agent/sglib.py b/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/security_group_agent/sglib.py similarity index 100% rename from plugins/hypervisors/baremetal/resources/security_group_agent/security_group_agent/sglib.py rename to plugins/hypervisors/baremetal/src/main/resources/security_group_agent/security_group_agent/sglib.py diff --git a/plugins/hypervisors/baremetal/resources/security_group_agent/security_group_agent/xmlobject.py b/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/security_group_agent/xmlobject.py similarity index 100% rename from plugins/hypervisors/baremetal/resources/security_group_agent/security_group_agent/xmlobject.py rename to plugins/hypervisors/baremetal/src/main/resources/security_group_agent/security_group_agent/xmlobject.py diff --git a/plugins/hypervisors/baremetal/resources/security_group_agent/setup.py b/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/setup.py similarity index 100% rename from plugins/hypervisors/baremetal/resources/security_group_agent/setup.py rename to plugins/hypervisors/baremetal/src/main/resources/security_group_agent/setup.py diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml index 1b44bb46206e..41b7be34df28 100644 --- a/plugins/hypervisors/hyperv/pom.xml +++ b/plugins/hypervisors/hyperv/pom.xml @@ -50,17 +50,6 @@ - install - src - test - - - resources - - - conf - - org.codehaus.mojo diff --git a/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java b/plugins/hypervisors/hyperv/src/main/java/com/cloud/ha/HypervInvestigator.java similarity index 100% rename from plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java rename to plugins/hypervisors/hyperv/src/main/java/com/cloud/ha/HypervInvestigator.java diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java b/plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java similarity index 100% rename from plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java rename to plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java b/plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/guru/HypervGuru.java similarity index 100% rename from plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java rename to plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/guru/HypervGuru.java diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/manager/HypervManager.java b/plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/manager/HypervManager.java similarity index 100% rename from plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/manager/HypervManager.java rename to plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/manager/HypervManager.java diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/manager/HypervManagerImpl.java b/plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/manager/HypervManagerImpl.java similarity index 100% rename from plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/manager/HypervManagerImpl.java rename to plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/manager/HypervManagerImpl.java diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java b/plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java similarity index 100% rename from plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java rename to plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java diff --git a/plugins/hypervisors/hyperv/src/org/apache/cloudstack/storage/motion/HypervStorageMotionStrategy.java b/plugins/hypervisors/hyperv/src/main/java/org/apache/cloudstack/storage/motion/HypervStorageMotionStrategy.java similarity index 100% rename from plugins/hypervisors/hyperv/src/org/apache/cloudstack/storage/motion/HypervStorageMotionStrategy.java rename to plugins/hypervisors/hyperv/src/main/java/org/apache/cloudstack/storage/motion/HypervStorageMotionStrategy.java diff --git a/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/core/spring-hyperv-core-context.xml b/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/core/spring-hyperv-core-context.xml similarity index 100% rename from plugins/hypervisors/hyperv/resources/META-INF/cloudstack/core/spring-hyperv-core-context.xml rename to plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/core/spring-hyperv-core-context.xml diff --git a/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-compute/module.properties b/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-compute/module.properties similarity index 100% rename from plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-compute/module.properties rename to plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-compute/module.properties diff --git a/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml b/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml similarity index 100% rename from plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml rename to plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml diff --git a/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-discoverer/module.properties b/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-discoverer/module.properties similarity index 100% rename from plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-discoverer/module.properties rename to plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-discoverer/module.properties diff --git a/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-discoverer/spring-hyperv-discoverer-context.xml b/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-discoverer/spring-hyperv-discoverer-context.xml similarity index 100% rename from plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-discoverer/spring-hyperv-discoverer-context.xml rename to plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-discoverer/spring-hyperv-discoverer-context.xml diff --git a/plugins/hypervisors/hyperv/conf/agent.properties b/plugins/hypervisors/hyperv/src/main/resources/agent.properties similarity index 100% rename from plugins/hypervisors/hyperv/conf/agent.properties rename to plugins/hypervisors/hyperv/src/main/resources/agent.properties diff --git a/plugins/hypervisors/hyperv/test/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java b/plugins/hypervisors/hyperv/src/test/java/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java similarity index 100% rename from plugins/hypervisors/hyperv/test/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java rename to plugins/hypervisors/hyperv/src/test/java/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index f7acce3cf0a7..86323359fa49 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -51,9 +51,6 @@ - install - src - test org.apache.maven.plugins diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/ha/KVMInvestigator.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/ha/KVMInvestigator.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/DirectVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/DirectVifDriver.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/DirectVifDriver.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/DirectVifDriver.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHABase.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHABase.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtCapXMLParser.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtCapXMLParser.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtCapXMLParser.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtCapXMLParser.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtNetworkDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtNetworkDef.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtNetworkDef.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtNetworkDef.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtSecretDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtSecretDef.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtSecretDef.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtSecretDef.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDef.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDef.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDef.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeXMLParser.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeXMLParser.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeXMLParser.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeXMLParser.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtXMLParser.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtXMLParser.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtXMLParser.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtXMLParser.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/MigrateKVMAsync.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/MigrateKVMAsync.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/MigrateKVMAsync.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/MigrateKVMAsync.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/VifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriver.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/VifDriver.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriver.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/VifDriverBase.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/VifDriverBase.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAttachIsoCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAttachIsoCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAttachIsoCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAttachIsoCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckConsoleProxyLoadCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckConsoleProxyLoadCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckConsoleProxyLoadCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckHealthCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckHealthCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckHealthCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckHealthCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckNetworkCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckNetworkCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckNetworkCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckNetworkCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckOnHostCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckOnHostCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckOnHostCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckOnHostCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckSshCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckSshCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckSshCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckSshCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckUrlCommand.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckUrlCommand.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckUrlCommand.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckUrlCommand.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVMActivityOnStoragePoolCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVMActivityOnStoragePoolCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVMActivityOnStoragePoolCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVMActivityOnStoragePoolCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVirtualMachineCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVirtualMachineCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVirtualMachineCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVirtualMachineCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCleanupNetworkRulesCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCleanupNetworkRulesCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCleanupNetworkRulesCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCleanupNetworkRulesCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConsoleProxyLoadCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConsoleProxyLoadCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConsoleProxyLoadCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyVolumeCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyVolumeCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyVolumeCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyVolumeCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromSnapshotCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromVolumeCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromVolumeCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromVolumeCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromVolumeCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateStoragePoolCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateStoragePoolCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateStoragePoolCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateStoragePoolCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateVMSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateVMSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateVMSnapshotCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateVMSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateVolumeFromSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateVolumeFromSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateVolumeFromSnapshotCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateVolumeFromSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteStoragePoolCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteStoragePoolCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteStoragePoolCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteStoragePoolCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteVMSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteVMSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteVMSnapshotCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteVMSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDestroyCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDestroyCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDestroyCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDestroyCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFenceCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFenceCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFenceCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFenceCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetHostStatsCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetHostStatsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetHostStatsCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetHostStatsCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetStorageStatsCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetStorageStatsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetStorageStatsCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetStorageStatsCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmIpAddressCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmIpAddressCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmIpAddressCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmIpAddressCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmNetworkStatsCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmNetworkStatsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmNetworkStatsCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmNetworkStatsCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmStatsCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmStatsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmStatsCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmStatsCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVncPortCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVncPortCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVncPortCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVncPortCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumeStatsCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumeStatsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumeStatsCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumeStatsCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMaintainCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMaintainCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMaintainCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMaintainCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtManageSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtManageSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtManageSnapshotCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtManageSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifySshKeysCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifySshKeysCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifySshKeysCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifySshKeysCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyTargetsCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyTargetsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyTargetsCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyTargetsCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesSystemVmCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesSystemVmCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesSystemVmCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesSystemVmCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesVmSecondaryIpCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesVmSecondaryIpCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesVmSecondaryIpCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesVmSecondaryIpCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkUsageCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkUsageCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkUsageCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkUsageCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsCreateTunnelCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsCreateTunnelCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsCreateTunnelCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsCreateTunnelCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsDestroyBridgeCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsDestroyBridgeCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsDestroyBridgeCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsDestroyBridgeCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsDestroyTunnelCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsDestroyTunnelCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsDestroyTunnelCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsDestroyTunnelCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsFetchInterfaceCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsFetchInterfaceCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsFetchInterfaceCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsFetchInterfaceCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsSetupBridgeCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsSetupBridgeCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsSetupBridgeCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsSetupBridgeCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsVpcPhysicalTopologyConfigCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsVpcPhysicalTopologyConfigCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsVpcPhysicalTopologyConfigCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsVpcPhysicalTopologyConfigCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsVpcRoutingPolicyConfigCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsVpcRoutingPolicyConfigCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsVpcRoutingPolicyConfigCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsVpcRoutingPolicyConfigCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPingTestCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPingTestCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPingTestCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPingTestCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPlugNicCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPlugNicCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPlugNicCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPlugNicCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrepareForMigrationCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrepareForMigrationCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrepareForMigrationCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrepareForMigrationCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrimaryStorageDownloadCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrimaryStorageDownloadCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrimaryStorageDownloadCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrimaryStorageDownloadCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPvlanSetupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPvlanSetupCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPvlanSetupCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPvlanSetupCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootRouterCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootRouterCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootRouterCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootRouterCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRequestWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRequestWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRequestWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRequestWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreVMSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreVMSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreVMSnapshotCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreVMSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertSnapshotCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertToVMSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertToVMSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertToVMSnapshotCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertToVMSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSecurityGroupRulesCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSecurityGroupRulesCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSecurityGroupRulesCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSecurityGroupRulesCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSetHostParamsCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSetHostParamsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSetHostParamsCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSetHostParamsCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStopCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStopCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStopCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStopCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStorageSubSystemCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStorageSubSystemCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStorageSubSystemCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStorageSubSystemCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUnPlugNicCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUnPlugNicCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUnPlugNicCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUnPlugNicCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUpdateHostPasswordCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUpdateHostPasswordCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUpdateHostPasswordCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUpdateHostPasswordCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUpgradeSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUpgradeSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUpgradeSnapshotCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUpgradeSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtWatchConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtWatchConsoleProxyLoadCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtWatchConsoleProxyLoadCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtWatchConsoleProxyLoadCommandWrapper.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/IscsiAdmStoragePool.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiAdmStoragePool.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/IscsiAdmStoragePool.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiAdmStoragePool.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageResource.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageResource.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageResource.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMVirtualDisk.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMVirtualDisk.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMVirtualDisk.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMVirtualDisk.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/ManagedNfsStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ManagedNfsStorageAdaptor.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/ManagedNfsStorageAdaptor.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ManagedNfsStorageAdaptor.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptorInfo.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptorInfo.java similarity index 100% rename from plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptorInfo.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptorInfo.java diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/kvm/ha/KVMHAConfig.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/kvm/ha/KVMHAConfig.java similarity index 100% rename from plugins/hypervisors/kvm/src/org/apache/cloudstack/kvm/ha/KVMHAConfig.java rename to plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/kvm/ha/KVMHAConfig.java diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/kvm/ha/KVMHAProvider.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/kvm/ha/KVMHAProvider.java similarity index 100% rename from plugins/hypervisors/kvm/src/org/apache/cloudstack/kvm/ha/KVMHAProvider.java rename to plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/kvm/ha/KVMHAProvider.java diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/kvm/ha/KVMHostActivityChecker.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/kvm/ha/KVMHostActivityChecker.java similarity index 100% rename from plugins/hypervisors/kvm/src/org/apache/cloudstack/kvm/ha/KVMHostActivityChecker.java rename to plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/kvm/ha/KVMHostActivityChecker.java diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/CPUStat.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/CPUStat.java similarity index 100% rename from plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/CPUStat.java rename to plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/CPUStat.java diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/MemStat.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/MemStat.java similarity index 100% rename from plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/MemStat.java rename to plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/MemStat.java diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java similarity index 100% rename from plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java rename to plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImgException.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImgException.java similarity index 100% rename from plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImgException.java rename to plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImgException.java diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImgFile.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImgFile.java similarity index 100% rename from plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImgFile.java rename to plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImgFile.java diff --git a/plugins/hypervisors/kvm/resources/META-INF/cloudstack/kvm-compute/module.properties b/plugins/hypervisors/kvm/src/main/resources/META-INF/cloudstack/kvm-compute/module.properties similarity index 100% rename from plugins/hypervisors/kvm/resources/META-INF/cloudstack/kvm-compute/module.properties rename to plugins/hypervisors/kvm/src/main/resources/META-INF/cloudstack/kvm-compute/module.properties diff --git a/plugins/hypervisors/kvm/resources/META-INF/cloudstack/kvm-compute/spring-kvm-compute-context.xml b/plugins/hypervisors/kvm/src/main/resources/META-INF/cloudstack/kvm-compute/spring-kvm-compute-context.xml similarity index 100% rename from plugins/hypervisors/kvm/resources/META-INF/cloudstack/kvm-compute/spring-kvm-compute-context.xml rename to plugins/hypervisors/kvm/src/main/resources/META-INF/cloudstack/kvm-compute/spring-kvm-compute-context.xml diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java rename to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java rename to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtSecretDefTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtSecretDefTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtSecretDefTest.java rename to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtSecretDefTest.java diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDefTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDefTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDefTest.java rename to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDefTest.java diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java rename to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVifDriverTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVifDriverTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVifDriverTest.java rename to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVifDriverTest.java diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java rename to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapperTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapperTest.java rename to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapperTest.java diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapperTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapperTest.java rename to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapperTest.java diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelperTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelperTest.java rename to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelperTest.java diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java rename to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java rename to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/storage/LibvirtStoragePoolTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/LibvirtStoragePoolTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/storage/LibvirtStoragePoolTest.java rename to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/LibvirtStoragePoolTest.java diff --git a/plugins/hypervisors/kvm/test/org/apache/cloudstack/kvm/ha/KVMHostHATest.java b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/kvm/ha/KVMHostHATest.java similarity index 100% rename from plugins/hypervisors/kvm/test/org/apache/cloudstack/kvm/ha/KVMHostHATest.java rename to plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/kvm/ha/KVMHostHATest.java diff --git a/plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/linux/MemStatTest.java b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/linux/MemStatTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/linux/MemStatTest.java rename to plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/linux/MemStatTest.java diff --git a/plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/qemu/QemuImgFileTest.java b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgFileTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/qemu/QemuImgFileTest.java rename to plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgFileTest.java diff --git a/plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/qemu/QemuImgTest.java b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java similarity index 100% rename from plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/qemu/QemuImgTest.java rename to plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmDiscoverer.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmDiscoverer.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmFencer.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmFencer.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmGuru.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmGuru.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmHelper.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmHelper.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmHelper.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmHelper.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmResourceBase.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmResourceBase.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Coder.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/Coder.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/object/Coder.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/Coder.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Connection.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/Connection.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/object/Connection.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/Connection.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmBridge.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmBridge.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmBridge.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmBridge.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmDisk.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmDisk.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmDisk.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmDisk.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmHost.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmHost.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmHost.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmHost.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmObject.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmObject.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmObject.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmObject.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmSecurityGroup.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmSecurityGroup.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmSecurityGroup.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmSecurityGroup.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmStoragePool.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmStoragePool.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmStoragePool.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmStoragePool.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmVif.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmVif.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmVif.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmVif.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmVlan.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmVlan.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmVlan.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmVlan.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmVm.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmVm.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmVm.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmVm.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmVolume.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmVolume.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmVolume.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmVolume.java diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Test.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/Test.java similarity index 100% rename from plugins/hypervisors/ovm/src/com/cloud/ovm/object/Test.java rename to plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/Test.java diff --git a/plugins/hypervisors/ovm/resources/META-INF/cloudstack/ovm-compute/module.properties b/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-compute/module.properties similarity index 100% rename from plugins/hypervisors/ovm/resources/META-INF/cloudstack/ovm-compute/module.properties rename to plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-compute/module.properties diff --git a/plugins/hypervisors/ovm/resources/META-INF/cloudstack/ovm-compute/spring-ovm-compute-context.xml b/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-compute/spring-ovm-compute-context.xml similarity index 100% rename from plugins/hypervisors/ovm/resources/META-INF/cloudstack/ovm-compute/spring-ovm-compute-context.xml rename to plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-compute/spring-ovm-compute-context.xml diff --git a/plugins/hypervisors/ovm/resources/META-INF/cloudstack/ovm-discoverer/module.properties b/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-discoverer/module.properties similarity index 100% rename from plugins/hypervisors/ovm/resources/META-INF/cloudstack/ovm-discoverer/module.properties rename to plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-discoverer/module.properties diff --git a/plugins/hypervisors/ovm/resources/META-INF/cloudstack/ovm-discoverer/spring-ovm-discoverer-context.xml b/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-discoverer/spring-ovm-discoverer-context.xml similarity index 100% rename from plugins/hypervisors/ovm/resources/META-INF/cloudstack/ovm-discoverer/spring-ovm-discoverer-context.xml rename to plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-discoverer/spring-ovm-discoverer-context.xml diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/ConfigFileOps.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/ConfigFileOps.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/ConfigFileOps.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/ConfigFileOps.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmCommonModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmCommonModule.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmCommonModule.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmCommonModule.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmDiskModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmDiskModule.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmDiskModule.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmDiskModule.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmDispatcher.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmDispatcher.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmDispatcher.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmDispatcher.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmFaultConstants.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmFaultConstants.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmFaultConstants.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmFaultConstants.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmHaHeartBeatModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmHaHeartBeatModule.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmHaHeartBeatModule.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmHaHeartBeatModule.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmHostModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmHostModule.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmHostModule.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmHostModule.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmLoggerModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmLoggerModule.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmLoggerModule.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmLoggerModule.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmNetworkModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmNetworkModule.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmNetworkModule.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmNetworkModule.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmObjectModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmObjectModule.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmObjectModule.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmObjectModule.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmSecurityGroupModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmSecurityGroupModule.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmSecurityGroupModule.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmSecurityGroupModule.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmVifModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmVifModule.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmVifModule.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmVifModule.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmVmModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmVmModule.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmVmModule.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmVmModule.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmVolumeModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmVolumeModule.py similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmVolumeModule.py rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmVolumeModule.py diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/configureOvm.sh b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/configureOvm.sh similarity index 100% rename from plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/configureOvm.sh rename to plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/configureOvm.sh diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml index 214d71d3b48d..20831570ef33 100644 --- a/plugins/hypervisors/ovm3/pom.xml +++ b/plugins/hypervisors/ovm3/pom.xml @@ -48,23 +48,6 @@ ${cs.log4j.version} - - ${basedir}/src/main/java - ${basedir}/src/main/scripts - ${basedir}/src/test/java - ${basedir}/target/classes - ${basedir}/target/test-classes - - - ${basedir}/src/main/resources - - - - - ${basedir}/src/test/resources - - - integration diff --git a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorResourceTest.java b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorResourceTest.java index cb02a230f58a..f668cc62223c 100644 --- a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorResourceTest.java +++ b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorResourceTest.java @@ -313,9 +313,6 @@ public VirtualMachineTO createVm(String vmName) throws Ovm3ResourceException { boolean enableHA = true; boolean limitCpuUse = false; String vncPassword = "gobbeldygoo"; - // public StartCommand(VirtualMachineTO vm, Host host, boolean - // executeInSequence) { - // ./api/src/com/cloud/agent/api/to/VirtualMachineTO.java VirtualMachineTO vmspec = new VirtualMachineTO(id, instanceName, type, cpus, speed, minRam, maxRam, bootloader, os, enableHA, limitCpuUse, vncPassword); diff --git a/plugins/hypervisors/simulator/pom.xml b/plugins/hypervisors/simulator/pom.xml index 7f60f523d750..86ba5db059e2 100644 --- a/plugins/hypervisors/simulator/pom.xml +++ b/plugins/hypervisors/simulator/pom.xml @@ -30,7 +30,6 @@ Simulator Hypervisor for Cloudstack install - src diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManager.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManager.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManager.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManager.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManagerImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManagerImpl.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManager.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockNetworkManager.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManager.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockNetworkManager.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManagerImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockNetworkManagerImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManagerImpl.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockNetworkManagerImpl.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManager.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManager.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManager.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManager.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManager.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockVmManager.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManager.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockVmManager.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockVmManagerImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockVmManagerImpl.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorInfo.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/SimulatorInfo.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorInfo.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/SimulatorInfo.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManager.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/SimulatorManager.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManager.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/SimulatorManager.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/SimulatorManagerImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/SimulatorManagerImpl.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/api/commands/CleanupSimulatorMockCmd.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/CleanupSimulatorMockCmd.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/api/commands/CleanupSimulatorMockCmd.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/CleanupSimulatorMockCmd.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorCmd.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/ConfigureSimulatorCmd.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorCmd.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/ConfigureSimulatorCmd.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorHAProviderState.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/ConfigureSimulatorHAProviderState.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorHAProviderState.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/ConfigureSimulatorHAProviderState.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/api/commands/ListSimulatorHAStateTransitions.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/ListSimulatorHAStateTransitions.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/api/commands/ListSimulatorHAStateTransitions.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/ListSimulatorHAStateTransitions.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/api/commands/QuerySimulatorMockCmd.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/QuerySimulatorMockCmd.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/api/commands/QuerySimulatorMockCmd.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/QuerySimulatorMockCmd.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/api/commands/SimulatorAddSecondaryAgent.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/SimulatorAddSecondaryAgent.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/api/commands/SimulatorAddSecondaryAgent.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/SimulatorAddSecondaryAgent.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/api/response/MockResponse.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/api/response/MockResponse.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/api/response/MockResponse.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/api/response/MockResponse.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/api/response/SimulatorHAStateResponse.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/api/response/SimulatorHAStateResponse.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/api/response/SimulatorHAStateResponse.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/api/response/SimulatorHAStateResponse.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorFencer.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/ha/SimulatorFencer.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorFencer.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/ha/SimulatorFencer.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/ha/SimulatorInvestigator.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/ha/SimulatorInvestigator.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/AgentResourceBase.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/resource/AgentResourceBase.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/AgentRoutingResource.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/resource/AgentRoutingResource.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/AgentStorageResource.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/resource/AgentStorageResource.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorDiscoverer.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorDiscoverer.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorSecondaryDiscoverer.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorSecondaryDiscoverer.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorStorageProcessor.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorStorageProcessor.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockConfigurationVO.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockConfigurationVO.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/MockConfigurationVO.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockConfigurationVO.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHost.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockHost.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/MockHost.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockHost.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHostVO.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockHostVO.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/MockHostVO.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockHostVO.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecStorageVO.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockSecStorageVO.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecStorageVO.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockSecStorageVO.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecurityRulesVO.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockSecurityRulesVO.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecurityRulesVO.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockSecurityRulesVO.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockStoragePoolVO.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockStoragePoolVO.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/MockStoragePoolVO.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockStoragePoolVO.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVMVO.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockVMVO.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/MockVMVO.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockVMVO.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVm.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockVm.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/MockVm.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockVm.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVolumeVO.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockVolumeVO.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/MockVolumeVO.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockVolumeVO.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/SimulatorGuru.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/SimulatorGuru.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/SimulatorGuru.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/SimulatorGuru.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/SimulatorRuntimeException.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/SimulatorRuntimeException.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/SimulatorRuntimeException.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/SimulatorRuntimeException.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDao.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockConfigurationDao.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDao.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockConfigurationDao.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockConfigurationDaoImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockConfigurationDaoImpl.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockHostDao.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockHostDao.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockHostDao.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockHostDao.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockHostDaoImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockHostDaoImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockHostDaoImpl.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockHostDaoImpl.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecStorageDao.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockSecStorageDao.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecStorageDao.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockSecStorageDao.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecStorageDaoImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockSecStorageDaoImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecStorageDaoImpl.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockSecStorageDaoImpl.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecurityRulesDao.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockSecurityRulesDao.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecurityRulesDao.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockSecurityRulesDao.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecurityRulesDaoImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockSecurityRulesDaoImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecurityRulesDaoImpl.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockSecurityRulesDaoImpl.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockStoragePoolDao.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockStoragePoolDao.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockStoragePoolDao.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockStoragePoolDao.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVMDao.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockVMDao.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVMDao.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockVMDao.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVMDaoImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockVMDaoImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVMDaoImpl.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockVMDaoImpl.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVolumeDao.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockVolumeDao.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVolumeDao.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockVolumeDao.java diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVolumeDaoImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockVolumeDaoImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVolumeDaoImpl.java rename to plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockVolumeDaoImpl.java diff --git a/plugins/hypervisors/simulator/src/org/apache/cloudstack/ha/SimulatorHAProvider.java b/plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/ha/SimulatorHAProvider.java similarity index 100% rename from plugins/hypervisors/simulator/src/org/apache/cloudstack/ha/SimulatorHAProvider.java rename to plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/ha/SimulatorHAProvider.java diff --git a/plugins/hypervisors/simulator/src/org/apache/cloudstack/ha/SimulatorHAState.java b/plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/ha/SimulatorHAState.java similarity index 100% rename from plugins/hypervisors/simulator/src/org/apache/cloudstack/ha/SimulatorHAState.java rename to plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/ha/SimulatorHAState.java diff --git a/plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/driver/SimulatorImageStoreDriverImpl.java b/plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/storage/datastore/driver/SimulatorImageStoreDriverImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/driver/SimulatorImageStoreDriverImpl.java rename to plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/storage/datastore/driver/SimulatorImageStoreDriverImpl.java diff --git a/plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/lifecycle/SimulatorImageStoreLifeCycleImpl.java b/plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/SimulatorImageStoreLifeCycleImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/lifecycle/SimulatorImageStoreLifeCycleImpl.java rename to plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/SimulatorImageStoreLifeCycleImpl.java diff --git a/plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java b/plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java similarity index 100% rename from plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java rename to plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java diff --git a/plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/motion/SimulatorDataMotionStrategy.java b/plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/storage/motion/SimulatorDataMotionStrategy.java similarity index 100% rename from plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/motion/SimulatorDataMotionStrategy.java rename to plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/storage/motion/SimulatorDataMotionStrategy.java diff --git a/plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/resource/SimulatorSecondaryStorageResource.java b/plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/storage/resource/SimulatorSecondaryStorageResource.java similarity index 100% rename from plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/resource/SimulatorSecondaryStorageResource.java rename to plugins/hypervisors/simulator/src/main/java/org/apache/cloudstack/storage/resource/SimulatorSecondaryStorageResource.java diff --git a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/core/spring-simulator-core-context.xml b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/core/spring-simulator-core-context.xml similarity index 100% rename from plugins/hypervisors/simulator/resources/META-INF/cloudstack/core/spring-simulator-core-context.xml rename to plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/core/spring-simulator-core-context.xml diff --git a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-compute/module.properties b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-compute/module.properties similarity index 100% rename from plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-compute/module.properties rename to plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-compute/module.properties diff --git a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-compute/spring-simulator-compute-context.xml b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-compute/spring-simulator-compute-context.xml similarity index 100% rename from plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-compute/spring-simulator-compute-context.xml rename to plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-compute/spring-simulator-compute-context.xml diff --git a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-discoverer/module.properties b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-discoverer/module.properties similarity index 100% rename from plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-discoverer/module.properties rename to plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-discoverer/module.properties diff --git a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-discoverer/spring-simulator-discover-context.xml b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-discoverer/spring-simulator-discover-context.xml similarity index 100% rename from plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-discoverer/spring-simulator-discover-context.xml rename to plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-discoverer/spring-simulator-discover-context.xml diff --git a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-storage/module.properties b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-storage/module.properties similarity index 100% rename from plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-storage/module.properties rename to plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-storage/module.properties diff --git a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-storage/spring-simulator-storage-context.xml b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-storage/spring-simulator-storage-context.xml similarity index 100% rename from plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-storage/spring-simulator-storage-context.xml rename to plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-storage/spring-simulator-storage-context.xml diff --git a/plugins/hypervisors/ucs/pom.xml b/plugins/hypervisors/ucs/pom.xml old mode 100755 new mode 100644 diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDao.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/database/UcsBladeDao.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDao.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/database/UcsBladeDao.java diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/database/UcsBladeDaoImpl.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/database/UcsBladeDaoImpl.java diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/database/UcsBladeVO.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/database/UcsBladeVO.java diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/database/UcsManagerDao.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/database/UcsManagerDao.java diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/database/UcsManagerDaoImpl.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/database/UcsManagerDaoImpl.java diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/database/UcsManagerVO.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/database/UcsManagerVO.java diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/StringTemplate.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/manager/StringTemplate.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/manager/StringTemplate.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/manager/StringTemplate.java diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/manager/UcsCommands.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/manager/UcsCommands.java diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsHttpClient.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/manager/UcsHttpClient.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsHttpClient.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/manager/UcsHttpClient.java diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManager.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/manager/UcsManager.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManager.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/manager/UcsManager.java diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/manager/UcsManagerImpl.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/manager/UcsManagerImpl.java diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/ComputeBlade.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/structure/ComputeBlade.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/structure/ComputeBlade.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/structure/ComputeBlade.java diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsCookie.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/structure/UcsCookie.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsCookie.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/structure/UcsCookie.java diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsProfile.java b/plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/structure/UcsProfile.java similarity index 100% rename from plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsProfile.java rename to plugins/hypervisors/ucs/src/main/java/com/cloud/ucs/structure/UcsProfile.java diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java b/plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/AddUcsManagerCmd.java similarity index 100% rename from plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java rename to plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/AddUcsManagerCmd.java diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java b/plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java similarity index 100% rename from plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java rename to plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/DeleteUcsManagerCmd.java b/plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/DeleteUcsManagerCmd.java similarity index 100% rename from plugins/hypervisors/ucs/src/org/apache/cloudstack/api/DeleteUcsManagerCmd.java rename to plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/DeleteUcsManagerCmd.java diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java b/plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/ListUcsBladeCmd.java similarity index 100% rename from plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java rename to plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/ListUcsBladeCmd.java diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java b/plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/ListUcsManagerCmd.java similarity index 100% rename from plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java rename to plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/ListUcsManagerCmd.java diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java b/plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/ListUcsProfileCmd.java similarity index 100% rename from plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java rename to plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/ListUcsProfileCmd.java diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsBladeResponse.java b/plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/response/UcsBladeResponse.java similarity index 100% rename from plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsBladeResponse.java rename to plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/response/UcsBladeResponse.java diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsManagerResponse.java b/plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/response/UcsManagerResponse.java similarity index 100% rename from plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsManagerResponse.java rename to plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/response/UcsManagerResponse.java diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsProfileResponse.java b/plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/response/UcsProfileResponse.java similarity index 100% rename from plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsProfileResponse.java rename to plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/response/UcsProfileResponse.java diff --git a/plugins/hypervisors/ucs/resources/META-INF/cloudstack/core/spring-ucs-core-context.xml b/plugins/hypervisors/ucs/src/main/resources/META-INF/cloudstack/core/spring-ucs-core-context.xml similarity index 100% rename from plugins/hypervisors/ucs/resources/META-INF/cloudstack/core/spring-ucs-core-context.xml rename to plugins/hypervisors/ucs/src/main/resources/META-INF/cloudstack/core/spring-ucs-core-context.xml diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/response/CiscoNexusVSMResponse.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/api/response/CiscoNexusVSMResponse.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/api/response/CiscoNexusVSMResponse.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/api/response/CiscoNexusVSMResponse.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/ha/VmwareFencer.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/ha/VmwareFencer.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/ha/VmwareInvestigator.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/ha/VmwareInvestigator.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZone.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/LegacyZone.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZone.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/LegacyZone.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZoneVO.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/LegacyZoneVO.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZoneVO.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/LegacyZoneVO.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareCleanupMaid.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareCleanupMaid.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareCleanupMaid.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareCleanupMaid.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenter.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenter.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterService.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterService.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDao.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDao.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDao.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDao.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDao.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDao.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDao.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDao.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDaoImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDaoImpl.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDaoImpl.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDaoImpl.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/CleanupFullyClonedTemplatesTask.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/CleanupFullyClonedTemplatesTask.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/CleanupFullyClonedTemplatesTask.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/CleanupFullyClonedTemplatesTask.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareHostService.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareHostService.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareHostService.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareHostService.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManager.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManager.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageMount.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageMount.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageMount.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageMount.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDevice.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/CiscoNexusVSMDevice.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDevice.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/network/CiscoNexusVSMDevice.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceVO.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/CiscoNexusVSMDeviceVO.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceVO.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/network/CiscoNexusVSMDeviceVO.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/VmwareTrafficLabel.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabel.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/network/VmwareTrafficLabel.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabel.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/element/CiscoNexusVSMElement.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/network/element/CiscoNexusVSMElement.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElementService.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/element/CiscoNexusVSMElementService.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElementService.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/network/element/CiscoNexusVSMElementService.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/PremiumSecondaryStorageResource.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/PremiumSecondaryStorageResource.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutHelper.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageLayoutHelper.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutHelper.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageLayoutHelper.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutType.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageLayoutType.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutType.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageLayoutType.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java similarity index 100% rename from plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java rename to plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java similarity index 100% rename from plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java rename to plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java similarity index 100% rename from plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java rename to plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java similarity index 100% rename from plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java rename to plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/response/VmwareDatacenterResponse.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/response/VmwareDatacenterResponse.java similarity index 100% rename from plugins/hypervisors/vmware/src/org/apache/cloudstack/api/response/VmwareDatacenterResponse.java rename to plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/response/VmwareDatacenterResponse.java diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java similarity index 100% rename from plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java rename to plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java diff --git a/plugins/hypervisors/vmware/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml similarity index 100% rename from plugins/hypervisors/vmware/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml rename to plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml diff --git a/plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-compute/module.properties b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/module.properties similarity index 100% rename from plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-compute/module.properties rename to plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/module.properties diff --git a/plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-compute/spring-vmware-compute-context.xml b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/spring-vmware-compute-context.xml similarity index 100% rename from plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-compute/spring-vmware-compute-context.xml rename to plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/spring-vmware-compute-context.xml diff --git a/plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-compute/vmware-defaults.properties b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/vmware-defaults.properties similarity index 100% rename from plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-compute/vmware-defaults.properties rename to plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/vmware-defaults.properties diff --git a/plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-discoverer/module.properties b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-discoverer/module.properties similarity index 100% rename from plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-discoverer/module.properties rename to plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-discoverer/module.properties diff --git a/plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-discoverer/spring-vmware-discoverer-context.xml b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-discoverer/spring-vmware-discoverer-context.xml similarity index 100% rename from plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-discoverer/spring-vmware-discoverer-context.xml rename to plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-discoverer/spring-vmware-discoverer-context.xml diff --git a/plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-network/module.properties b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-network/module.properties similarity index 100% rename from plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-network/module.properties rename to plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-network/module.properties diff --git a/plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-network/spring-vmware-network-context.xml b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-network/spring-vmware-network-context.xml similarity index 100% rename from plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-network/spring-vmware-network-context.xml rename to plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-network/spring-vmware-network-context.xml diff --git a/plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-storage/module.properties b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-storage/module.properties similarity index 100% rename from plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-storage/module.properties rename to plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-storage/module.properties diff --git a/plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-storage/spring-vmware-storage-context.xml b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-storage/spring-vmware-storage-context.xml similarity index 100% rename from plugins/hypervisors/vmware/resources/META-INF/cloudstack/vmware-storage/spring-vmware-storage-context.xml rename to plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-storage/spring-vmware-storage-context.xml diff --git a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/guru/VMwareGuruTest.java b/plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/guru/VMwareGuruTest.java similarity index 100% rename from plugins/hypervisors/vmware/test/com/cloud/hypervisor/guru/VMwareGuruTest.java rename to plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/guru/VMwareGuruTest.java diff --git a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java b/plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java similarity index 100% rename from plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java rename to plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java diff --git a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java b/plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java similarity index 100% rename from plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java rename to plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java diff --git a/plugins/hypervisors/vmware/test/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java b/plugins/hypervisors/vmware/src/test/java/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java similarity index 100% rename from plugins/hypervisors/vmware/test/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java rename to plugins/hypervisors/vmware/src/test/java/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/ha/XenServerFencer.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/ha/XenServerFencer.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/ha/XenServerFencer.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/ha/XenServerFencer.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/XenServerGuru.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/XenServerGuru.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixHelper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixHelper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixHelper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixHelper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpServerResource.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XcpServerResource.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpServerResource.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XcpServerResource.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56Resource.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer56Resource.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56Resource.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer56Resource.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56SP2Resource.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer56SP2Resource.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56SP2Resource.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer56SP2Resource.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer600Resource.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer600Resource.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer600Resource.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer600Resource.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer620Resource.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer620Resource.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer620Resource.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer620Resource.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer620SP1Resource.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer620SP1Resource.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer620SP1Resource.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer620SP1Resource.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer650Resource.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer650Resource.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer650Resource.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer650Resource.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerConnectionPool.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerConnectionPool.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerConnectionPool.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerConnectionPool.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625Resource.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625Resource.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625Resource.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625Resource.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XsHost.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XsHost.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XsHost.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XsHost.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XsLocalNetwork.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XsLocalNetwork.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XsLocalNetwork.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XsLocalNetwork.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xcp/XcpServerNetworkUsageCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xcp/XcpServerNetworkUsageCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xcp/XcpServerNetworkUsageCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xcp/XcpServerNetworkUsageCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56CheckOnHostCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56CheckOnHostCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56CheckOnHostCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56CheckOnHostCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56FenceCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56FenceCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56FenceCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56FenceCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56NetworkUsageCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56NetworkUsageCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56NetworkUsageCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56NetworkUsageCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen56p1/XenServer56FP1FenceCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen56p1/XenServer56FP1FenceCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen56p1/XenServer56FP1FenceCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen56p1/XenServer56FP1FenceCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateVolumeCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateVolumeCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateVolumeCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateVolumeCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCompleteCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCompleteCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCompleteCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCompleteCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageReceiveCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageReceiveCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageReceiveCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageReceiveCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageSendCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageSendCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageSendCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageSendCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen620sp1/XenServer620SP1GetGPUStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen620sp1/XenServer620SP1GetGPUStatsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen620sp1/XenServer620SP1GetGPUStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen620sp1/XenServer620SP1GetGPUStatsCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachIsoCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachIsoCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachIsoCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachIsoCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachOrDettachConfigDriveCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachOrDettachConfigDriveCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachOrDettachConfigDriveCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachOrDettachConfigDriveCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckConsoleProxyLoadCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckConsoleProxyLoadCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckConsoleProxyLoadCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckHealthCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckHealthCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckHealthCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckHealthCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckNetworkCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckNetworkCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckNetworkCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckNetworkCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckOnHostCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckOnHostCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckOnHostCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckOnHostCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckSshCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckSshCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckSshCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckSshCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckVirtualMachineCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckVirtualMachineCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckVirtualMachineCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckVirtualMachineCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupNetworkRulesCmdWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupNetworkRulesCmdWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupNetworkRulesCmdWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupNetworkRulesCmdWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixClusterVMMetaDataSyncCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixClusterVMMetaDataSyncCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixClusterVMMetaDataSyncCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixClusterVMMetaDataSyncCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateStoragePoolCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateStoragePoolCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateStoragePoolCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateStoragePoolCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateVMSnapshotCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateVMSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateVMSnapshotCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateVMSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteStoragePoolCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteStoragePoolCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteStoragePoolCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteStoragePoolCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteVMSnapshotCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteVMSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteVMSnapshotCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteVMSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDestroyCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDestroyCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDestroyCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDestroyCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetHostStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetHostStatsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetHostStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetHostStatsCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetStorageStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetStorageStatsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetStorageStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetStorageStatsCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmDiskStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmDiskStatsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmDiskStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmDiskStatsCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmIpAddressCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmIpAddressCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmIpAddressCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmIpAddressCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmNetworkStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmNetworkStatsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmNetworkStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmNetworkStatsCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmStatsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmStatsCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVncPortCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVncPortCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVncPortCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVncPortCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVolumeStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVolumeStatsCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVolumeStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVolumeStatsCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMaintainCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMaintainCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMaintainCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMaintainCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMigrateCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMigrateCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMigrateCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMigrateCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifySshKeysCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifySshKeysCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifySshKeysCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifySshKeysCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifyStoragePoolCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifyStoragePoolCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifyStoragePoolCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifyStoragePoolCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkElementCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkElementCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkElementCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkElementCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesSystemVmCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesSystemVmCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesSystemVmCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesSystemVmCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateGreTunnelCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateGreTunnelCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateGreTunnelCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateGreTunnelCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateTunnelCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateTunnelCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateTunnelCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateTunnelCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDeleteFlowCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDeleteFlowCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDeleteFlowCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDeleteFlowCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyBridgeCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyBridgeCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyBridgeCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyBridgeCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyTunnelCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyTunnelCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyTunnelCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyTunnelCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsFetchInterfaceCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsFetchInterfaceCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsFetchInterfaceCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsFetchInterfaceCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetTagAndFlowCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetTagAndFlowCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetTagAndFlowCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetTagAndFlowCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetupBridgeCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetupBridgeCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetupBridgeCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetupBridgeCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPerformanceMonitorCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPerformanceMonitorCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPerformanceMonitorCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPerformanceMonitorCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPingTestCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPingTestCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPingTestCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPingTestCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPlugNicCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPlugNicCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPlugNicCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPlugNicCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrepareForMigrationCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrepareForMigrationCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrepareForMigrationCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrepareForMigrationCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrimaryStorageDownloadCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrimaryStorageDownloadCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrimaryStorageDownloadCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrimaryStorageDownloadCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPvlanSetupCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPvlanSetupCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPvlanSetupCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPvlanSetupCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixReadyCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixReadyCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixReadyCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixReadyCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootRouterCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootRouterCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootRouterCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootRouterCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixResizeVolumeCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixResizeVolumeCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixResizeVolumeCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixResizeVolumeCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRevertToVMSnapshotCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRevertToVMSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRevertToVMSnapshotCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRevertToVMSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixScaleVmCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixScaleVmCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixScaleVmCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixScaleVmCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSecurityGroupRulesCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSecurityGroupRulesCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSecurityGroupRulesCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSecurityGroupRulesCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStopCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStopCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStopCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStopCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStorageSubSystemCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStorageSubSystemCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStorageSubSystemCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStorageSubSystemCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUnPlugNicCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUnPlugNicCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUnPlugNicCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUnPlugNicCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpdateHostPasswordCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpdateHostPasswordCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpdateHostPasswordCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpdateHostPasswordCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpgradeSnapshotCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpgradeSnapshotCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpgradeSnapshotCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpgradeSnapshotCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixWatchConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixWatchConsoleProxyLoadCommandWrapper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixWatchConsoleProxyLoadCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixWatchConsoleProxyLoadCommandWrapper.java diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServerUtilitiesHelper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServerUtilitiesHelper.java similarity index 100% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServerUtilitiesHelper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServerUtilitiesHelper.java diff --git a/plugins/hypervisors/xenserver/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java b/plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java similarity index 100% rename from plugins/hypervisors/xenserver/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java rename to plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java diff --git a/plugins/hypervisors/xenserver/src/org/apache/cloudstack/hypervisor/xenserver/XenserverConfigs.java b/plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/XenserverConfigs.java similarity index 100% rename from plugins/hypervisors/xenserver/src/org/apache/cloudstack/hypervisor/xenserver/XenserverConfigs.java rename to plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/XenserverConfigs.java diff --git a/plugins/hypervisors/xenserver/src/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java b/plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java similarity index 100% rename from plugins/hypervisors/xenserver/src/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java rename to plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java diff --git a/plugins/hypervisors/xenserver/resources/META-INF/cloudstack/xenserver-compute/module.properties b/plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-compute/module.properties similarity index 100% rename from plugins/hypervisors/xenserver/resources/META-INF/cloudstack/xenserver-compute/module.properties rename to plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-compute/module.properties diff --git a/plugins/hypervisors/xenserver/resources/META-INF/cloudstack/xenserver-compute/spring-xenserver-compute-context.xml b/plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-compute/spring-xenserver-compute-context.xml similarity index 100% rename from plugins/hypervisors/xenserver/resources/META-INF/cloudstack/xenserver-compute/spring-xenserver-compute-context.xml rename to plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-compute/spring-xenserver-compute-context.xml diff --git a/plugins/hypervisors/xenserver/resources/META-INF/cloudstack/xenserver-discoverer/module.properties b/plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-discoverer/module.properties similarity index 100% rename from plugins/hypervisors/xenserver/resources/META-INF/cloudstack/xenserver-discoverer/module.properties rename to plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-discoverer/module.properties diff --git a/plugins/hypervisors/xenserver/resources/META-INF/cloudstack/xenserver-discoverer/spring-xenserver-discoverer-context.xml b/plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-discoverer/spring-xenserver-discoverer-context.xml similarity index 100% rename from plugins/hypervisors/xenserver/resources/META-INF/cloudstack/xenserver-discoverer/spring-xenserver-discoverer-context.xml rename to plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-discoverer/spring-xenserver-discoverer-context.xml diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/XenServerGuruTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/cloud/hypervisor/XenServerGuruTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/XenServerGuruTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/cloud/hypervisor/XenServerGuruTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XcpOssResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpOssResourceTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XcpOssResourceTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpOssResourceTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XcpServerResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpServerResourceTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XcpServerResourceTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpServerResourceTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer56FP1ResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56FP1ResourceTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer56FP1ResourceTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56FP1ResourceTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer56ResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56ResourceTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer56ResourceTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56ResourceTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer56SP2ResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56SP2ResourceTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer56SP2ResourceTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56SP2ResourceTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer600ResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer600ResourceTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer600ResourceTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer600ResourceTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer625ResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer625ResourceTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer625ResourceTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer625ResourceTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer650ResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer650ResourceTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer650ResourceTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer650ResourceTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XcpServerWrapperTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XcpServerWrapperTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XcpServerWrapperTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XcpServerWrapperTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56FP1WrapperTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56FP1WrapperTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56FP1WrapperTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56FP1WrapperTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56WrapperTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56WrapperTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56WrapperTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56WrapperTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620SP1WrapperTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620SP1WrapperTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620SP1WrapperTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620SP1WrapperTest.java diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620WrapperTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620WrapperTest.java similarity index 100% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620WrapperTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620WrapperTest.java diff --git a/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnector.java b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/CloudianConnector.java similarity index 100% rename from plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnector.java rename to plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/CloudianConnector.java diff --git a/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java similarity index 100% rename from plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java rename to plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java diff --git a/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java similarity index 100% rename from plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java rename to plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java diff --git a/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java similarity index 100% rename from plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java rename to plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java diff --git a/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianClient.java b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianClient.java similarity index 100% rename from plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianClient.java rename to plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianClient.java diff --git a/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianGroup.java b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianGroup.java similarity index 100% rename from plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianGroup.java rename to plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianGroup.java diff --git a/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUser.java b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianUser.java similarity index 100% rename from plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUser.java rename to plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianUser.java diff --git a/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUtils.java b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianUtils.java similarity index 100% rename from plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUtils.java rename to plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianUtils.java diff --git a/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianEnabledResponse.java b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/response/CloudianEnabledResponse.java similarity index 100% rename from plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianEnabledResponse.java rename to plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/response/CloudianEnabledResponse.java diff --git a/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianSsoLoginResponse.java b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/response/CloudianSsoLoginResponse.java similarity index 100% rename from plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianSsoLoginResponse.java rename to plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/response/CloudianSsoLoginResponse.java diff --git a/plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/module.properties b/plugins/integrations/cloudian/src/main/resources/META-INF/cloudstack/cloudian/module.properties similarity index 100% rename from plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/module.properties rename to plugins/integrations/cloudian/src/main/resources/META-INF/cloudstack/cloudian/module.properties diff --git a/plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml b/plugins/integrations/cloudian/src/main/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml similarity index 100% rename from plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml rename to plugins/integrations/cloudian/src/main/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml diff --git a/plugins/integrations/cloudian/test/org/apache/cloudstack/cloudian/CloudianClientTest.java b/plugins/integrations/cloudian/src/test/java/org/apache/cloudstack/cloudian/CloudianClientTest.java similarity index 100% rename from plugins/integrations/cloudian/test/org/apache/cloudstack/cloudian/CloudianClientTest.java rename to plugins/integrations/cloudian/src/test/java/org/apache/cloudstack/cloudian/CloudianClientTest.java diff --git a/plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporter.java b/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporter.java similarity index 100% rename from plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporter.java rename to plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporter.java diff --git a/plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporterImpl.java b/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java similarity index 100% rename from plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporterImpl.java rename to plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java diff --git a/plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporterServer.java b/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterServer.java similarity index 100% rename from plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporterServer.java rename to plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterServer.java diff --git a/plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporterServerImpl.java b/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterServerImpl.java similarity index 100% rename from plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporterServerImpl.java rename to plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterServerImpl.java diff --git a/plugins/integrations/prometheus/resources/META-INF/cloudstack/prometheus/module.properties b/plugins/integrations/prometheus/src/main/resources/META-INF/cloudstack/prometheus/module.properties similarity index 100% rename from plugins/integrations/prometheus/resources/META-INF/cloudstack/prometheus/module.properties rename to plugins/integrations/prometheus/src/main/resources/META-INF/cloudstack/prometheus/module.properties diff --git a/plugins/integrations/prometheus/resources/META-INF/cloudstack/prometheus/spring-prometheus-context.xml b/plugins/integrations/prometheus/src/main/resources/META-INF/cloudstack/prometheus/spring-prometheus-context.xml similarity index 100% rename from plugins/integrations/prometheus/resources/META-INF/cloudstack/prometheus/spring-prometheus-context.xml rename to plugins/integrations/prometheus/src/main/resources/META-INF/cloudstack/prometheus/spring-prometheus-context.xml diff --git a/plugins/metrics/src/org/apache/cloudstack/api/ListClustersMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListClustersMetricsCmd.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/api/ListClustersMetricsCmd.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/api/ListClustersMetricsCmd.java diff --git a/plugins/metrics/src/org/apache/cloudstack/api/ListHostsMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListHostsMetricsCmd.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/api/ListHostsMetricsCmd.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/api/ListHostsMetricsCmd.java diff --git a/plugins/metrics/src/org/apache/cloudstack/api/ListInfrastructureCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListInfrastructureCmd.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/api/ListInfrastructureCmd.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/api/ListInfrastructureCmd.java diff --git a/plugins/metrics/src/org/apache/cloudstack/api/ListStoragePoolsMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListStoragePoolsMetricsCmd.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/api/ListStoragePoolsMetricsCmd.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/api/ListStoragePoolsMetricsCmd.java diff --git a/plugins/metrics/src/org/apache/cloudstack/api/ListVMsMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsMetricsCmd.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/api/ListVMsMetricsCmd.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsMetricsCmd.java diff --git a/plugins/metrics/src/org/apache/cloudstack/api/ListVolumesMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVolumesMetricsCmd.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/api/ListVolumesMetricsCmd.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVolumesMetricsCmd.java diff --git a/plugins/metrics/src/org/apache/cloudstack/api/ListZonesMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListZonesMetricsCmd.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/api/ListZonesMetricsCmd.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/api/ListZonesMetricsCmd.java diff --git a/plugins/metrics/src/org/apache/cloudstack/metrics/MetricsService.java b/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsService.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/metrics/MetricsService.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsService.java diff --git a/plugins/metrics/src/org/apache/cloudstack/metrics/MetricsServiceImpl.java b/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/metrics/MetricsServiceImpl.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java diff --git a/plugins/metrics/src/org/apache/cloudstack/response/ClusterMetricsResponse.java b/plugins/metrics/src/main/java/org/apache/cloudstack/response/ClusterMetricsResponse.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/response/ClusterMetricsResponse.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/response/ClusterMetricsResponse.java diff --git a/plugins/metrics/src/org/apache/cloudstack/response/HostMetricsResponse.java b/plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/response/HostMetricsResponse.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java diff --git a/plugins/metrics/src/org/apache/cloudstack/response/InfrastructureResponse.java b/plugins/metrics/src/main/java/org/apache/cloudstack/response/InfrastructureResponse.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/response/InfrastructureResponse.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/response/InfrastructureResponse.java diff --git a/plugins/metrics/src/org/apache/cloudstack/response/StoragePoolMetricsResponse.java b/plugins/metrics/src/main/java/org/apache/cloudstack/response/StoragePoolMetricsResponse.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/response/StoragePoolMetricsResponse.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/response/StoragePoolMetricsResponse.java diff --git a/plugins/metrics/src/org/apache/cloudstack/response/VmMetricsResponse.java b/plugins/metrics/src/main/java/org/apache/cloudstack/response/VmMetricsResponse.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/response/VmMetricsResponse.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/response/VmMetricsResponse.java diff --git a/plugins/metrics/src/org/apache/cloudstack/response/VolumeMetricsResponse.java b/plugins/metrics/src/main/java/org/apache/cloudstack/response/VolumeMetricsResponse.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/response/VolumeMetricsResponse.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/response/VolumeMetricsResponse.java diff --git a/plugins/metrics/src/org/apache/cloudstack/response/ZoneMetricsResponse.java b/plugins/metrics/src/main/java/org/apache/cloudstack/response/ZoneMetricsResponse.java similarity index 100% rename from plugins/metrics/src/org/apache/cloudstack/response/ZoneMetricsResponse.java rename to plugins/metrics/src/main/java/org/apache/cloudstack/response/ZoneMetricsResponse.java diff --git a/plugins/metrics/resources/META-INF/cloudstack/metrics/module.properties b/plugins/metrics/src/main/resources/META-INF/cloudstack/metrics/module.properties similarity index 100% rename from plugins/metrics/resources/META-INF/cloudstack/metrics/module.properties rename to plugins/metrics/src/main/resources/META-INF/cloudstack/metrics/module.properties diff --git a/plugins/metrics/resources/META-INF/cloudstack/metrics/spring-metrics-context.xml b/plugins/metrics/src/main/resources/META-INF/cloudstack/metrics/spring-metrics-context.xml similarity index 100% rename from plugins/metrics/resources/META-INF/cloudstack/metrics/spring-metrics-context.xml rename to plugins/metrics/src/main/resources/META-INF/cloudstack/metrics/spring-metrics-context.xml diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/BcfAnswer.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/BcfAnswer.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/BcfAnswer.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/BcfAnswer.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/BcfCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/BcfCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/BcfCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/BcfCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/CacheBcfTopologyCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/CacheBcfTopologyCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/CacheBcfTopologyCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/CacheBcfTopologyCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/CreateBcfAttachmentCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/CreateBcfAttachmentCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/CreateBcfAttachmentCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/CreateBcfAttachmentCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/CreateBcfRouterCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/CreateBcfRouterCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/CreateBcfRouterCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/CreateBcfRouterCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/CreateBcfRouterInterfaceCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/CreateBcfRouterInterfaceCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/CreateBcfRouterInterfaceCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/CreateBcfRouterInterfaceCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/CreateBcfSegmentCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/CreateBcfSegmentCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/CreateBcfSegmentCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/CreateBcfSegmentCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/CreateBcfStaticNatCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/CreateBcfStaticNatCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/CreateBcfStaticNatCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/CreateBcfStaticNatCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/DeleteBcfAttachmentCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/DeleteBcfAttachmentCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/DeleteBcfAttachmentCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/DeleteBcfAttachmentCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/DeleteBcfSegmentCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/DeleteBcfSegmentCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/DeleteBcfSegmentCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/DeleteBcfSegmentCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/DeleteBcfStaticNatCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/DeleteBcfStaticNatCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/DeleteBcfStaticNatCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/DeleteBcfStaticNatCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/GetControllerDataAnswer.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/GetControllerDataAnswer.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/GetControllerDataAnswer.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/GetControllerDataAnswer.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/GetControllerDataCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/GetControllerDataCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/GetControllerDataCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/GetControllerDataCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/GetControllerHostsAnswer.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/GetControllerHostsAnswer.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/GetControllerHostsAnswer.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/GetControllerHostsAnswer.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/GetControllerHostsCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/GetControllerHostsCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/GetControllerHostsCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/GetControllerHostsCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/StartupBigSwitchBcfCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/StartupBigSwitchBcfCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/StartupBigSwitchBcfCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/StartupBigSwitchBcfCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/SyncBcfTopologyCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/SyncBcfTopologyCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/SyncBcfTopologyCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/SyncBcfTopologyCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/UpdateBcfAttachmentCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/UpdateBcfAttachmentCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/UpdateBcfAttachmentCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/UpdateBcfAttachmentCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/UpdateBcfRouterCommand.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/UpdateBcfRouterCommand.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/agent/api/UpdateBcfRouterCommand.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/UpdateBcfRouterCommand.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/api/commands/AddBigSwitchBcfDeviceCmd.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/AddBigSwitchBcfDeviceCmd.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/api/commands/AddBigSwitchBcfDeviceCmd.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/AddBigSwitchBcfDeviceCmd.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/api/commands/BcfConstants.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/BcfConstants.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/api/commands/BcfConstants.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/BcfConstants.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/api/commands/DeleteBigSwitchBcfDeviceCmd.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/DeleteBigSwitchBcfDeviceCmd.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/api/commands/DeleteBigSwitchBcfDeviceCmd.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/DeleteBigSwitchBcfDeviceCmd.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/api/commands/ListBigSwitchBcfDevicesCmd.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/ListBigSwitchBcfDevicesCmd.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/api/commands/ListBigSwitchBcfDevicesCmd.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/ListBigSwitchBcfDevicesCmd.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/api/response/BigSwitchBcfDeviceResponse.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/api/response/BigSwitchBcfDeviceResponse.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/api/response/BigSwitchBcfDeviceResponse.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/api/response/BigSwitchBcfDeviceResponse.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/BigSwitchBcfDeviceVO.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/BigSwitchBcfDeviceVO.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/BigSwitchBcfDeviceVO.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/BigSwitchBcfDeviceVO.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/AclData.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/AclData.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/AclData.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/AclData.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/AttachmentData.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/AttachmentData.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/AttachmentData.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/AttachmentData.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfApi.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/BigSwitchBcfApi.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfApi.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/BigSwitchBcfApi.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfApiException.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/BigSwitchBcfApiException.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfApiException.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/BigSwitchBcfApiException.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfUtils.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/BigSwitchBcfUtils.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfUtils.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/BigSwitchBcfUtils.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchStatus.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/BigSwitchStatus.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchStatus.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/BigSwitchStatus.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/Capabilities.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/Capabilities.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/Capabilities.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/Capabilities.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/ControlClusterData.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/ControlClusterData.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/ControlClusterData.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/ControlClusterData.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/ControlClusterStatus.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/ControlClusterStatus.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/ControlClusterStatus.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/ControlClusterStatus.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/ControllerData.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/ControllerData.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/ControllerData.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/ControllerData.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/FloatingIpData.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/FloatingIpData.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/FloatingIpData.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/FloatingIpData.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/NetworkData.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/NetworkData.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/NetworkData.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/NetworkData.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/RouterData.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/RouterData.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/RouterData.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/RouterData.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/RouterInterfaceData.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/RouterInterfaceData.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/RouterInterfaceData.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/RouterInterfaceData.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/TopologyData.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/TopologyData.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/TopologyData.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/TopologyData.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/TrustingProtocolSocketFactory.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/TrustingProtocolSocketFactory.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/TrustingProtocolSocketFactory.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/bigswitch/TrustingProtocolSocketFactory.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/dao/BigSwitchBcfDao.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/dao/BigSwitchBcfDao.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/dao/BigSwitchBcfDao.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/dao/BigSwitchBcfDao.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/dao/BigSwitchBcfDaoImpl.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/dao/BigSwitchBcfDaoImpl.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/dao/BigSwitchBcfDaoImpl.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/dao/BigSwitchBcfDaoImpl.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElement.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/element/BigSwitchBcfElement.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElement.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/element/BigSwitchBcfElement.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElementService.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/element/BigSwitchBcfElementService.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElementService.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/element/BigSwitchBcfElementService.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/resource/BigSwitchBcfResource.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/resource/BigSwitchBcfResource.java similarity index 100% rename from plugins/network-elements/bigswitch/src/com/cloud/network/resource/BigSwitchBcfResource.java rename to plugins/network-elements/bigswitch/src/main/java/com/cloud/network/resource/BigSwitchBcfResource.java diff --git a/plugins/network-elements/bigswitch/resources/META-INF/cloudstack/bigswitch/module.properties b/plugins/network-elements/bigswitch/src/main/resources/META-INF/cloudstack/bigswitch/module.properties similarity index 100% rename from plugins/network-elements/bigswitch/resources/META-INF/cloudstack/bigswitch/module.properties rename to plugins/network-elements/bigswitch/src/main/resources/META-INF/cloudstack/bigswitch/module.properties diff --git a/plugins/network-elements/bigswitch/resources/META-INF/cloudstack/bigswitch/spring-bigswitch-context.xml b/plugins/network-elements/bigswitch/src/main/resources/META-INF/cloudstack/bigswitch/spring-bigswitch-context.xml similarity index 100% rename from plugins/network-elements/bigswitch/resources/META-INF/cloudstack/bigswitch/spring-bigswitch-context.xml rename to plugins/network-elements/bigswitch/src/main/resources/META-INF/cloudstack/bigswitch/spring-bigswitch-context.xml diff --git a/plugins/network-elements/bigswitch/test/com/cloud/network/bigswitch/BigSwitchApiTest.java b/plugins/network-elements/bigswitch/src/test/java/com/cloud/network/bigswitch/BigSwitchApiTest.java similarity index 100% rename from plugins/network-elements/bigswitch/test/com/cloud/network/bigswitch/BigSwitchApiTest.java rename to plugins/network-elements/bigswitch/src/test/java/com/cloud/network/bigswitch/BigSwitchApiTest.java diff --git a/plugins/network-elements/bigswitch/test/com/cloud/network/bigswitch/BigSwitchBcfUtilsTest.java b/plugins/network-elements/bigswitch/src/test/java/com/cloud/network/bigswitch/BigSwitchBcfUtilsTest.java similarity index 100% rename from plugins/network-elements/bigswitch/test/com/cloud/network/bigswitch/BigSwitchBcfUtilsTest.java rename to plugins/network-elements/bigswitch/src/test/java/com/cloud/network/bigswitch/BigSwitchBcfUtilsTest.java diff --git a/plugins/network-elements/bigswitch/test/com/cloud/network/resource/BigSwitchBcfResourceTest.java b/plugins/network-elements/bigswitch/src/test/java/com/cloud/network/resource/BigSwitchBcfResourceTest.java similarity index 100% rename from plugins/network-elements/bigswitch/test/com/cloud/network/resource/BigSwitchBcfResourceTest.java rename to plugins/network-elements/bigswitch/src/test/java/com/cloud/network/resource/BigSwitchBcfResourceTest.java diff --git a/plugins/network-elements/brocade-vcs/pom.xml b/plugins/network-elements/brocade-vcs/pom.xml index 84b8426521d9..d1a0473c1823 100644 --- a/plugins/network-elements/brocade-vcs/pom.xml +++ b/plugins/network-elements/brocade-vcs/pom.xml @@ -34,8 +34,8 @@ generate - ${project.basedir}/target/generated-sources/xjc1 - ${project.basedir}/resources + ${project.build.directory}/generated-sources/xjc1 + ${project.build.resources[0].directory} BrocadeInterfaceSchema.xsd @@ -48,8 +48,8 @@ generate - ${project.basedir}/target/generated-sources/xjc2 - ${project.basedir}/resources + ${project.build.directory}/generated-sources/xjc2 + ${project.build.resources[0].directory} BrocadePortProfileSchema.xsd @@ -62,8 +62,8 @@ generate - ${project.basedir}/target/generated-sources/xjc3 - ${project.basedir}/resources + ${project.build.directory}/generated-sources/xjc3 + ${project.build.resources[0].directory} BrocadeShowVcsSchema.xsd diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/AssociateMacToNetworkAnswer.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/AssociateMacToNetworkAnswer.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/AssociateMacToNetworkAnswer.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/AssociateMacToNetworkAnswer.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/AssociateMacToNetworkCommand.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/AssociateMacToNetworkCommand.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/AssociateMacToNetworkCommand.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/AssociateMacToNetworkCommand.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/CreateNetworkAnswer.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/CreateNetworkAnswer.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/CreateNetworkAnswer.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/CreateNetworkAnswer.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/CreateNetworkCommand.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/CreateNetworkCommand.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/CreateNetworkCommand.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/CreateNetworkCommand.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DeleteNetworkAnswer.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/DeleteNetworkAnswer.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DeleteNetworkAnswer.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/DeleteNetworkAnswer.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DeleteNetworkCommand.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/DeleteNetworkCommand.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DeleteNetworkCommand.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/DeleteNetworkCommand.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DisassociateMacFromNetworkAnswer.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/DisassociateMacFromNetworkAnswer.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DisassociateMacFromNetworkAnswer.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/DisassociateMacFromNetworkAnswer.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DisassociateMacFromNetworkCommand.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/DisassociateMacFromNetworkCommand.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DisassociateMacFromNetworkCommand.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/DisassociateMacFromNetworkCommand.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/StartupBrocadeVcsCommand.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/StartupBrocadeVcsCommand.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/StartupBrocadeVcsCommand.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/StartupBrocadeVcsCommand.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/api/commands/AddBrocadeVcsDeviceCmd.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/AddBrocadeVcsDeviceCmd.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/api/commands/AddBrocadeVcsDeviceCmd.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/AddBrocadeVcsDeviceCmd.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/api/commands/DeleteBrocadeVcsDeviceCmd.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/DeleteBrocadeVcsDeviceCmd.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/api/commands/DeleteBrocadeVcsDeviceCmd.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/DeleteBrocadeVcsDeviceCmd.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/api/commands/ListBrocadeVcsDeviceNetworksCmd.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/ListBrocadeVcsDeviceNetworksCmd.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/api/commands/ListBrocadeVcsDeviceNetworksCmd.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/ListBrocadeVcsDeviceNetworksCmd.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/api/commands/ListBrocadeVcsDevicesCmd.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/ListBrocadeVcsDevicesCmd.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/api/commands/ListBrocadeVcsDevicesCmd.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/ListBrocadeVcsDevicesCmd.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/api/response/BrocadeVcsDeviceResponse.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/response/BrocadeVcsDeviceResponse.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/api/response/BrocadeVcsDeviceResponse.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/response/BrocadeVcsDeviceResponse.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/BrocadeVcsDeviceVO.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/BrocadeVcsDeviceVO.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/network/BrocadeVcsDeviceVO.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/BrocadeVcsDeviceVO.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/BrocadeVcsNetworkVlanMappingVO.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/BrocadeVcsNetworkVlanMappingVO.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/network/BrocadeVcsNetworkVlanMappingVO.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/BrocadeVcsNetworkVlanMappingVO.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/brocade/BrocadeVcsApi.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/brocade/BrocadeVcsApi.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/network/brocade/BrocadeVcsApi.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/brocade/BrocadeVcsApi.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/brocade/BrocadeVcsApiException.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/brocade/BrocadeVcsApiException.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/network/brocade/BrocadeVcsApiException.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/brocade/BrocadeVcsApiException.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/brocade/Constants.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/brocade/Constants.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/network/brocade/Constants.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/brocade/Constants.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsDao.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/dao/BrocadeVcsDao.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsDao.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/dao/BrocadeVcsDao.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsDaoImpl.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/dao/BrocadeVcsDaoImpl.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsDaoImpl.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/dao/BrocadeVcsDaoImpl.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDao.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDao.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDao.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDao.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDaoImpl.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDaoImpl.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDaoImpl.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDaoImpl.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/element/BrocadeVcsElement.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/element/BrocadeVcsElement.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/network/element/BrocadeVcsElement.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/element/BrocadeVcsElement.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/element/BrocadeVcsElementService.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/element/BrocadeVcsElementService.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/network/element/BrocadeVcsElementService.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/element/BrocadeVcsElementService.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/resource/BrocadeVcsResource.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/resource/BrocadeVcsResource.java similarity index 100% rename from plugins/network-elements/brocade-vcs/src/com/cloud/network/resource/BrocadeVcsResource.java rename to plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/resource/BrocadeVcsResource.java diff --git a/plugins/network-elements/brocade-vcs/resources/BrocadeInterfaceSchema.xsd b/plugins/network-elements/brocade-vcs/src/main/resources/BrocadeInterfaceSchema.xsd similarity index 100% rename from plugins/network-elements/brocade-vcs/resources/BrocadeInterfaceSchema.xsd rename to plugins/network-elements/brocade-vcs/src/main/resources/BrocadeInterfaceSchema.xsd diff --git a/plugins/network-elements/brocade-vcs/resources/BrocadePortProfileSchema.xsd b/plugins/network-elements/brocade-vcs/src/main/resources/BrocadePortProfileSchema.xsd similarity index 100% rename from plugins/network-elements/brocade-vcs/resources/BrocadePortProfileSchema.xsd rename to plugins/network-elements/brocade-vcs/src/main/resources/BrocadePortProfileSchema.xsd diff --git a/plugins/network-elements/brocade-vcs/resources/BrocadeShowVcsSchema.xsd b/plugins/network-elements/brocade-vcs/src/main/resources/BrocadeShowVcsSchema.xsd similarity index 100% rename from plugins/network-elements/brocade-vcs/resources/BrocadeShowVcsSchema.xsd rename to plugins/network-elements/brocade-vcs/src/main/resources/BrocadeShowVcsSchema.xsd diff --git a/plugins/network-elements/brocade-vcs/resources/META-INF/cloudstack/vcs/module.properties b/plugins/network-elements/brocade-vcs/src/main/resources/META-INF/cloudstack/vcs/module.properties similarity index 100% rename from plugins/network-elements/brocade-vcs/resources/META-INF/cloudstack/vcs/module.properties rename to plugins/network-elements/brocade-vcs/src/main/resources/META-INF/cloudstack/vcs/module.properties diff --git a/plugins/network-elements/brocade-vcs/resources/META-INF/cloudstack/vcs/spring-vcs-context.xml b/plugins/network-elements/brocade-vcs/src/main/resources/META-INF/cloudstack/vcs/spring-vcs-context.xml similarity index 100% rename from plugins/network-elements/brocade-vcs/resources/META-INF/cloudstack/vcs/spring-vcs-context.xml rename to plugins/network-elements/brocade-vcs/src/main/resources/META-INF/cloudstack/vcs/spring-vcs-context.xml diff --git a/plugins/network-elements/brocade-vcs/test/com/cloud/network/brocade/BrocadeVcsApiTest.java b/plugins/network-elements/brocade-vcs/src/test/java/com/cloud/network/brocade/BrocadeVcsApiTest.java similarity index 100% rename from plugins/network-elements/brocade-vcs/test/com/cloud/network/brocade/BrocadeVcsApiTest.java rename to plugins/network-elements/brocade-vcs/src/test/java/com/cloud/network/brocade/BrocadeVcsApiTest.java diff --git a/plugins/network-elements/brocade-vcs/test/com/cloud/network/guru/BrocadeVcsGuestNetworkGuruTest.java b/plugins/network-elements/brocade-vcs/src/test/java/com/cloud/network/guru/BrocadeVcsGuestNetworkGuruTest.java similarity index 100% rename from plugins/network-elements/brocade-vcs/test/com/cloud/network/guru/BrocadeVcsGuestNetworkGuruTest.java rename to plugins/network-elements/brocade-vcs/src/test/java/com/cloud/network/guru/BrocadeVcsGuestNetworkGuruTest.java diff --git a/plugins/network-elements/brocade-vcs/test/com/cloud/network/resource/BrocadeVcsResourceTest.java b/plugins/network-elements/brocade-vcs/src/test/java/com/cloud/network/resource/BrocadeVcsResourceTest.java similarity index 100% rename from plugins/network-elements/brocade-vcs/test/com/cloud/network/resource/BrocadeVcsResourceTest.java rename to plugins/network-elements/brocade-vcs/src/test/java/com/cloud/network/resource/BrocadeVcsResourceTest.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoAsa1000vResourceResponse.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/response/CiscoAsa1000vResourceResponse.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoAsa1000vResourceResponse.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/response/CiscoAsa1000vResourceResponse.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoVnmcResourceResponse.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/response/CiscoVnmcResourceResponse.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoVnmcResourceResponse.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/api/response/CiscoVnmcResourceResponse.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDevice.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoAsa1000vDevice.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDevice.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoAsa1000vDevice.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDeviceVO.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoAsa1000vDeviceVO.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDeviceVO.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoAsa1000vDeviceVO.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnection.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcConnection.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnection.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcConnection.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcController.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcController.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcController.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcController.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcControllerVO.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcControllerVO.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcControllerVO.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcControllerVO.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMap.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/NetworkAsa1000vMap.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMap.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/NetworkAsa1000vMap.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMapVO.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/NetworkAsa1000vMapVO.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMapVO.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/NetworkAsa1000vMapVO.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDao.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/dao/CiscoAsa1000vDao.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDao.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/dao/CiscoAsa1000vDao.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDao.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/dao/CiscoVnmcDao.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDao.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/dao/CiscoVnmcDao.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/dao/CiscoVnmcDaoImpl.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/dao/CiscoVnmcDaoImpl.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDao.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/dao/NetworkAsa1000vMapDao.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDao.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/dao/NetworkAsa1000vMapDao.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoAsa1000vService.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoAsa1000vService.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoAsa1000vService.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoAsa1000vService.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoVnmcElement.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoVnmcElement.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElementService.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoVnmcElementService.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElementService.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoVnmcElementService.java diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/resource/CiscoVnmcResource.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java rename to plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/resource/CiscoVnmcResource.java diff --git a/plugins/network-elements/cisco-vnmc/resources/META-INF/cloudstack/cisco-vnmc/module.properties b/plugins/network-elements/cisco-vnmc/src/main/resources/META-INF/cloudstack/cisco-vnmc/module.properties similarity index 100% rename from plugins/network-elements/cisco-vnmc/resources/META-INF/cloudstack/cisco-vnmc/module.properties rename to plugins/network-elements/cisco-vnmc/src/main/resources/META-INF/cloudstack/cisco-vnmc/module.properties diff --git a/plugins/network-elements/cisco-vnmc/resources/META-INF/cloudstack/cisco-vnmc/spring-cisco-vnmc-context.xml b/plugins/network-elements/cisco-vnmc/src/main/resources/META-INF/cloudstack/cisco-vnmc/spring-cisco-vnmc-context.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/resources/META-INF/cloudstack/cisco-vnmc/spring-cisco-vnmc-context.xml rename to plugins/network-elements/cisco-vnmc/src/main/resources/META-INF/cloudstack/cisco-vnmc/spring-cisco-vnmc-context.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/assoc-asa1000v.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/assoc-asa1000v.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-acl-policy-set.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/associate-acl-policy-set.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-acl-policy-set.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/associate-acl-policy-set.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-policy.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/associate-dhcp-policy.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-policy.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/associate-dhcp-policy.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-server.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/associate-dhcp-server.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-server.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/associate-dhcp-server.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-nat-policy-set.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/associate-nat-policy-set.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-nat-policy-set.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/associate-nat-policy-set.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-route-policy.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/associate-route-policy.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-route-policy.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/associate-route-policy.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-policy-ref.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-policy-ref.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-policy-set.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-policy-set.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-policy.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-policy.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-rule-for-dnat.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-rule-for-dnat.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-rule-for-pf.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-rule-for-pf.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-dhcp-policy.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-dhcp-policy.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-dnat-rule.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-dnat-rule.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-profile.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-device-profile.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-profile.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-device-profile.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route-policy.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-device-route-policy.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route-policy.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-device-route-policy.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-device-route.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-device-route.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-firewall.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-firewall.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-security-profile.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-security-profile.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-egress-acl-rule.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-egress-acl-rule.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-generic-egress-acl-rule.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-generic-egress-acl-rule.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-generic-ingress-acl-rule.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-generic-ingress-acl-rule.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-ingress-acl-rule.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-ingress-acl-rule.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-ip-pool.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-ip-pool.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-nat-policy-ref.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-nat-policy-ref.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-nat-policy-set.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-nat-policy-set.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-nat-policy.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-nat-policy.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-pf-rule.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-pf-rule.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-port-pool.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-port-pool.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-pool.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-pool.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-rule.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-rule.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-tenant.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-tenant.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-tenant.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-tenant.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-vdc.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-vdc.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-vdc.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-vdc.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy-set.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-acl-policy-set.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy-set.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-acl-policy-set.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-acl-policy.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-acl-policy.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-firewall.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-edge-firewall.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-firewall.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-edge-firewall.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-security-profile.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-edge-security-profile.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-security-profile.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-edge-security-profile.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy-set.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-nat-policy-set.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy-set.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-nat-policy-set.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-nat-policy.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-nat-policy.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-rule.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-rule.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-rule.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-rule.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-tenant.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-tenant.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-tenant.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-tenant.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-vdc.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-vdc.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-vdc.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/delete-vdc.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/disassoc-asa1000v.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/disassoc-asa1000v.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/disassoc-asa1000v.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/disassoc-asa1000v.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/list-acl-policies.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/list-acl-policies.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/list-children.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/list-children.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/list-nat-policies.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/list-nat-policies.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/list-policyrefs-in-policyset.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/list-policyrefs-in-policyset.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-tenants.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/list-tenants.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-tenants.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/list-tenants.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/list-unassigned-asa1000v.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/list-unassigned-asa1000v.xml diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/login.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/login.xml similarity index 100% rename from plugins/network-elements/cisco-vnmc/scripts/network/cisco/login.xml rename to plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/login.xml diff --git a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/cisco/CiscoVnmcConnectionTest.java b/plugins/network-elements/cisco-vnmc/src/test/java/com/cloud/network/cisco/CiscoVnmcConnectionTest.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/test/com/cloud/network/cisco/CiscoVnmcConnectionTest.java rename to plugins/network-elements/cisco-vnmc/src/test/java/com/cloud/network/cisco/CiscoVnmcConnectionTest.java diff --git a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/element/CiscoVnmcElementTest.java b/plugins/network-elements/cisco-vnmc/src/test/java/com/cloud/network/element/CiscoVnmcElementTest.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/test/com/cloud/network/element/CiscoVnmcElementTest.java rename to plugins/network-elements/cisco-vnmc/src/test/java/com/cloud/network/element/CiscoVnmcElementTest.java diff --git a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java b/plugins/network-elements/cisco-vnmc/src/test/java/com/cloud/network/resource/CiscoVnmcResourceTest.java similarity index 100% rename from plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java rename to plugins/network-elements/cisco-vnmc/src/test/java/com/cloud/network/resource/CiscoVnmcResourceTest.java diff --git a/plugins/network-elements/dns-notifier/pom.xml b/plugins/network-elements/dns-notifier/pom.xml index e52e5a75f1d1..6d38a1729223 100644 --- a/plugins/network-elements/dns-notifier/pom.xml +++ b/plugins/network-elements/dns-notifier/pom.xml @@ -1,48 +1,46 @@ - - - 4.0.0 - - org.apache.cloudstack - cloudstack-plugins + + + 4.0.0 + + org.apache.cloudstack + cloudstack-plugins 4.12.0.0-SNAPSHOT - ../../pom.xml - - cloud-plugin-example-dns-notifier - Apache CloudStack Plugin - Dns Notifier Example - This is sample source code on how to write a plugin for CloudStack - - install - src - test - - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - + ../../pom.xml + + cloud-plugin-example-dns-notifier + Apache CloudStack Plugin - Dns Notifier Example + This is sample source code on how to write a plugin for CloudStack + + install + + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + diff --git a/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java b/plugins/network-elements/dns-notifier/src/main/java/org/apache/cloudstack/network/element/DnsNotifier.java similarity index 100% rename from plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java rename to plugins/network-elements/dns-notifier/src/main/java/org/apache/cloudstack/network/element/DnsNotifier.java diff --git a/plugins/network-elements/dns-notifier/resources/components-example.xml b/plugins/network-elements/dns-notifier/src/main/resources/components-example.xml similarity index 100% rename from plugins/network-elements/dns-notifier/resources/components-example.xml rename to plugins/network-elements/dns-notifier/src/main/resources/components-example.xml diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/ElasticLbVmMapVO.java b/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/ElasticLbVmMapVO.java similarity index 100% rename from plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/ElasticLbVmMapVO.java rename to plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/ElasticLbVmMapVO.java diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java b/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/element/ElasticLoadBalancerElement.java similarity index 100% rename from plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java rename to plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/element/ElasticLoadBalancerElement.java diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java b/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/ElasticLoadBalancerManager.java similarity index 100% rename from plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java rename to plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/ElasticLoadBalancerManager.java diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java similarity index 100% rename from plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java rename to plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/LoadBalanceRuleHandler.java b/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/LoadBalanceRuleHandler.java similarity index 100% rename from plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/LoadBalanceRuleHandler.java rename to plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/LoadBalanceRuleHandler.java diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDao.java b/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/dao/ElasticLbVmMapDao.java similarity index 100% rename from plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDao.java rename to plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/dao/ElasticLbVmMapDao.java diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java b/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java similarity index 100% rename from plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java rename to plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java diff --git a/plugins/network-elements/elastic-loadbalancer/resources/META-INF/cloudstack/elb/module.properties b/plugins/network-elements/elastic-loadbalancer/src/main/resources/META-INF/cloudstack/elb/module.properties similarity index 100% rename from plugins/network-elements/elastic-loadbalancer/resources/META-INF/cloudstack/elb/module.properties rename to plugins/network-elements/elastic-loadbalancer/src/main/resources/META-INF/cloudstack/elb/module.properties diff --git a/plugins/network-elements/elastic-loadbalancer/resources/META-INF/cloudstack/elb/spring-elb-context.xml b/plugins/network-elements/elastic-loadbalancer/src/main/resources/META-INF/cloudstack/elb/spring-elb-context.xml similarity index 100% rename from plugins/network-elements/elastic-loadbalancer/resources/META-INF/cloudstack/elb/spring-elb-context.xml rename to plugins/network-elements/elastic-loadbalancer/src/main/resources/META-INF/cloudstack/elb/spring-elb-context.xml diff --git a/plugins/network-elements/elastic-loadbalancer/test/com/cloud/network/lb/ElasticLoadBalancerManagerImplTest.java b/plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/ElasticLoadBalancerManagerImplTest.java similarity index 100% rename from plugins/network-elements/elastic-loadbalancer/test/com/cloud/network/lb/ElasticLoadBalancerManagerImplTest.java rename to plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/ElasticLoadBalancerManagerImplTest.java diff --git a/plugins/network-elements/elastic-loadbalancer/test/com/cloud/network/lb/LoadBalanceRuleHandlerTest.java b/plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/LoadBalanceRuleHandlerTest.java similarity index 100% rename from plugins/network-elements/elastic-loadbalancer/test/com/cloud/network/lb/LoadBalanceRuleHandlerTest.java rename to plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/LoadBalanceRuleHandlerTest.java diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java b/plugins/network-elements/f5/src/main/java/com/cloud/api/commands/AddExternalLoadBalancerCmd.java similarity index 100% rename from plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java rename to plugins/network-elements/f5/src/main/java/com/cloud/api/commands/AddExternalLoadBalancerCmd.java diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java b/plugins/network-elements/f5/src/main/java/com/cloud/api/commands/AddF5LoadBalancerCmd.java similarity index 100% rename from plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java rename to plugins/network-elements/f5/src/main/java/com/cloud/api/commands/AddF5LoadBalancerCmd.java diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java b/plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java similarity index 100% rename from plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java rename to plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java b/plugins/network-elements/f5/src/main/java/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java similarity index 100% rename from plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java rename to plugins/network-elements/f5/src/main/java/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java b/plugins/network-elements/f5/src/main/java/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java similarity index 100% rename from plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java rename to plugins/network-elements/f5/src/main/java/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java b/plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListExternalLoadBalancersCmd.java similarity index 100% rename from plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java rename to plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListExternalLoadBalancersCmd.java diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java b/plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java similarity index 100% rename from plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java rename to plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java b/plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListF5LoadBalancersCmd.java similarity index 100% rename from plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java rename to plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListF5LoadBalancersCmd.java diff --git a/plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java b/plugins/network-elements/f5/src/main/java/com/cloud/api/response/F5LoadBalancerResponse.java similarity index 100% rename from plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java rename to plugins/network-elements/f5/src/main/java/com/cloud/api/response/F5LoadBalancerResponse.java diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java b/plugins/network-elements/f5/src/main/java/com/cloud/network/element/F5ExternalLoadBalancerElement.java similarity index 100% rename from plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java rename to plugins/network-elements/f5/src/main/java/com/cloud/network/element/F5ExternalLoadBalancerElement.java diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java b/plugins/network-elements/f5/src/main/java/com/cloud/network/element/F5ExternalLoadBalancerElementService.java similarity index 100% rename from plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java rename to plugins/network-elements/f5/src/main/java/com/cloud/network/element/F5ExternalLoadBalancerElementService.java diff --git a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java b/plugins/network-elements/f5/src/main/java/com/cloud/network/resource/F5BigIpResource.java similarity index 100% rename from plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java rename to plugins/network-elements/f5/src/main/java/com/cloud/network/resource/F5BigIpResource.java diff --git a/plugins/network-elements/f5/resources/META-INF/cloudstack/f5/module.properties b/plugins/network-elements/f5/src/main/resources/META-INF/cloudstack/f5/module.properties similarity index 100% rename from plugins/network-elements/f5/resources/META-INF/cloudstack/f5/module.properties rename to plugins/network-elements/f5/src/main/resources/META-INF/cloudstack/f5/module.properties diff --git a/plugins/network-elements/f5/resources/META-INF/cloudstack/f5/spring-f5-context.xml b/plugins/network-elements/f5/src/main/resources/META-INF/cloudstack/f5/spring-f5-context.xml similarity index 100% rename from plugins/network-elements/f5/resources/META-INF/cloudstack/f5/spring-f5-context.xml rename to plugins/network-elements/f5/src/main/resources/META-INF/cloudstack/f5/spring-f5-context.xml diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/api/AddGloboDnsHostCmd.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/api/AddGloboDnsHostCmd.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/api/AddGloboDnsHostCmd.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/api/AddGloboDnsHostCmd.java diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/CreateOrUpdateDomainCommand.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/commands/CreateOrUpdateDomainCommand.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/CreateOrUpdateDomainCommand.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/commands/CreateOrUpdateDomainCommand.java diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/CreateOrUpdateRecordAndReverseCommand.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/commands/CreateOrUpdateRecordAndReverseCommand.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/CreateOrUpdateRecordAndReverseCommand.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/commands/CreateOrUpdateRecordAndReverseCommand.java diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/RemoveDomainCommand.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/commands/RemoveDomainCommand.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/RemoveDomainCommand.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/commands/RemoveDomainCommand.java diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/RemoveRecordCommand.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/commands/RemoveRecordCommand.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/RemoveRecordCommand.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/commands/RemoveRecordCommand.java diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/SignInCommand.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/commands/SignInCommand.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/SignInCommand.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/commands/SignInCommand.java diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/element/GloboDnsElement.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/element/GloboDnsElement.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/element/GloboDnsElement.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/element/GloboDnsElement.java diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/element/GloboDnsElementService.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/element/GloboDnsElementService.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/element/GloboDnsElementService.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/element/GloboDnsElementService.java diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/resource/GloboDnsResource.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/resource/GloboDnsResource.java diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/response/GloboDnsDomainListResponse.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/response/GloboDnsDomainListResponse.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/response/GloboDnsDomainListResponse.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/response/GloboDnsDomainListResponse.java diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/response/GloboDnsDomainResponse.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/response/GloboDnsDomainResponse.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/response/GloboDnsDomainResponse.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/response/GloboDnsDomainResponse.java diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/response/GloboDnsExportResponse.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/response/GloboDnsExportResponse.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/response/GloboDnsExportResponse.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/response/GloboDnsExportResponse.java diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/response/GloboDnsRecordListResponse.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/response/GloboDnsRecordListResponse.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/response/GloboDnsRecordListResponse.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/response/GloboDnsRecordListResponse.java diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/response/GloboDnsRecordResponse.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/response/GloboDnsRecordResponse.java similarity index 100% rename from plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/response/GloboDnsRecordResponse.java rename to plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/response/GloboDnsRecordResponse.java diff --git a/plugins/network-elements/globodns/resources/META-INF/cloudstack/globodns/module.properties b/plugins/network-elements/globodns/src/main/resources/META-INF/cloudstack/globodns/module.properties similarity index 100% rename from plugins/network-elements/globodns/resources/META-INF/cloudstack/globodns/module.properties rename to plugins/network-elements/globodns/src/main/resources/META-INF/cloudstack/globodns/module.properties diff --git a/plugins/network-elements/globodns/resources/META-INF/cloudstack/globodns/spring-globodns-context.xml b/plugins/network-elements/globodns/src/main/resources/META-INF/cloudstack/globodns/spring-globodns-context.xml similarity index 100% rename from plugins/network-elements/globodns/resources/META-INF/cloudstack/globodns/spring-globodns-context.xml rename to plugins/network-elements/globodns/src/main/resources/META-INF/cloudstack/globodns/spring-globodns-context.xml diff --git a/plugins/network-elements/globodns/test/com/globo/globodns/cloudstack/element/GloboDnsElementTest.java b/plugins/network-elements/globodns/src/test/java/com/globo/globodns/cloudstack/element/GloboDnsElementTest.java similarity index 100% rename from plugins/network-elements/globodns/test/com/globo/globodns/cloudstack/element/GloboDnsElementTest.java rename to plugins/network-elements/globodns/src/test/java/com/globo/globodns/cloudstack/element/GloboDnsElementTest.java diff --git a/plugins/network-elements/globodns/test/com/globo/globodns/cloudstack/resource/GloboDnsResourceTest.java b/plugins/network-elements/globodns/src/test/java/com/globo/globodns/cloudstack/resource/GloboDnsResourceTest.java similarity index 100% rename from plugins/network-elements/globodns/test/com/globo/globodns/cloudstack/resource/GloboDnsResourceTest.java rename to plugins/network-elements/globodns/src/test/java/com/globo/globodns/cloudstack/resource/GloboDnsResourceTest.java diff --git a/plugins/network-elements/globodns/test/resources/db.properties b/plugins/network-elements/globodns/src/test/resources/db.properties similarity index 100% rename from plugins/network-elements/globodns/test/resources/db.properties rename to plugins/network-elements/globodns/src/test/resources/db.properties diff --git a/plugins/network-elements/globodns/test/resources/log4j.properties b/plugins/network-elements/globodns/src/test/resources/log4j.properties similarity index 100% rename from plugins/network-elements/globodns/test/resources/log4j.properties rename to plugins/network-elements/globodns/src/test/resources/log4j.properties diff --git a/plugins/network-elements/internal-loadbalancer/pom.xml b/plugins/network-elements/internal-loadbalancer/pom.xml index b56b97c23580..fd99f67cb515 100644 --- a/plugins/network-elements/internal-loadbalancer/pom.xml +++ b/plugins/network-elements/internal-loadbalancer/pom.xml @@ -26,25 +26,4 @@ 4.12.0.0-SNAPSHOT ../../pom.xml - - install - src - test - - - resources - - **/*.xml - - - - - - test/resources - - %regex[.*[0-9]*To[0-9]*.*Test.*] - - - - diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java b/plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java similarity index 100% rename from plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java rename to plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java b/plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java similarity index 100% rename from plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java rename to plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java b/plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java similarity index 100% rename from plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java rename to plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java diff --git a/plugins/network-elements/internal-loadbalancer/resources/META-INF/cloudstack/core/spring-internallb-core-context.xml b/plugins/network-elements/internal-loadbalancer/src/main/resources/META-INF/cloudstack/core/spring-internallb-core-context.xml similarity index 100% rename from plugins/network-elements/internal-loadbalancer/resources/META-INF/cloudstack/core/spring-internallb-core-context.xml rename to plugins/network-elements/internal-loadbalancer/src/main/resources/META-INF/cloudstack/core/spring-internallb-core-context.xml diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java similarity index 100% rename from plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java rename to plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java similarity index 100% rename from plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java rename to plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementTest.java b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbelement/InternalLbElementTest.java similarity index 100% rename from plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementTest.java rename to plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbelement/InternalLbElementTest.java diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java similarity index 100% rename from plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java rename to plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java similarity index 100% rename from plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java rename to plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java similarity index 100% rename from plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java rename to plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java diff --git a/plugins/network-elements/internal-loadbalancer/test/resources/lb_element.xml b/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_element.xml similarity index 100% rename from plugins/network-elements/internal-loadbalancer/test/resources/lb_element.xml rename to plugins/network-elements/internal-loadbalancer/src/test/resources/lb_element.xml diff --git a/plugins/network-elements/internal-loadbalancer/test/resources/lb_mgr.xml b/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_mgr.xml similarity index 100% rename from plugins/network-elements/internal-loadbalancer/test/resources/lb_mgr.xml rename to plugins/network-elements/internal-loadbalancer/src/test/resources/lb_mgr.xml diff --git a/plugins/network-elements/internal-loadbalancer/test/resources/lb_svc.xml b/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_svc.xml similarity index 100% rename from plugins/network-elements/internal-loadbalancer/test/resources/lb_svc.xml rename to plugins/network-elements/internal-loadbalancer/src/test/resources/lb_svc.xml diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml index 7d53aa5d8901..ec8a3ee9eae4 100644 --- a/plugins/network-elements/juniper-contrail/pom.xml +++ b/plugins/network-elements/juniper-contrail/pom.xml @@ -130,14 +130,6 @@ - install - src - test - - - test/resources - - org.apache.maven.plugins @@ -145,10 +137,10 @@ always -Xmx1024m - - **/NetworkProviderTest.java - **/PublicNetworkTest.java - + + **/NetworkProviderTest.java + **/PublicNetworkTest.java + diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElement.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailElement.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElement.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailElement.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailGuru.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailGuru.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManager.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailManager.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManager.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailManager.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailVpcElementImpl.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailVpcElementImpl.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailVpcElementImpl.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailVpcElementImpl.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/DBSyncGeneric.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/DBSyncGeneric.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/DBSyncGeneric.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/DBSyncGeneric.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/EventUtils.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/EventUtils.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ManagementNetworkGuru.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ManagementNetworkGuru.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ManagementNetworkGuru.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ManagementNetworkGuru.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ModelDatabase.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ModelDatabase.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSync.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServerDBSync.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSync.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServerDBSync.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSyncImpl.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServerDBSyncImpl.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSyncImpl.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServerDBSyncImpl.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerEventHandler.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServerEventHandler.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerEventHandler.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServerEventHandler.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerEventHandlerImpl.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServerEventHandlerImpl.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerEventHandlerImpl.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServerEventHandlerImpl.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManager.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServiceManager.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManager.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServiceManager.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceVirtualMachine.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServiceVirtualMachine.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceVirtualMachine.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServiceVirtualMachine.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpModel.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/FloatingIpModel.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpModel.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/FloatingIpModel.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpPoolModel.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/FloatingIpPoolModel.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpPoolModel.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/FloatingIpPoolModel.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/InstanceIpModel.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/InstanceIpModel.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/InstanceIpModel.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/InstanceIpModel.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelController.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/ModelController.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelController.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/ModelController.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObject.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/ModelObject.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObject.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/ModelObject.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObjectBase.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/ModelObjectBase.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObjectBase.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/ModelObjectBase.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/NetworkPolicyModel.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/NetworkPolicyModel.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/NetworkPolicyModel.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/NetworkPolicyModel.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ServiceInstanceModel.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/ServiceInstanceModel.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ServiceInstanceModel.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/ServiceInstanceModel.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualNetworkModel.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VirtualNetworkModel.java similarity index 100% rename from plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualNetworkModel.java rename to plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VirtualNetworkModel.java diff --git a/plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/contrail/module.properties b/plugins/network-elements/juniper-contrail/src/main/resources/META-INF/cloudstack/contrail/module.properties similarity index 100% rename from plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/contrail/module.properties rename to plugins/network-elements/juniper-contrail/src/main/resources/META-INF/cloudstack/contrail/module.properties diff --git a/plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/contrail/spring-contrail-context.xml b/plugins/network-elements/juniper-contrail/src/main/resources/META-INF/cloudstack/contrail/spring-contrail-context.xml similarity index 100% rename from plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/contrail/spring-contrail-context.xml rename to plugins/network-elements/juniper-contrail/src/main/resources/META-INF/cloudstack/contrail/spring-contrail-context.xml diff --git a/plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/system/spring-contrail-system-context-inheritable.xml b/plugins/network-elements/juniper-contrail/src/main/resources/META-INF/cloudstack/system/spring-contrail-system-context-inheritable.xml similarity index 100% rename from plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/system/spring-contrail-system-context-inheritable.xml rename to plugins/network-elements/juniper-contrail/src/main/resources/META-INF/cloudstack/system/spring-contrail-system-context-inheritable.xml diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ApiConnectorMockito.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ApiConnectorMockito.java similarity index 100% rename from plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ApiConnectorMockito.java rename to plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ApiConnectorMockito.java diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java similarity index 100% rename from plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java rename to plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java similarity index 100% rename from plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java rename to plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java similarity index 100% rename from plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java rename to plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java similarity index 100% rename from plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java rename to plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java similarity index 100% rename from plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java rename to plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java similarity index 100% rename from plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java rename to plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java similarity index 100% rename from plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java rename to plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/TestDbSetup.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/TestDbSetup.java similarity index 100% rename from plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/TestDbSetup.java rename to plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/TestDbSetup.java diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/model/InstanceIpModelTest.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/InstanceIpModelTest.java similarity index 100% rename from plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/model/InstanceIpModelTest.java rename to plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/InstanceIpModelTest.java diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/model/VMInterfaceModelTest.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VMInterfaceModelTest.java similarity index 100% rename from plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/model/VMInterfaceModelTest.java rename to plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VMInterfaceModelTest.java diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/model/VirtualMachineModelTest.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModelTest.java similarity index 100% rename from plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/model/VirtualMachineModelTest.java rename to plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModelTest.java diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/model/VirtualNetworkModelTest.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualNetworkModelTest.java similarity index 100% rename from plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/model/VirtualNetworkModelTest.java rename to plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualNetworkModelTest.java diff --git a/plugins/network-elements/juniper-contrail/test/resources/commonContext.xml b/plugins/network-elements/juniper-contrail/src/test/resources/commonContext.xml similarity index 100% rename from plugins/network-elements/juniper-contrail/test/resources/commonContext.xml rename to plugins/network-elements/juniper-contrail/src/test/resources/commonContext.xml diff --git a/plugins/network-elements/juniper-contrail/test/resources/contrail.properties b/plugins/network-elements/juniper-contrail/src/test/resources/contrail.properties similarity index 100% rename from plugins/network-elements/juniper-contrail/test/resources/contrail.properties rename to plugins/network-elements/juniper-contrail/src/test/resources/contrail.properties diff --git a/plugins/network-elements/juniper-contrail/test/resources/db.properties b/plugins/network-elements/juniper-contrail/src/test/resources/db.properties similarity index 100% rename from plugins/network-elements/juniper-contrail/test/resources/db.properties rename to plugins/network-elements/juniper-contrail/src/test/resources/db.properties diff --git a/plugins/network-elements/juniper-contrail/test/resources/log4j.properties b/plugins/network-elements/juniper-contrail/src/test/resources/log4j.properties similarity index 100% rename from plugins/network-elements/juniper-contrail/test/resources/log4j.properties rename to plugins/network-elements/juniper-contrail/src/test/resources/log4j.properties diff --git a/plugins/network-elements/juniper-contrail/test/resources/mysql_db_start.sh b/plugins/network-elements/juniper-contrail/src/test/resources/mysql_db_start.sh similarity index 100% rename from plugins/network-elements/juniper-contrail/test/resources/mysql_db_start.sh rename to plugins/network-elements/juniper-contrail/src/test/resources/mysql_db_start.sh diff --git a/plugins/network-elements/juniper-contrail/test/resources/mysql_db_stop.sh b/plugins/network-elements/juniper-contrail/src/test/resources/mysql_db_stop.sh similarity index 100% rename from plugins/network-elements/juniper-contrail/test/resources/mysql_db_stop.sh rename to plugins/network-elements/juniper-contrail/src/test/resources/mysql_db_stop.sh diff --git a/plugins/network-elements/juniper-contrail/test/resources/providerContext.xml b/plugins/network-elements/juniper-contrail/src/test/resources/providerContext.xml similarity index 100% rename from plugins/network-elements/juniper-contrail/test/resources/providerContext.xml rename to plugins/network-elements/juniper-contrail/src/test/resources/providerContext.xml diff --git a/plugins/network-elements/juniper-contrail/test/resources/publicNetworkContext.xml b/plugins/network-elements/juniper-contrail/src/test/resources/publicNetworkContext.xml similarity index 100% rename from plugins/network-elements/juniper-contrail/test/resources/publicNetworkContext.xml rename to plugins/network-elements/juniper-contrail/src/test/resources/publicNetworkContext.xml diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddExternalFirewallCmd.java similarity index 100% rename from plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java rename to plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddExternalFirewallCmd.java diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddSrxFirewallCmd.java similarity index 100% rename from plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java rename to plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddSrxFirewallCmd.java diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ConfigureSrxFirewallCmd.java similarity index 100% rename from plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java rename to plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ConfigureSrxFirewallCmd.java diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteExternalFirewallCmd.java similarity index 100% rename from plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java rename to plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteExternalFirewallCmd.java diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteSrxFirewallCmd.java similarity index 100% rename from plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java rename to plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteSrxFirewallCmd.java diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListExternalFirewallsCmd.java similarity index 100% rename from plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java rename to plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListExternalFirewallsCmd.java diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java similarity index 100% rename from plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java rename to plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallsCmd.java similarity index 100% rename from plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java rename to plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallsCmd.java diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/response/SrxFirewallResponse.java similarity index 100% rename from plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java rename to plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/response/SrxFirewallResponse.java diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/element/JuniperSRXExternalFirewallElement.java similarity index 100% rename from plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java rename to plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/element/JuniperSRXExternalFirewallElement.java diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/element/JuniperSRXFirewallElementService.java similarity index 100% rename from plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java rename to plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/element/JuniperSRXFirewallElementService.java diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/resource/JuniperSrxResource.java similarity index 100% rename from plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java rename to plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/resource/JuniperSrxResource.java diff --git a/plugins/network-elements/juniper-srx/resources/META-INF/cloudstack/srx/module.properties b/plugins/network-elements/juniper-srx/src/main/resources/META-INF/cloudstack/srx/module.properties similarity index 100% rename from plugins/network-elements/juniper-srx/resources/META-INF/cloudstack/srx/module.properties rename to plugins/network-elements/juniper-srx/src/main/resources/META-INF/cloudstack/srx/module.properties diff --git a/plugins/network-elements/juniper-srx/resources/META-INF/cloudstack/srx/spring-srx-context.xml b/plugins/network-elements/juniper-srx/src/main/resources/META-INF/cloudstack/srx/spring-srx-context.xml similarity index 100% rename from plugins/network-elements/juniper-srx/resources/META-INF/cloudstack/srx/spring-srx-context.xml rename to plugins/network-elements/juniper-srx/src/main/resources/META-INF/cloudstack/srx/spring-srx-context.xml diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerControlCenterCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/DeleteNetscalerControlCenterCmd.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerControlCenterCmd.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/DeleteNetscalerControlCenterCmd.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteServicePackageOfferingCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/DeleteServicePackageOfferingCmd.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteServicePackageOfferingCmd.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/DeleteServicePackageOfferingCmd.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeployNetscalerVpxCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/DeployNetscalerVpxCmd.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/commands/DeployNetscalerVpxCmd.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/DeployNetscalerVpxCmd.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerControlCenterCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ListNetscalerControlCenterCmd.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerControlCenterCmd.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ListNetscalerControlCenterCmd.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListRegisteredServicePackageCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ListRegisteredServicePackageCmd.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/commands/ListRegisteredServicePackageCmd.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ListRegisteredServicePackageCmd.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/RegisterNetscalerControlCenterCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/RegisterNetscalerControlCenterCmd.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/commands/RegisterNetscalerControlCenterCmd.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/RegisterNetscalerControlCenterCmd.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/RegisterServicePackageCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/RegisterServicePackageCmd.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/commands/RegisterServicePackageCmd.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/RegisterServicePackageCmd.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/StopNetScalerVMCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/StopNetScalerVMCmd.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/commands/StopNetScalerVMCmd.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/StopNetScalerVMCmd.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/response/NetScalerServicePackageResponse.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/response/NetScalerServicePackageResponse.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/response/NetScalerServicePackageResponse.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/response/NetScalerServicePackageResponse.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerControlCenterResponse.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/response/NetscalerControlCenterResponse.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerControlCenterResponse.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/response/NetscalerControlCenterResponse.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/response/NetscalerLoadBalancerResponse.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/api/response/NetscalerLoadBalancerResponse.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerControlCenterVO.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/NetScalerControlCenterVO.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/NetScalerControlCenterVO.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/NetScalerControlCenterVO.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/NetScalerPodVO.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/NetScalerPodVO.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerServicePackageVO.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/NetScalerServicePackageVO.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/NetScalerServicePackageVO.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/NetScalerServicePackageVO.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerControlCenterDao.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/dao/NetScalerControlCenterDao.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerControlCenterDao.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/dao/NetScalerControlCenterDao.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerControlCenterDaoImpl.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/dao/NetScalerControlCenterDaoImpl.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerControlCenterDaoImpl.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/dao/NetScalerControlCenterDaoImpl.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDao.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/dao/NetScalerPodDao.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDao.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/dao/NetScalerPodDao.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/dao/NetScalerPodDaoImpl.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/dao/NetScalerPodDaoImpl.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerServicePackageDao.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/dao/NetScalerServicePackageDao.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerServicePackageDao.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/dao/NetScalerServicePackageDao.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerServicePackageDaoImpl.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/dao/NetScalerServicePackageDaoImpl.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerServicePackageDaoImpl.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/dao/NetScalerServicePackageDaoImpl.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/element/NetscalerElement.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/element/NetscalerElement.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/element/NetscalerLoadBalancerElementService.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/element/NetscalerLoadBalancerElementService.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetScalerControlCenterResource.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetScalerControlCenterResource.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/resource/NetScalerControlCenterResource.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetScalerControlCenterResource.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetscalerResource.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetscalerResource.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/vm/NetScalerVMManager.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/vm/NetScalerVMManager.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/vm/NetScalerVMManager.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/vm/NetScalerVMManager.java diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/vm/NetScalerVMManagerImpl.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/vm/NetScalerVMManagerImpl.java similarity index 100% rename from plugins/network-elements/netscaler/src/com/cloud/network/vm/NetScalerVMManagerImpl.java rename to plugins/network-elements/netscaler/src/main/java/com/cloud/network/vm/NetScalerVMManagerImpl.java diff --git a/plugins/network-elements/netscaler/resources/META-INF/cloudstack/netscaler/module.properties b/plugins/network-elements/netscaler/src/main/resources/META-INF/cloudstack/netscaler/module.properties similarity index 100% rename from plugins/network-elements/netscaler/resources/META-INF/cloudstack/netscaler/module.properties rename to plugins/network-elements/netscaler/src/main/resources/META-INF/cloudstack/netscaler/module.properties diff --git a/plugins/network-elements/netscaler/resources/META-INF/cloudstack/netscaler/spring-netscaler-context.xml b/plugins/network-elements/netscaler/src/main/resources/META-INF/cloudstack/netscaler/spring-netscaler-context.xml similarity index 100% rename from plugins/network-elements/netscaler/resources/META-INF/cloudstack/netscaler/spring-netscaler-context.xml rename to plugins/network-elements/netscaler/src/main/resources/META-INF/cloudstack/netscaler/spring-netscaler-context.xml diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml index 400a8546266e..8d50cf79e939 100644 --- a/plugins/network-elements/nicira-nvp/pom.xml +++ b/plugins/network-elements/nicira-nvp/pom.xml @@ -41,21 +41,6 @@ - src/main/java - src/test/java - target/classes - target/test-classes - - - src/main/resources - - - - - src/test/resources - true - - com.mycila diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/CmdBuilder.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/CmdBuilder.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/CmdBuilder.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/CmdBuilder.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/PingNuageVspCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/PingNuageVspCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/PingNuageVspCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/PingNuageVspCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/StartupVspCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/StartupVspCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/StartupVspCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/StartupVspCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ApplyAclRuleVspCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/element/ApplyAclRuleVspCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ApplyAclRuleVspCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/element/ApplyAclRuleVspCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ApplyStaticNatVspCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/element/ApplyStaticNatVspCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ApplyStaticNatVspCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/element/ApplyStaticNatVspCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ExtraDhcpOptionsVspCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/element/ExtraDhcpOptionsVspCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ExtraDhcpOptionsVspCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/element/ExtraDhcpOptionsVspCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ImplementVspCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/element/ImplementVspCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ImplementVspCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/element/ImplementVspCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ShutDownVpcVspCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/element/ShutDownVpcVspCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ShutDownVpcVspCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/element/ShutDownVpcVspCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ShutDownVspCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/element/ShutDownVspCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ShutDownVspCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/element/ShutDownVspCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/DeallocateVmVspCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/guru/DeallocateVmVspCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/DeallocateVmVspCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/guru/DeallocateVmVspCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ImplementNetworkVspCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/guru/ImplementNetworkVspCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ImplementNetworkVspCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/guru/ImplementNetworkVspCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ReserveVmInterfaceVspCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/guru/ReserveVmInterfaceVspCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ReserveVmInterfaceVspCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/guru/ReserveVmInterfaceVspCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/TrashNetworkVspCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/guru/TrashNetworkVspCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/TrashNetworkVspCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/guru/TrashNetworkVspCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/UpdateDhcpOptionVspCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/guru/UpdateDhcpOptionVspCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/UpdateDhcpOptionVspCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/guru/UpdateDhcpOptionVspCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/CleanUpDomainCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/CleanUpDomainCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/CleanUpDomainCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/CleanUpDomainCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/EntityExistsCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/EntityExistsCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/EntityExistsCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/EntityExistsCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/GetApiDefaultsAnswer.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/GetApiDefaultsAnswer.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/GetApiDefaultsAnswer.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/GetApiDefaultsAnswer.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/GetApiDefaultsCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/GetApiDefaultsCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/GetApiDefaultsCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/GetApiDefaultsCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/ImplementNetworkVspAnswer.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/ImplementNetworkVspAnswer.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/ImplementNetworkVspAnswer.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/ImplementNetworkVspAnswer.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/ListVspDomainTemplatesAnswer.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/ListVspDomainTemplatesAnswer.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/ListVspDomainTemplatesAnswer.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/ListVspDomainTemplatesAnswer.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/ListVspDomainTemplatesCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/ListVspDomainTemplatesCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/ListVspDomainTemplatesCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/ListVspDomainTemplatesCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/SupportedApiVersionCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/SupportedApiVersionCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/SupportedApiVersionCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/SupportedApiVersionCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/UpdateNuageVspDeviceCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/UpdateNuageVspDeviceCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/UpdateNuageVspDeviceCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/manager/UpdateNuageVspDeviceCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/sync/SyncDomainAnswer.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/sync/SyncDomainAnswer.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/sync/SyncDomainAnswer.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/sync/SyncDomainAnswer.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/sync/SyncDomainCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/sync/SyncDomainCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/sync/SyncDomainCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/sync/SyncDomainCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/sync/SyncNuageVspCmsIdAnswer.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/sync/SyncNuageVspCmsIdAnswer.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/sync/SyncNuageVspCmsIdAnswer.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/sync/SyncNuageVspCmsIdAnswer.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/sync/SyncNuageVspCmsIdCommand.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/sync/SyncNuageVspCmsIdCommand.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/sync/SyncNuageVspCmsIdCommand.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/agent/api/sync/SyncNuageVspCmsIdCommand.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/AddNuageVspDeviceCmd.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/AddNuageVspDeviceCmd.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/AddNuageVspDeviceCmd.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/AddNuageVspDeviceCmd.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/AssociateNuageVspDomainTemplateCmd.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/AssociateNuageVspDomainTemplateCmd.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/AssociateNuageVspDomainTemplateCmd.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/AssociateNuageVspDomainTemplateCmd.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/DeleteNuageVspDeviceCmd.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/DeleteNuageVspDeviceCmd.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/DeleteNuageVspDeviceCmd.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/DeleteNuageVspDeviceCmd.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/DisableNuageUnderlayVlanIpRangeCmd.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/DisableNuageUnderlayVlanIpRangeCmd.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/DisableNuageUnderlayVlanIpRangeCmd.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/DisableNuageUnderlayVlanIpRangeCmd.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/EnableNuageUnderlayVlanIpRangeCmd.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/EnableNuageUnderlayVlanIpRangeCmd.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/EnableNuageUnderlayVlanIpRangeCmd.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/EnableNuageUnderlayVlanIpRangeCmd.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/ListNuageUnderlayVlanIpRangesCmd.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/ListNuageUnderlayVlanIpRangesCmd.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/ListNuageUnderlayVlanIpRangesCmd.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/ListNuageUnderlayVlanIpRangesCmd.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/ListNuageVspDevicesCmd.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/ListNuageVspDevicesCmd.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/ListNuageVspDevicesCmd.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/ListNuageVspDevicesCmd.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/ListNuageVspDomainTemplatesCmd.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/ListNuageVspDomainTemplatesCmd.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/ListNuageVspDomainTemplatesCmd.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/ListNuageVspDomainTemplatesCmd.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/ListNuageVspGlobalDomainTemplateCmd.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/ListNuageVspGlobalDomainTemplateCmd.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/ListNuageVspGlobalDomainTemplateCmd.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/ListNuageVspGlobalDomainTemplateCmd.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/UpdateNuageVspDeviceCmd.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/UpdateNuageVspDeviceCmd.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/UpdateNuageVspDeviceCmd.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/UpdateNuageVspDeviceCmd.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/VspConstants.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/VspConstants.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/commands/VspConstants.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/commands/VspConstants.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/response/NuageVlanIpRangeResponse.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/response/NuageVlanIpRangeResponse.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/response/NuageVlanIpRangeResponse.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/response/NuageVlanIpRangeResponse.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/response/NuageVspDeviceResponse.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/response/NuageVspDeviceResponse.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/response/NuageVspDeviceResponse.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/response/NuageVspDeviceResponse.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/response/NuageVspDomainTemplateResponse.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/response/NuageVspDomainTemplateResponse.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/response/NuageVspDomainTemplateResponse.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/response/NuageVspDomainTemplateResponse.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/api/response/NuageVspResourceResponse.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/response/NuageVspResourceResponse.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/api/response/NuageVspResourceResponse.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/api/response/NuageVspResourceResponse.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/NuageVspDeviceVO.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/NuageVspDeviceVO.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/NuageVspDeviceVO.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/NuageVspDeviceVO.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/dao/NuageVspDao.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/dao/NuageVspDao.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/dao/NuageVspDao.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/dao/NuageVspDao.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/dao/NuageVspDaoImpl.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/dao/NuageVspDaoImpl.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/dao/NuageVspDaoImpl.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/dao/NuageVspDaoImpl.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/element/NuageVspElement.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/element/NuageVspElement.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/guru/NuageVspGuestNetworkGuru.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/guru/NuageVspGuestNetworkGuru.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/AbstractListener.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/manager/AbstractListener.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/AbstractListener.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/manager/AbstractListener.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManager.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/manager/NuageVspManager.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManager.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/manager/NuageVspManager.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/manager/NuageVspManagerImpl.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/manager/NuageVspManagerImpl.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/NuageVspRequestWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/NuageVspRequestWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/NuageVspRequestWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/NuageVspRequestWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/NuageVspResource.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/NuageVspResource.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/NuageVspResource.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/NuageVspResource.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/NuageVspResourceConfiguration.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/NuageVspResourceConfiguration.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/NuageVspResourceConfiguration.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/NuageVspResourceConfiguration.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/VspStatisticsMBean.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/VspStatisticsMBean.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/VspStatisticsMBean.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/VspStatisticsMBean.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/VspStatisticsMBeanImpl.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/VspStatisticsMBeanImpl.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/VspStatisticsMBeanImpl.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/VspStatisticsMBeanImpl.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspApiSupportCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspApiSupportCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspApiSupportCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspApiSupportCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspApplyAclRulesCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspApplyAclRulesCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspApplyAclRulesCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspApplyAclRulesCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspApplyStaticNatCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspApplyStaticNatCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspApplyStaticNatCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspApplyStaticNatCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspCleanupDomainCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspCleanupDomainCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspCleanupDomainCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspCleanupDomainCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspDeallocateVmInterfaceCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspDeallocateVmInterfaceCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspDeallocateVmInterfaceCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspDeallocateVmInterfaceCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspEntityExistsCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspEntityExistsCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspEntityExistsCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspEntityExistsCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspGetApiDefaultsCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspGetApiDefaultsCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspGetApiDefaultsCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspGetApiDefaultsCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspGuruImplementNetworkCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspGuruImplementNetworkCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspGuruImplementNetworkCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspGuruImplementNetworkCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspGuruTrashNetworkCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspGuruTrashNetworkCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspGuruTrashNetworkCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspGuruTrashNetworkCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspImplementNetworkCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspImplementNetworkCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspImplementNetworkCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspImplementNetworkCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspListDomainTemplatesCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspListDomainTemplatesCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspListDomainTemplatesCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspListDomainTemplatesCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspMaintainCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspMaintainCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspMaintainCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspMaintainCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspReadyCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspReadyCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspReadyCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspReadyCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspReserveVmInterfaceCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspReserveVmInterfaceCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspReserveVmInterfaceCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspReserveVmInterfaceCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspShutdownNetworkCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspShutdownNetworkCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspShutdownNetworkCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspShutdownNetworkCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspShutdownVpcCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspShutdownVpcCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspShutdownVpcCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspShutdownVpcCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspSyncCmsIdCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspSyncCmsIdCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspSyncCmsIdCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspSyncCmsIdCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspSyncDomainCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspSyncDomainCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspSyncDomainCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspSyncDomainCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspUpdateDhcpOptionsCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspUpdateDhcpOptionsCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspUpdateDhcpOptionsCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspUpdateDhcpOptionsCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/UpdateNuageVspDeviceCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/UpdateNuageVspDeviceCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/UpdateNuageVspDeviceCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/UpdateNuageVspDeviceCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/util/NuageVspEntityBuilder.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/util/NuageVspEntityBuilder.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/util/NuageVspEntityBuilder.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/util/NuageVspEntityBuilder.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/util/NuageVspUtil.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/util/NuageVspUtil.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/util/NuageVspUtil.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/util/NuageVspUtil.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspCheckHealthCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/com/cloud/network/vsp/resource/wrapper/NuageVspCheckHealthCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspCheckHealthCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/com/cloud/network/vsp/resource/wrapper/NuageVspCheckHealthCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspExtraDhcpOptionsCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/com/cloud/network/vsp/resource/wrapper/NuageVspExtraDhcpOptionsCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/com/cloud/network/vsp/resource/wrapper/NuageVspExtraDhcpOptionsCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/com/cloud/network/vsp/resource/wrapper/NuageVspExtraDhcpOptionsCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/resources/META-INF/cloudstack/vsp/module.properties b/plugins/network-elements/nuage-vsp/src/main/resources/META-INF/cloudstack/vsp/module.properties similarity index 100% rename from plugins/network-elements/nuage-vsp/resources/META-INF/cloudstack/vsp/module.properties rename to plugins/network-elements/nuage-vsp/src/main/resources/META-INF/cloudstack/vsp/module.properties diff --git a/plugins/network-elements/nuage-vsp/resources/META-INF/cloudstack/vsp/spring-vsp-context.xml b/plugins/network-elements/nuage-vsp/src/main/resources/META-INF/cloudstack/vsp/spring-vsp-context.xml similarity index 100% rename from plugins/network-elements/nuage-vsp/resources/META-INF/cloudstack/vsp/spring-vsp-context.xml rename to plugins/network-elements/nuage-vsp/src/main/resources/META-INF/cloudstack/vsp/spring-vsp-context.xml diff --git a/plugins/network-elements/nuage-vsp/test/com/cloud/NuageTest.java b/plugins/network-elements/nuage-vsp/src/test/java/com/cloud/NuageTest.java similarity index 100% rename from plugins/network-elements/nuage-vsp/test/com/cloud/NuageTest.java rename to plugins/network-elements/nuage-vsp/src/test/java/com/cloud/NuageTest.java diff --git a/plugins/network-elements/nuage-vsp/test/com/cloud/agent/api/CommandsTest.java b/plugins/network-elements/nuage-vsp/src/test/java/com/cloud/agent/api/CommandsTest.java similarity index 100% rename from plugins/network-elements/nuage-vsp/test/com/cloud/agent/api/CommandsTest.java rename to plugins/network-elements/nuage-vsp/src/test/java/com/cloud/agent/api/CommandsTest.java diff --git a/plugins/network-elements/nuage-vsp/test/com/cloud/network/element/NuageVspElementTest.java b/plugins/network-elements/nuage-vsp/src/test/java/com/cloud/network/element/NuageVspElementTest.java similarity index 100% rename from plugins/network-elements/nuage-vsp/test/com/cloud/network/element/NuageVspElementTest.java rename to plugins/network-elements/nuage-vsp/src/test/java/com/cloud/network/element/NuageVspElementTest.java diff --git a/plugins/network-elements/nuage-vsp/test/com/cloud/network/guru/NuageVspGuestNetworkGuruTest.java b/plugins/network-elements/nuage-vsp/src/test/java/com/cloud/network/guru/NuageVspGuestNetworkGuruTest.java similarity index 100% rename from plugins/network-elements/nuage-vsp/test/com/cloud/network/guru/NuageVspGuestNetworkGuruTest.java rename to plugins/network-elements/nuage-vsp/src/test/java/com/cloud/network/guru/NuageVspGuestNetworkGuruTest.java diff --git a/plugins/network-elements/nuage-vsp/test/com/cloud/network/manager/NuageVspManagerTest.java b/plugins/network-elements/nuage-vsp/src/test/java/com/cloud/network/manager/NuageVspManagerTest.java similarity index 100% rename from plugins/network-elements/nuage-vsp/test/com/cloud/network/manager/NuageVspManagerTest.java rename to plugins/network-elements/nuage-vsp/src/test/java/com/cloud/network/manager/NuageVspManagerTest.java diff --git a/plugins/network-elements/nuage-vsp/test/com/cloud/network/resource/NuageVspResourceTest.java b/plugins/network-elements/nuage-vsp/src/test/java/com/cloud/network/resource/NuageVspResourceTest.java similarity index 100% rename from plugins/network-elements/nuage-vsp/test/com/cloud/network/resource/NuageVspResourceTest.java rename to plugins/network-elements/nuage-vsp/src/test/java/com/cloud/network/resource/NuageVspResourceTest.java diff --git a/plugins/network-elements/nuage-vsp/test/com/cloud/util/NuageVspEntityBuilderTest.java b/plugins/network-elements/nuage-vsp/src/test/java/com/cloud/util/NuageVspEntityBuilderTest.java similarity index 100% rename from plugins/network-elements/nuage-vsp/test/com/cloud/util/NuageVspEntityBuilderTest.java rename to plugins/network-elements/nuage-vsp/src/test/java/com/cloud/util/NuageVspEntityBuilderTest.java diff --git a/plugins/network-elements/nuage-vsp/test/com/cloud/util/NuageVspUtilTest.java b/plugins/network-elements/nuage-vsp/src/test/java/com/cloud/util/NuageVspUtilTest.java similarity index 100% rename from plugins/network-elements/nuage-vsp/test/com/cloud/util/NuageVspUtilTest.java rename to plugins/network-elements/nuage-vsp/src/test/java/com/cloud/util/NuageVspUtilTest.java diff --git a/plugins/network-elements/opendaylight/pom.xml b/plugins/network-elements/opendaylight/pom.xml index d4ab9162f7dc..976ebc5ee48e 100644 --- a/plugins/network-elements/opendaylight/pom.xml +++ b/plugins/network-elements/opendaylight/pom.xml @@ -29,23 +29,7 @@ ../../pom.xml - - ${basedir}/src/main/java - ${basedir}/src/main/scripts - ${basedir}/src/test/java - ${basedir}/target/classes - ${basedir}/target/test-classes - - - ${basedir}/src/main/resources - - - - - ${basedir}/src/test/resources - - com.mycila diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelAnswer.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsCreateGreTunnelAnswer.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelAnswer.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsCreateGreTunnelAnswer.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelCommand.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsCreateGreTunnelCommand.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelCommand.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsCreateGreTunnelCommand.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelAnswer.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsCreateTunnelAnswer.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelAnswer.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsCreateTunnelAnswer.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsCreateTunnelCommand.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsCreateTunnelCommand.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDeleteFlowCommand.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsDeleteFlowCommand.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDeleteFlowCommand.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsDeleteFlowCommand.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsDestroyBridgeCommand.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsDestroyBridgeCommand.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsDestroyTunnelCommand.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsDestroyTunnelCommand.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceAnswer.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsFetchInterfaceAnswer.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceAnswer.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsFetchInterfaceAnswer.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceCommand.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsFetchInterfaceCommand.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceCommand.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsFetchInterfaceCommand.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowAnswer.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsSetTagAndFlowAnswer.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowAnswer.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsSetTagAndFlowAnswer.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowCommand.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsSetTagAndFlowCommand.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowCommand.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsSetTagAndFlowCommand.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsSetupBridgeCommand.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsSetupBridgeCommand.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/StartupOvsCommand.java b/plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/StartupOvsCommand.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/agent/api/StartupOvsCommand.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/StartupOvsCommand.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/element/OvsElement.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/element/OvsElement.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElementService.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/element/OvsElementService.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/element/OvsElementService.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/element/OvsElementService.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/guru/OvsGuestNetworkGuru.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/guru/OvsGuestNetworkGuru.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/GreTunnelException.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/GreTunnelException.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/GreTunnelException.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/GreTunnelException.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsNetworkTopologyGuru.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsNetworkTopologyGuru.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManager.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManager.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManager.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManager.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManagerImpl.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManagerImpl.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnel.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnel.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnel.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnel.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceDao.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelInterfaceDao.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceDao.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelInterfaceDao.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceDaoImpl.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelInterfaceDaoImpl.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceDaoImpl.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelInterfaceDaoImpl.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkDao.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDao.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkDao.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDao.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDao.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDao.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDao.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDao.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoVO.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoVO.java similarity index 100% rename from plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoVO.java rename to plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoVO.java diff --git a/plugins/network-elements/ovs/resources/META-INF/cloudstack/ovs/module.properties b/plugins/network-elements/ovs/src/main/resources/META-INF/cloudstack/ovs/module.properties similarity index 100% rename from plugins/network-elements/ovs/resources/META-INF/cloudstack/ovs/module.properties rename to plugins/network-elements/ovs/src/main/resources/META-INF/cloudstack/ovs/module.properties diff --git a/plugins/network-elements/ovs/resources/META-INF/cloudstack/ovs/spring-ovs-context.xml b/plugins/network-elements/ovs/src/main/resources/META-INF/cloudstack/ovs/spring-ovs-context.xml similarity index 100% rename from plugins/network-elements/ovs/resources/META-INF/cloudstack/ovs/spring-ovs-context.xml rename to plugins/network-elements/ovs/src/main/resources/META-INF/cloudstack/ovs/spring-ovs-context.xml diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddPaloAltoFirewallCmd.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/AddPaloAltoFirewallCmd.java similarity index 100% rename from plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddPaloAltoFirewallCmd.java rename to plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/AddPaloAltoFirewallCmd.java diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java similarity index 100% rename from plugins/network-elements/palo-alto/src/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java rename to plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java similarity index 100% rename from plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java rename to plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java similarity index 100% rename from plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java rename to plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java similarity index 100% rename from plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java rename to plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/response/PaloAltoFirewallResponse.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/response/PaloAltoFirewallResponse.java similarity index 100% rename from plugins/network-elements/palo-alto/src/com/cloud/api/response/PaloAltoFirewallResponse.java rename to plugins/network-elements/palo-alto/src/main/java/com/cloud/api/response/PaloAltoFirewallResponse.java diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/network/element/PaloAltoExternalFirewallElement.java similarity index 100% rename from plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java rename to plugins/network-elements/palo-alto/src/main/java/com/cloud/network/element/PaloAltoExternalFirewallElement.java diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoFirewallElementService.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/network/element/PaloAltoFirewallElementService.java similarity index 100% rename from plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoFirewallElementService.java rename to plugins/network-elements/palo-alto/src/main/java/com/cloud/network/element/PaloAltoFirewallElementService.java diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/network/resource/PaloAltoResource.java similarity index 100% rename from plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java rename to plugins/network-elements/palo-alto/src/main/java/com/cloud/network/resource/PaloAltoResource.java diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/utils/HttpClientWrapper.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/network/utils/HttpClientWrapper.java similarity index 100% rename from plugins/network-elements/palo-alto/src/com/cloud/network/utils/HttpClientWrapper.java rename to plugins/network-elements/palo-alto/src/main/java/com/cloud/network/utils/HttpClientWrapper.java diff --git a/plugins/network-elements/palo-alto/resources/META-INF/cloudstack/paloalto/module.properties b/plugins/network-elements/palo-alto/src/main/resources/META-INF/cloudstack/paloalto/module.properties similarity index 100% rename from plugins/network-elements/palo-alto/resources/META-INF/cloudstack/paloalto/module.properties rename to plugins/network-elements/palo-alto/src/main/resources/META-INF/cloudstack/paloalto/module.properties diff --git a/plugins/network-elements/palo-alto/resources/META-INF/cloudstack/paloalto/spring-paloalto-context.xml b/plugins/network-elements/palo-alto/src/main/resources/META-INF/cloudstack/paloalto/spring-paloalto-context.xml similarity index 100% rename from plugins/network-elements/palo-alto/resources/META-INF/cloudstack/paloalto/spring-paloalto-context.xml rename to plugins/network-elements/palo-alto/src/main/resources/META-INF/cloudstack/paloalto/spring-paloalto-context.xml diff --git a/plugins/network-elements/palo-alto/test/com/cloud/network/resource/MockablePaloAltoResource.java b/plugins/network-elements/palo-alto/src/test/java/com/cloud/network/resource/MockablePaloAltoResource.java similarity index 100% rename from plugins/network-elements/palo-alto/test/com/cloud/network/resource/MockablePaloAltoResource.java rename to plugins/network-elements/palo-alto/src/test/java/com/cloud/network/resource/MockablePaloAltoResource.java diff --git a/plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java b/plugins/network-elements/palo-alto/src/test/java/com/cloud/network/resource/PaloAltoResourceTest.java similarity index 100% rename from plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java rename to plugins/network-elements/palo-alto/src/test/java/com/cloud/network/resource/PaloAltoResourceTest.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/api/commands/AddSspCmd.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/api/commands/AddSspCmd.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/api/commands/DeleteSspCmd.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/api/commands/DeleteSspCmd.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/response/SspResponse.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/api/response/SspResponse.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/response/SspResponse.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/api/response/SspResponse.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDao.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspCredentialDao.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDao.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspCredentialDao.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDaoImpl.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspCredentialDaoImpl.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDaoImpl.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspCredentialDaoImpl.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspCredentialVO.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspCredentialVO.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDao.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspTenantDao.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDao.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspTenantDao.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDaoImpl.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspTenantDaoImpl.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDaoImpl.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspTenantDaoImpl.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantVO.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspTenantVO.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantVO.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspTenantVO.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDao.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspUuidDao.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDao.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspUuidDao.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidVO.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspUuidVO.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidVO.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/dao/SspUuidVO.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspClient.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/element/SspClient.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspClient.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/element/SspClient.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/element/SspElement.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/element/SspElement.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspManager.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/element/SspManager.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspManager.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/element/SspManager.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspService.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/element/SspService.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspService.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/element/SspService.java diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java rename to plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java diff --git a/plugins/network-elements/stratosphere-ssp/resources/META-INF/cloudstack/ssp/module.properties b/plugins/network-elements/stratosphere-ssp/src/main/resources/META-INF/cloudstack/ssp/module.properties similarity index 100% rename from plugins/network-elements/stratosphere-ssp/resources/META-INF/cloudstack/ssp/module.properties rename to plugins/network-elements/stratosphere-ssp/src/main/resources/META-INF/cloudstack/ssp/module.properties diff --git a/plugins/network-elements/stratosphere-ssp/resources/META-INF/cloudstack/ssp/spring-ssp-context.xml b/plugins/network-elements/stratosphere-ssp/src/main/resources/META-INF/cloudstack/ssp/spring-ssp-context.xml similarity index 100% rename from plugins/network-elements/stratosphere-ssp/resources/META-INF/cloudstack/ssp/spring-ssp-context.xml rename to plugins/network-elements/stratosphere-ssp/src/main/resources/META-INF/cloudstack/ssp/spring-ssp-context.xml diff --git a/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspClientTest.java b/plugins/network-elements/stratosphere-ssp/src/test/java/org/apache/cloudstack/network/element/SspClientTest.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspClientTest.java rename to plugins/network-elements/stratosphere-ssp/src/test/java/org/apache/cloudstack/network/element/SspClientTest.java diff --git a/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspElementTest.java b/plugins/network-elements/stratosphere-ssp/src/test/java/org/apache/cloudstack/network/element/SspElementTest.java similarity index 100% rename from plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspElementTest.java rename to plugins/network-elements/stratosphere-ssp/src/test/java/org/apache/cloudstack/network/element/SspElementTest.java diff --git a/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java b/plugins/network-elements/vxlan/src/main/java/com/cloud/network/guru/VxlanGuestNetworkGuru.java similarity index 100% rename from plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java rename to plugins/network-elements/vxlan/src/main/java/com/cloud/network/guru/VxlanGuestNetworkGuru.java diff --git a/plugins/network-elements/vxlan/resources/META-INF/cloudstack/vxlan/module.properties b/plugins/network-elements/vxlan/src/main/resources/META-INF/cloudstack/vxlan/module.properties similarity index 100% rename from plugins/network-elements/vxlan/resources/META-INF/cloudstack/vxlan/module.properties rename to plugins/network-elements/vxlan/src/main/resources/META-INF/cloudstack/vxlan/module.properties diff --git a/plugins/network-elements/vxlan/resources/META-INF/cloudstack/vxlan/spring-vxlan-context.xml b/plugins/network-elements/vxlan/src/main/resources/META-INF/cloudstack/vxlan/spring-vxlan-context.xml similarity index 100% rename from plugins/network-elements/vxlan/resources/META-INF/cloudstack/vxlan/spring-vxlan-context.xml rename to plugins/network-elements/vxlan/src/main/resources/META-INF/cloudstack/vxlan/spring-vxlan-context.xml diff --git a/plugins/network-elements/vxlan/test/com/cloud/network/guru/VxlanGuestNetworkGuruTest.java b/plugins/network-elements/vxlan/src/test/java/com/cloud/network/guru/VxlanGuestNetworkGuruTest.java similarity index 100% rename from plugins/network-elements/vxlan/test/com/cloud/network/guru/VxlanGuestNetworkGuruTest.java rename to plugins/network-elements/vxlan/src/test/java/com/cloud/network/guru/VxlanGuestNetworkGuruTest.java diff --git a/plugins/outofbandmanagement-drivers/ipmitool/src/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolOutOfBandManagementDriver.java b/plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolOutOfBandManagementDriver.java similarity index 100% rename from plugins/outofbandmanagement-drivers/ipmitool/src/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolOutOfBandManagementDriver.java rename to plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolOutOfBandManagementDriver.java diff --git a/plugins/outofbandmanagement-drivers/ipmitool/src/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapper.java b/plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapper.java similarity index 100% rename from plugins/outofbandmanagement-drivers/ipmitool/src/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapper.java rename to plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapper.java diff --git a/plugins/outofbandmanagement-drivers/ipmitool/resources/META-INF/cloudstack/ipmitool/module.properties b/plugins/outofbandmanagement-drivers/ipmitool/src/main/resources/META-INF/cloudstack/ipmitool/module.properties similarity index 100% rename from plugins/outofbandmanagement-drivers/ipmitool/resources/META-INF/cloudstack/ipmitool/module.properties rename to plugins/outofbandmanagement-drivers/ipmitool/src/main/resources/META-INF/cloudstack/ipmitool/module.properties diff --git a/plugins/outofbandmanagement-drivers/ipmitool/resources/META-INF/cloudstack/ipmitool/spring-ipmitool-context.xml b/plugins/outofbandmanagement-drivers/ipmitool/src/main/resources/META-INF/cloudstack/ipmitool/spring-ipmitool-context.xml similarity index 100% rename from plugins/outofbandmanagement-drivers/ipmitool/resources/META-INF/cloudstack/ipmitool/spring-ipmitool-context.xml rename to plugins/outofbandmanagement-drivers/ipmitool/src/main/resources/META-INF/cloudstack/ipmitool/spring-ipmitool-context.xml diff --git a/plugins/outofbandmanagement-drivers/ipmitool/test/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapperTest.java b/plugins/outofbandmanagement-drivers/ipmitool/src/test/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapperTest.java similarity index 100% rename from plugins/outofbandmanagement-drivers/ipmitool/test/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapperTest.java rename to plugins/outofbandmanagement-drivers/ipmitool/src/test/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapperTest.java diff --git a/plugins/outofbandmanagement-drivers/nested-cloudstack/src/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriver.java b/plugins/outofbandmanagement-drivers/nested-cloudstack/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriver.java similarity index 100% rename from plugins/outofbandmanagement-drivers/nested-cloudstack/src/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriver.java rename to plugins/outofbandmanagement-drivers/nested-cloudstack/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriver.java diff --git a/plugins/outofbandmanagement-drivers/nested-cloudstack/resources/META-INF/cloudstack/nested-cloudstack/module.properties b/plugins/outofbandmanagement-drivers/nested-cloudstack/src/main/resources/META-INF/cloudstack/nested-cloudstack/module.properties similarity index 100% rename from plugins/outofbandmanagement-drivers/nested-cloudstack/resources/META-INF/cloudstack/nested-cloudstack/module.properties rename to plugins/outofbandmanagement-drivers/nested-cloudstack/src/main/resources/META-INF/cloudstack/nested-cloudstack/module.properties diff --git a/plugins/outofbandmanagement-drivers/nested-cloudstack/resources/META-INF/cloudstack/nested-cloudstack/spring-nested-cloudstack-context.xml b/plugins/outofbandmanagement-drivers/nested-cloudstack/src/main/resources/META-INF/cloudstack/nested-cloudstack/spring-nested-cloudstack-context.xml similarity index 100% rename from plugins/outofbandmanagement-drivers/nested-cloudstack/resources/META-INF/cloudstack/nested-cloudstack/spring-nested-cloudstack-context.xml rename to plugins/outofbandmanagement-drivers/nested-cloudstack/src/main/resources/META-INF/cloudstack/nested-cloudstack/spring-nested-cloudstack-context.xml diff --git a/plugins/outofbandmanagement-drivers/nested-cloudstack/test/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriverTest.java b/plugins/outofbandmanagement-drivers/nested-cloudstack/src/test/java/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriverTest.java similarity index 100% rename from plugins/outofbandmanagement-drivers/nested-cloudstack/test/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriverTest.java rename to plugins/outofbandmanagement-drivers/nested-cloudstack/src/test/java/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriverTest.java diff --git a/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java b/plugins/storage-allocators/random/src/main/java/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java similarity index 100% rename from plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java rename to plugins/storage-allocators/random/src/main/java/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java diff --git a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java b/plugins/storage/image/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java similarity index 100% rename from plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java rename to plugins/storage/image/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java diff --git a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackImageStoreLifeCycleImpl.java b/plugins/storage/image/default/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackImageStoreLifeCycleImpl.java similarity index 100% rename from plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackImageStoreLifeCycleImpl.java rename to plugins/storage/image/default/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackImageStoreLifeCycleImpl.java diff --git a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/provider/CloudStackImageStoreProviderImpl.java b/plugins/storage/image/default/src/main/java/org/apache/cloudstack/storage/datastore/provider/CloudStackImageStoreProviderImpl.java similarity index 100% rename from plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/provider/CloudStackImageStoreProviderImpl.java rename to plugins/storage/image/default/src/main/java/org/apache/cloudstack/storage/datastore/provider/CloudStackImageStoreProviderImpl.java diff --git a/plugins/storage/image/default/resources/META-INF/cloudstack/storage-image-default/module.properties b/plugins/storage/image/default/src/main/resources/META-INF/cloudstack/storage-image-default/module.properties similarity index 100% rename from plugins/storage/image/default/resources/META-INF/cloudstack/storage-image-default/module.properties rename to plugins/storage/image/default/src/main/resources/META-INF/cloudstack/storage-image-default/module.properties diff --git a/plugins/storage/image/default/resources/META-INF/cloudstack/storage-image-default/spring-storage-image-default-context.xml b/plugins/storage/image/default/src/main/resources/META-INF/cloudstack/storage-image-default/spring-storage-image-default-context.xml similarity index 100% rename from plugins/storage/image/default/resources/META-INF/cloudstack/storage-image-default/spring-storage-image-default-context.xml rename to plugins/storage/image/default/src/main/resources/META-INF/cloudstack/storage-image-default/spring-storage-image-default-context.xml diff --git a/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java b/plugins/storage/image/s3/src/main/java/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java similarity index 100% rename from plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java rename to plugins/storage/image/s3/src/main/java/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java diff --git a/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/lifecycle/S3ImageStoreLifeCycleImpl.java b/plugins/storage/image/s3/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/S3ImageStoreLifeCycleImpl.java similarity index 100% rename from plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/lifecycle/S3ImageStoreLifeCycleImpl.java rename to plugins/storage/image/s3/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/S3ImageStoreLifeCycleImpl.java diff --git a/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/provider/S3ImageStoreProviderImpl.java b/plugins/storage/image/s3/src/main/java/org/apache/cloudstack/storage/datastore/provider/S3ImageStoreProviderImpl.java similarity index 100% rename from plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/provider/S3ImageStoreProviderImpl.java rename to plugins/storage/image/s3/src/main/java/org/apache/cloudstack/storage/datastore/provider/S3ImageStoreProviderImpl.java diff --git a/plugins/storage/image/s3/resources/META-INF/cloudstack/storage-image-s3/module.properties b/plugins/storage/image/s3/src/main/resources/META-INF/cloudstack/storage-image-s3/module.properties similarity index 100% rename from plugins/storage/image/s3/resources/META-INF/cloudstack/storage-image-s3/module.properties rename to plugins/storage/image/s3/src/main/resources/META-INF/cloudstack/storage-image-s3/module.properties diff --git a/plugins/storage/image/s3/resources/META-INF/cloudstack/storage-image-s3/spring-storage-image-s3-context.xml b/plugins/storage/image/s3/src/main/resources/META-INF/cloudstack/storage-image-s3/spring-storage-image-s3-context.xml similarity index 100% rename from plugins/storage/image/s3/resources/META-INF/cloudstack/storage-image-s3/spring-storage-image-s3-context.xml rename to plugins/storage/image/s3/src/main/resources/META-INF/cloudstack/storage-image-s3/spring-storage-image-s3-context.xml diff --git a/plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java b/plugins/storage/image/sample/src/main/java/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java similarity index 100% rename from plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java rename to plugins/storage/image/sample/src/main/java/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java diff --git a/plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/lifecycle/SampleImageStoreLifeCycleImpl.java b/plugins/storage/image/sample/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/SampleImageStoreLifeCycleImpl.java similarity index 100% rename from plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/lifecycle/SampleImageStoreLifeCycleImpl.java rename to plugins/storage/image/sample/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/SampleImageStoreLifeCycleImpl.java diff --git a/plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/provider/SampleImageStoreProviderImpl.java b/plugins/storage/image/sample/src/main/java/org/apache/cloudstack/storage/datastore/provider/SampleImageStoreProviderImpl.java similarity index 100% rename from plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/provider/SampleImageStoreProviderImpl.java rename to plugins/storage/image/sample/src/main/java/org/apache/cloudstack/storage/datastore/provider/SampleImageStoreProviderImpl.java diff --git a/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java b/plugins/storage/image/swift/src/main/java/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java similarity index 100% rename from plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java rename to plugins/storage/image/swift/src/main/java/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java diff --git a/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/lifecycle/SwiftImageStoreLifeCycleImpl.java b/plugins/storage/image/swift/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/SwiftImageStoreLifeCycleImpl.java similarity index 100% rename from plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/lifecycle/SwiftImageStoreLifeCycleImpl.java rename to plugins/storage/image/swift/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/SwiftImageStoreLifeCycleImpl.java diff --git a/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/provider/SwiftImageStoreProviderImpl.java b/plugins/storage/image/swift/src/main/java/org/apache/cloudstack/storage/datastore/provider/SwiftImageStoreProviderImpl.java similarity index 100% rename from plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/provider/SwiftImageStoreProviderImpl.java rename to plugins/storage/image/swift/src/main/java/org/apache/cloudstack/storage/datastore/provider/SwiftImageStoreProviderImpl.java diff --git a/plugins/storage/image/swift/resources/META-INF/cloudstack/storage-image-swift/module.properties b/plugins/storage/image/swift/src/main/resources/META-INF/cloudstack/storage-image-swift/module.properties similarity index 100% rename from plugins/storage/image/swift/resources/META-INF/cloudstack/storage-image-swift/module.properties rename to plugins/storage/image/swift/src/main/resources/META-INF/cloudstack/storage-image-swift/module.properties diff --git a/plugins/storage/image/swift/resources/META-INF/cloudstack/storage-image-swift/spring-storage-image-swift-context.xml b/plugins/storage/image/swift/src/main/resources/META-INF/cloudstack/storage-image-swift/spring-storage-image-swift-context.xml similarity index 100% rename from plugins/storage/image/swift/resources/META-INF/cloudstack/storage-image-swift/spring-storage-image-swift-context.xml rename to plugins/storage/image/swift/src/main/resources/META-INF/cloudstack/storage-image-swift/spring-storage-image-swift-context.xml diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml old mode 100755 new mode 100644 index 11ce1876afcf..9794583c348c --- a/plugins/storage/volume/cloudbyte/pom.xml +++ b/plugins/storage/volume/cloudbyte/pom.xml @@ -59,8 +59,6 @@ install - src - test maven-surefire-plugin diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java similarity index 100% rename from plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java rename to plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/lifecycle/ElastistorPrimaryDataStoreLifeCycle.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/ElastistorPrimaryDataStoreLifeCycle.java similarity index 100% rename from plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/lifecycle/ElastistorPrimaryDataStoreLifeCycle.java rename to plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/ElastistorPrimaryDataStoreLifeCycle.java diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/provider/ElastistorHostListener.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/provider/ElastistorHostListener.java similarity index 100% rename from plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/provider/ElastistorHostListener.java rename to plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/provider/ElastistorHostListener.java diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/provider/ElastistorPrimaryDataStoreProvider.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/provider/ElastistorPrimaryDataStoreProvider.java similarity index 100% rename from plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/provider/ElastistorPrimaryDataStoreProvider.java rename to plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/provider/ElastistorPrimaryDataStoreProvider.java diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java similarity index 100% rename from plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java rename to plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiService.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiService.java similarity index 100% rename from plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiService.java rename to plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiService.java diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiServiceImpl.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiServiceImpl.java similarity index 100% rename from plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiServiceImpl.java rename to plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiServiceImpl.java diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ListElastistorInterfaceCmd.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ListElastistorInterfaceCmd.java similarity index 100% rename from plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ListElastistorInterfaceCmd.java rename to plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ListElastistorInterfaceCmd.java diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ListElastistorInterfaceResponse.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ListElastistorInterfaceResponse.java similarity index 100% rename from plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ListElastistorInterfaceResponse.java rename to plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ListElastistorInterfaceResponse.java diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ListElastistorPoolCmd.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ListElastistorPoolCmd.java similarity index 100% rename from plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ListElastistorPoolCmd.java rename to plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ListElastistorPoolCmd.java diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ListElastistorPoolResponse.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ListElastistorPoolResponse.java similarity index 100% rename from plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ListElastistorPoolResponse.java rename to plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ListElastistorPoolResponse.java diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ListElastistorVolumeCmd.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ListElastistorVolumeCmd.java similarity index 100% rename from plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ListElastistorVolumeCmd.java rename to plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ListElastistorVolumeCmd.java diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ListElastistorVolumeResponse.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ListElastistorVolumeResponse.java similarity index 100% rename from plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ListElastistorVolumeResponse.java rename to plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ListElastistorVolumeResponse.java diff --git a/plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties b/plugins/storage/volume/cloudbyte/src/main/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties similarity index 100% rename from plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties rename to plugins/storage/volume/cloudbyte/src/main/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties diff --git a/plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/spring-storage-volume-cloudbyte-context.xml b/plugins/storage/volume/cloudbyte/src/main/resources/META-INF/cloudstack/storage-volume-cloudbyte/spring-storage-volume-cloudbyte-context.xml similarity index 100% rename from plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/spring-storage-volume-cloudbyte-context.xml rename to plugins/storage/volume/cloudbyte/src/main/resources/META-INF/cloudstack/storage-volume-cloudbyte/spring-storage-volume-cloudbyte-context.xml diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java b/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java similarity index 100% rename from plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java rename to plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java b/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java similarity index 100% rename from plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java rename to plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/provider/CloudStackPrimaryDataStoreProviderImpl.java b/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/provider/CloudStackPrimaryDataStoreProviderImpl.java similarity index 100% rename from plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/provider/CloudStackPrimaryDataStoreProviderImpl.java rename to plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/provider/CloudStackPrimaryDataStoreProviderImpl.java diff --git a/plugins/storage/volume/default/resources/META-INF/cloudstack/storage-volume-default/module.properties b/plugins/storage/volume/default/src/main/resources/META-INF/cloudstack/storage-volume-default/module.properties similarity index 100% rename from plugins/storage/volume/default/resources/META-INF/cloudstack/storage-volume-default/module.properties rename to plugins/storage/volume/default/src/main/resources/META-INF/cloudstack/storage-volume-default/module.properties diff --git a/plugins/storage/volume/default/resources/META-INF/cloudstack/storage-volume-default/spring-storage-volume-default-context.xml b/plugins/storage/volume/default/src/main/resources/META-INF/cloudstack/storage-volume-default/spring-storage-volume-default-context.xml similarity index 100% rename from plugins/storage/volume/default/resources/META-INF/cloudstack/storage-volume-default/spring-storage-volume-default-context.xml rename to plugins/storage/volume/default/src/main/resources/META-INF/cloudstack/storage-volume-default/spring-storage-volume-default-context.xml diff --git a/plugins/storage/volume/default/test/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImplTest.java b/plugins/storage/volume/default/src/test/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImplTest.java similarity index 100% rename from plugins/storage/volume/default/test/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImplTest.java rename to plugins/storage/volume/default/src/test/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImplTest.java diff --git a/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/driver/NexentaPrimaryDataStoreDriver.java b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/driver/NexentaPrimaryDataStoreDriver.java similarity index 100% rename from plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/driver/NexentaPrimaryDataStoreDriver.java rename to plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/driver/NexentaPrimaryDataStoreDriver.java diff --git a/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java similarity index 100% rename from plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java rename to plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java diff --git a/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/provider/NexentaHostListener.java b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/provider/NexentaHostListener.java similarity index 100% rename from plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/provider/NexentaHostListener.java rename to plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/provider/NexentaHostListener.java diff --git a/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/provider/NexentaPrimaryDataStoreProvider.java b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/provider/NexentaPrimaryDataStoreProvider.java similarity index 100% rename from plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/provider/NexentaPrimaryDataStoreProvider.java rename to plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/provider/NexentaPrimaryDataStoreProvider.java diff --git a/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java similarity index 100% rename from plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java rename to plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java diff --git a/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsUrl.java b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaNmsUrl.java similarity index 100% rename from plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsUrl.java rename to plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaNmsUrl.java diff --git a/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaStorAppliance.java b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaStorAppliance.java similarity index 100% rename from plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaStorAppliance.java rename to plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaStorAppliance.java diff --git a/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaUtil.java b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaUtil.java similarity index 100% rename from plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaUtil.java rename to plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaUtil.java diff --git a/plugins/storage/volume/nexenta/resources/META-INF.cloudstack.storage-volume-solidfire/module.properties b/plugins/storage/volume/nexenta/src/main/resources/META-INF.cloudstack.storage-volume-solidfire/module.properties similarity index 100% rename from plugins/storage/volume/nexenta/resources/META-INF.cloudstack.storage-volume-solidfire/module.properties rename to plugins/storage/volume/nexenta/src/main/resources/META-INF.cloudstack.storage-volume-solidfire/module.properties diff --git a/plugins/storage/volume/nexenta/resources/META-INF.cloudstack.storage-volume-solidfire/spring-storage-volume-nexenta-context.xml b/plugins/storage/volume/nexenta/src/main/resources/META-INF.cloudstack.storage-volume-solidfire/spring-storage-volume-nexenta-context.xml similarity index 100% rename from plugins/storage/volume/nexenta/resources/META-INF.cloudstack.storage-volume-solidfire/spring-storage-volume-nexenta-context.xml rename to plugins/storage/volume/nexenta/src/main/resources/META-INF.cloudstack.storage-volume-solidfire/spring-storage-volume-nexenta-context.xml diff --git a/plugins/storage/volume/nexenta/test/org/apache/cloudstack/storage/datastore/util/NexentaStorApplianceTest.java b/plugins/storage/volume/nexenta/src/test/java/org/apache/cloudstack/storage/datastore/util/NexentaStorApplianceTest.java similarity index 100% rename from plugins/storage/volume/nexenta/test/org/apache/cloudstack/storage/datastore/util/NexentaStorApplianceTest.java rename to plugins/storage/volume/nexenta/src/test/java/org/apache/cloudstack/storage/datastore/util/NexentaStorApplianceTest.java diff --git a/plugins/storage/volume/nexenta/test/org/apache/cloudstack/storage/datastore/util/NexentaUtilTest.java b/plugins/storage/volume/nexenta/src/test/java/org/apache/cloudstack/storage/datastore/util/NexentaUtilTest.java similarity index 100% rename from plugins/storage/volume/nexenta/test/org/apache/cloudstack/storage/datastore/util/NexentaUtilTest.java rename to plugins/storage/volume/nexenta/src/test/java/org/apache/cloudstack/storage/datastore/util/NexentaUtilTest.java diff --git a/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java b/plugins/storage/volume/sample/src/main/java/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java similarity index 100% rename from plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java rename to plugins/storage/volume/sample/src/main/java/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java diff --git a/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/lifecycle/SamplePrimaryDataStoreLifeCycleImpl.java b/plugins/storage/volume/sample/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/SamplePrimaryDataStoreLifeCycleImpl.java similarity index 100% rename from plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/lifecycle/SamplePrimaryDataStoreLifeCycleImpl.java rename to plugins/storage/volume/sample/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/SamplePrimaryDataStoreLifeCycleImpl.java diff --git a/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/provider/SamplePrimaryDatastoreProviderImpl.java b/plugins/storage/volume/sample/src/main/java/org/apache/cloudstack/storage/datastore/provider/SamplePrimaryDatastoreProviderImpl.java similarity index 100% rename from plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/provider/SamplePrimaryDatastoreProviderImpl.java rename to plugins/storage/volume/sample/src/main/java/org/apache/cloudstack/storage/datastore/provider/SamplePrimaryDatastoreProviderImpl.java diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java b/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java similarity index 100% rename from plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java rename to plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFireSharedPrimaryDataStoreDriver.java b/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/driver/SolidFireSharedPrimaryDataStoreDriver.java similarity index 100% rename from plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFireSharedPrimaryDataStoreDriver.java rename to plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/driver/SolidFireSharedPrimaryDataStoreDriver.java diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java b/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java similarity index 100% rename from plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java rename to plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFireSharedPrimaryDataStoreLifeCycle.java b/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/SolidFireSharedPrimaryDataStoreLifeCycle.java similarity index 100% rename from plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFireSharedPrimaryDataStoreLifeCycle.java rename to plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/SolidFireSharedPrimaryDataStoreLifeCycle.java diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidFireHostListener.java b/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/provider/SolidFireHostListener.java similarity index 100% rename from plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidFireHostListener.java rename to plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/provider/SolidFireHostListener.java diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidFirePrimaryDataStoreProvider.java b/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/provider/SolidFirePrimaryDataStoreProvider.java similarity index 100% rename from plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidFirePrimaryDataStoreProvider.java rename to plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/provider/SolidFirePrimaryDataStoreProvider.java diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidFireSharedHostListener.java b/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/provider/SolidFireSharedHostListener.java similarity index 100% rename from plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidFireSharedHostListener.java rename to plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/provider/SolidFireSharedHostListener.java diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidFireSharedPrimaryDataStoreProvider.java b/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/provider/SolidFireSharedPrimaryDataStoreProvider.java similarity index 100% rename from plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidFireSharedPrimaryDataStoreProvider.java rename to plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/provider/SolidFireSharedPrimaryDataStoreProvider.java diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java b/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java similarity index 100% rename from plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java rename to plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java diff --git a/plugins/storage/volume/solidfire/resources/META-INF/cloudstack/storage-volume-solidfire/module.properties b/plugins/storage/volume/solidfire/src/main/resources/META-INF/cloudstack/storage-volume-solidfire/module.properties similarity index 100% rename from plugins/storage/volume/solidfire/resources/META-INF/cloudstack/storage-volume-solidfire/module.properties rename to plugins/storage/volume/solidfire/src/main/resources/META-INF/cloudstack/storage-volume-solidfire/module.properties diff --git a/plugins/storage/volume/solidfire/resources/META-INF/cloudstack/storage-volume-solidfire/spring-storage-volume-solidfire-context.xml b/plugins/storage/volume/solidfire/src/main/resources/META-INF/cloudstack/storage-volume-solidfire/spring-storage-volume-solidfire-context.xml similarity index 100% rename from plugins/storage/volume/solidfire/resources/META-INF/cloudstack/storage-volume-solidfire/spring-storage-volume-solidfire-context.xml rename to plugins/storage/volume/solidfire/src/main/resources/META-INF/cloudstack/storage-volume-solidfire/spring-storage-volume-solidfire-context.xml diff --git a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/AopTestAdvice.java b/plugins/storage/volume/solidfire/src/test/java/org/apache/cloudstack/storage/test/AopTestAdvice.java similarity index 100% rename from plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/AopTestAdvice.java rename to plugins/storage/volume/solidfire/src/test/java/org/apache/cloudstack/storage/test/AopTestAdvice.java diff --git a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java b/plugins/storage/volume/solidfire/src/test/java/org/apache/cloudstack/storage/test/ChildTestConfiguration.java similarity index 100% rename from plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java rename to plugins/storage/volume/solidfire/src/test/java/org/apache/cloudstack/storage/test/ChildTestConfiguration.java diff --git a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/TestConfiguration.java b/plugins/storage/volume/solidfire/src/test/java/org/apache/cloudstack/storage/test/TestConfiguration.java similarity index 100% rename from plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/TestConfiguration.java rename to plugins/storage/volume/solidfire/src/test/java/org/apache/cloudstack/storage/test/TestConfiguration.java diff --git a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/VolumeTest.java b/plugins/storage/volume/solidfire/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java similarity index 100% rename from plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/VolumeTest.java rename to plugins/storage/volume/solidfire/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java diff --git a/plugins/storage/volume/solidfire/test/resource/storageContext.xml b/plugins/storage/volume/solidfire/src/test/resource/storageContext.xml similarity index 100% rename from plugins/storage/volume/solidfire/test/resource/storageContext.xml rename to plugins/storage/volume/solidfire/src/test/resource/storageContext.xml diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LinkAccountToLdapCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/api/command/LinkAccountToLdapCmd.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LinkAccountToLdapCmd.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/api/command/LinkAccountToLdapCmd.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LinkAccountToLdapResponse.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/api/response/LinkAccountToLdapResponse.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LinkAccountToLdapResponse.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/api/response/LinkAccountToLdapResponse.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPConfigCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LDAPConfigCmd.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPConfigCmd.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LDAPConfigCmd.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPRemoveCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LDAPRemoveCmd.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPRemoveCmd.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LDAPRemoveCmd.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapImportUsersCmd.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapImportUsersCmd.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListUsersCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListUsersCmd.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapUserSearchCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapUserSearchCmd.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapUserSearchCmd.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapUserSearchCmd.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LDAPConfigResponse.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LDAPConfigResponse.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LDAPConfigResponse.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LDAPConfigResponse.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LDAPRemoveResponse.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LDAPRemoveResponse.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LDAPRemoveResponse.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LDAPRemoveResponse.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LdapConfigurationResponse.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LdapConfigurationResponse.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LdapConfigurationResponse.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LdapConfigurationResponse.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LdapUserResponse.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LdapUserResponse.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LdapUserResponse.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LdapUserResponse.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LinkDomainToLdapResponse.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LinkDomainToLdapResponse.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LinkDomainToLdapResponse.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LinkDomainToLdapResponse.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfiguration.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapConfiguration.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfiguration.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapConfiguration.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfigurationVO.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapConfigurationVO.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfigurationVO.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapConfigurationVO.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapContextFactory.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapContextFactory.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapContextFactory.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapContextFactory.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapManager.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManager.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapManager.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManager.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapManagerImpl.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapManagerImpl.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapTrustMapVO.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapTrustMapVO.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapTrustMapVO.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapTrustMapVO.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUser.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUser.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUser.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUser.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUserManager.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUserManager.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManagerFactory.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUserManagerFactory.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManagerFactory.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUserManagerFactory.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUtils.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUtils.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUtils.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUtils.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryException.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryException.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryException.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryException.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapConfigurationDao.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDao.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapConfigurationDao.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDao.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapTrustMapDao.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapTrustMapDao.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapTrustMapDao.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapTrustMapDao.java diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapTrustMapDaoImpl.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapTrustMapDaoImpl.java similarity index 100% rename from plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapTrustMapDaoImpl.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapTrustMapDaoImpl.java diff --git a/plugins/user-authenticators/ldap/resources/META-INF/cloudstack/ldap/module.properties b/plugins/user-authenticators/ldap/src/main/resources/META-INF/cloudstack/ldap/module.properties similarity index 100% rename from plugins/user-authenticators/ldap/resources/META-INF/cloudstack/ldap/module.properties rename to plugins/user-authenticators/ldap/src/main/resources/META-INF/cloudstack/ldap/module.properties diff --git a/plugins/user-authenticators/ldap/resources/META-INF/cloudstack/ldap/spring-ldap-context.xml b/plugins/user-authenticators/ldap/src/main/resources/META-INF/cloudstack/ldap/spring-ldap-context.xml similarity index 100% rename from plugins/user-authenticators/ldap/resources/META-INF/cloudstack/ldap/spring-ldap-context.xml rename to plugins/user-authenticators/ldap/src/main/resources/META-INF/cloudstack/ldap/spring-ldap-context.xml diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/ADLdapUserManagerImplSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/ADLdapUserManagerImplSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/ADLdapUserManagerImplSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/ADLdapUserManagerImplSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/BasicNamingEnumerationImpl.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/BasicNamingEnumerationImpl.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/BasicNamingEnumerationImpl.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/BasicNamingEnumerationImpl.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapAddConfigurationCmdSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapAddConfigurationCmdSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapAddConfigurationCmdSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapAddConfigurationCmdSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapAuthenticatorSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapAuthenticatorSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapAuthenticatorSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapAuthenticatorSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationDaoImplSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationDaoImplSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationDaoImplSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationDaoImplSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationResponseSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationResponseSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationResponseSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationResponseSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationVOSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationVOSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationVOSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapConfigurationVOSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapContextFactorySpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapContextFactorySpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapContextFactorySpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapContextFactorySpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapCreateAccountCmdSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapCreateAccountCmdSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapCreateAccountCmdSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapCreateAccountCmdSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapDeleteConfigurationCmdSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapDeleteConfigurationCmdSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapDeleteConfigurationCmdSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapDeleteConfigurationCmdSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapListConfigurationCmdSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapListConfigurationCmdSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapListConfigurationCmdSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapListConfigurationCmdSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapListUsersCmdSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapListUsersCmdSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapListUsersCmdSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapListUsersCmdSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapManagerImplSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapManagerImplSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapManagerImplSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapManagerImplSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapSearchUserCmdSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapSearchUserCmdSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapSearchUserCmdSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapSearchUserCmdSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapUserManagerFactorySpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapUserManagerFactorySpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapUserManagerFactorySpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapUserManagerFactorySpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapUserResponseSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapUserResponseSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapUserResponseSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapUserResponseSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapUserSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapUserSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapUserSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapUserSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapUtilsSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapUtilsSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapUtilsSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapUtilsSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LinkDomainToLdapCmdSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LinkDomainToLdapCmdSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LinkDomainToLdapCmdSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LinkDomainToLdapCmdSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryExceptionSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryExceptionSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryExceptionSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryExceptionSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/OpenLdapUserManagerSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/OpenLdapUserManagerSpec.groovy similarity index 100% rename from plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/OpenLdapUserManagerSpec.groovy rename to plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/OpenLdapUserManagerSpec.groovy diff --git a/plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapConfigurationChanger.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapConfigurationChanger.java similarity index 100% rename from plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapConfigurationChanger.java rename to plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapConfigurationChanger.java diff --git a/plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapCreateAccountCmdTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapCreateAccountCmdTest.java similarity index 100% rename from plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapCreateAccountCmdTest.java rename to plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapCreateAccountCmdTest.java diff --git a/plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapImportUsersCmdTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapImportUsersCmdTest.java similarity index 100% rename from plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapImportUsersCmdTest.java rename to plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapImportUsersCmdTest.java diff --git a/plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LinkAccountToLdapCmdTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmdTest.java similarity index 100% rename from plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LinkAccountToLdapCmdTest.java rename to plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmdTest.java diff --git a/plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LinkDomainToLdapCmdTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LinkDomainToLdapCmdTest.java similarity index 100% rename from plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LinkDomainToLdapCmdTest.java rename to plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LinkDomainToLdapCmdTest.java diff --git a/plugins/user-authenticators/ldap/test/org/apache/cloudstack/ldap/LdapConfigurationTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapConfigurationTest.java similarity index 100% rename from plugins/user-authenticators/ldap/test/org/apache/cloudstack/ldap/LdapConfigurationTest.java rename to plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapConfigurationTest.java diff --git a/plugins/user-authenticators/ldap/test/resources/cloudstack.org.ldif b/plugins/user-authenticators/ldap/src/test/resources/cloudstack.org.ldif similarity index 100% rename from plugins/user-authenticators/ldap/test/resources/cloudstack.org.ldif rename to plugins/user-authenticators/ldap/src/test/resources/cloudstack.org.ldif diff --git a/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java b/plugins/user-authenticators/md5/src/main/java/com/cloud/server/auth/MD5UserAuthenticator.java similarity index 100% rename from plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java rename to plugins/user-authenticators/md5/src/main/java/com/cloud/server/auth/MD5UserAuthenticator.java diff --git a/plugins/user-authenticators/md5/resources/META-INF/cloudstack/md5/module.properties b/plugins/user-authenticators/md5/src/main/resources/META-INF/cloudstack/md5/module.properties similarity index 100% rename from plugins/user-authenticators/md5/resources/META-INF/cloudstack/md5/module.properties rename to plugins/user-authenticators/md5/src/main/resources/META-INF/cloudstack/md5/module.properties diff --git a/plugins/user-authenticators/md5/resources/META-INF/cloudstack/md5/spring-md5-context.xml b/plugins/user-authenticators/md5/src/main/resources/META-INF/cloudstack/md5/spring-md5-context.xml similarity index 100% rename from plugins/user-authenticators/md5/resources/META-INF/cloudstack/md5/spring-md5-context.xml rename to plugins/user-authenticators/md5/src/main/resources/META-INF/cloudstack/md5/spring-md5-context.xml diff --git a/plugins/user-authenticators/md5/test/com/cloud/server/auth/MD5UserAuthenticatorTest.java b/plugins/user-authenticators/md5/src/test/java/com/cloud/server/auth/MD5UserAuthenticatorTest.java similarity index 100% rename from plugins/user-authenticators/md5/test/com/cloud/server/auth/MD5UserAuthenticatorTest.java rename to plugins/user-authenticators/md5/src/test/java/com/cloud/server/auth/MD5UserAuthenticatorTest.java diff --git a/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java b/plugins/user-authenticators/pbkdf2/src/main/java/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java similarity index 100% rename from plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java rename to plugins/user-authenticators/pbkdf2/src/main/java/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java diff --git a/plugins/user-authenticators/pbkdf2/resources/META-INF/cloudstack/pbkdf2/module.properties b/plugins/user-authenticators/pbkdf2/src/main/resources/META-INF/cloudstack/pbkdf2/module.properties similarity index 100% rename from plugins/user-authenticators/pbkdf2/resources/META-INF/cloudstack/pbkdf2/module.properties rename to plugins/user-authenticators/pbkdf2/src/main/resources/META-INF/cloudstack/pbkdf2/module.properties diff --git a/plugins/user-authenticators/pbkdf2/resources/META-INF/cloudstack/pbkdf2/spring-pbkdf2-context.xml b/plugins/user-authenticators/pbkdf2/src/main/resources/META-INF/cloudstack/pbkdf2/spring-pbkdf2-context.xml similarity index 100% rename from plugins/user-authenticators/pbkdf2/resources/META-INF/cloudstack/pbkdf2/spring-pbkdf2-context.xml rename to plugins/user-authenticators/pbkdf2/src/main/resources/META-INF/cloudstack/pbkdf2/spring-pbkdf2-context.xml diff --git a/plugins/user-authenticators/pbkdf2/test/org/apache/cloudstack/server/auth/PBKD2UserAuthenticatorTest.java b/plugins/user-authenticators/pbkdf2/src/test/java/org/apache/cloudstack/server/auth/PBKD2UserAuthenticatorTest.java similarity index 100% rename from plugins/user-authenticators/pbkdf2/test/org/apache/cloudstack/server/auth/PBKD2UserAuthenticatorTest.java rename to plugins/user-authenticators/pbkdf2/src/test/java/org/apache/cloudstack/server/auth/PBKD2UserAuthenticatorTest.java diff --git a/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java b/plugins/user-authenticators/plain-text/src/main/java/com/cloud/server/auth/PlainTextUserAuthenticator.java similarity index 100% rename from plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java rename to plugins/user-authenticators/plain-text/src/main/java/com/cloud/server/auth/PlainTextUserAuthenticator.java diff --git a/plugins/user-authenticators/plain-text/resources/META-INF/cloudstack/plaintext/module.properties b/plugins/user-authenticators/plain-text/src/main/resources/META-INF/cloudstack/plaintext/module.properties similarity index 100% rename from plugins/user-authenticators/plain-text/resources/META-INF/cloudstack/plaintext/module.properties rename to plugins/user-authenticators/plain-text/src/main/resources/META-INF/cloudstack/plaintext/module.properties diff --git a/plugins/user-authenticators/plain-text/resources/META-INF/cloudstack/plaintext/spring-plaintext-context.xml b/plugins/user-authenticators/plain-text/src/main/resources/META-INF/cloudstack/plaintext/spring-plaintext-context.xml similarity index 100% rename from plugins/user-authenticators/plain-text/resources/META-INF/cloudstack/plaintext/spring-plaintext-context.xml rename to plugins/user-authenticators/plain-text/src/main/resources/META-INF/cloudstack/plaintext/spring-plaintext-context.xml diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/AuthorizeSAMLSSOCmd.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/AuthorizeSAMLSSOCmd.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/AuthorizeSAMLSSOCmd.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/AuthorizeSAMLSSOCmd.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/GetServiceProviderMetaDataCmd.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/GetServiceProviderMetaDataCmd.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/GetServiceProviderMetaDataCmd.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/GetServiceProviderMetaDataCmd.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/ListIdpsCmd.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListIdpsCmd.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/ListIdpsCmd.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListIdpsCmd.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/ListSamlAuthorizationCmd.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListSamlAuthorizationCmd.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/ListSamlAuthorizationCmd.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListSamlAuthorizationCmd.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/response/IdpResponse.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/response/IdpResponse.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/response/IdpResponse.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/response/IdpResponse.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/response/SAMLMetaDataResponse.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/response/SAMLMetaDataResponse.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/response/SAMLMetaDataResponse.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/response/SAMLMetaDataResponse.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/response/SamlAuthorizationResponse.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/response/SamlAuthorizationResponse.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/response/SamlAuthorizationResponse.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/response/SamlAuthorizationResponse.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/response/SamlUserAccountResponse.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/response/SamlUserAccountResponse.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/response/SamlUserAccountResponse.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/response/SamlUserAccountResponse.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManager.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManager.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManager.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManager.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2UserAuthenticator.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2UserAuthenticator.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLPluginConstants.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLPluginConstants.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLPluginConstants.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLPluginConstants.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLProviderMetadata.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLProviderMetadata.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLProviderMetadata.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLProviderMetadata.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenDao.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLTokenDao.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenDao.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLTokenDao.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenDaoImpl.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLTokenDaoImpl.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenDaoImpl.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLTokenDaoImpl.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenVO.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLTokenVO.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenVO.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLTokenVO.java diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLUtils.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLUtils.java similarity index 100% rename from plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLUtils.java rename to plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLUtils.java diff --git a/plugins/user-authenticators/saml2/resources/META-INF/cloudstack/saml2/module.properties b/plugins/user-authenticators/saml2/src/main/resources/META-INF/cloudstack/saml2/module.properties similarity index 100% rename from plugins/user-authenticators/saml2/resources/META-INF/cloudstack/saml2/module.properties rename to plugins/user-authenticators/saml2/src/main/resources/META-INF/cloudstack/saml2/module.properties diff --git a/plugins/user-authenticators/saml2/resources/META-INF/cloudstack/saml2/spring-saml2-context.xml b/plugins/user-authenticators/saml2/src/main/resources/META-INF/cloudstack/saml2/spring-saml2-context.xml similarity index 100% rename from plugins/user-authenticators/saml2/resources/META-INF/cloudstack/saml2/spring-saml2-context.xml rename to plugins/user-authenticators/saml2/src/main/resources/META-INF/cloudstack/saml2/spring-saml2-context.xml diff --git a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/GetServiceProviderMetaDataCmdTest.java b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/GetServiceProviderMetaDataCmdTest.java similarity index 100% rename from plugins/user-authenticators/saml2/test/org/apache/cloudstack/GetServiceProviderMetaDataCmdTest.java rename to plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/GetServiceProviderMetaDataCmdTest.java diff --git a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/SAML2AuthManagerImplTest.java b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAML2AuthManagerImplTest.java similarity index 100% rename from plugins/user-authenticators/saml2/test/org/apache/cloudstack/SAML2AuthManagerImplTest.java rename to plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAML2AuthManagerImplTest.java diff --git a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/SAML2UserAuthenticatorTest.java b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAML2UserAuthenticatorTest.java similarity index 100% rename from plugins/user-authenticators/saml2/test/org/apache/cloudstack/SAML2UserAuthenticatorTest.java rename to plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAML2UserAuthenticatorTest.java diff --git a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/SAMLUtilsTest.java b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAMLUtilsTest.java similarity index 100% rename from plugins/user-authenticators/saml2/test/org/apache/cloudstack/SAMLUtilsTest.java rename to plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAMLUtilsTest.java diff --git a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java similarity index 100% rename from plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java rename to plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java diff --git a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java similarity index 100% rename from plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java rename to plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java diff --git a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmdTest.java b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmdTest.java similarity index 100% rename from plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmdTest.java rename to plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmdTest.java diff --git a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/saml/SAML2AuthManagerImplTest.java b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/saml/SAML2AuthManagerImplTest.java similarity index 100% rename from plugins/user-authenticators/saml2/test/org/apache/cloudstack/saml/SAML2AuthManagerImplTest.java rename to plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/saml/SAML2AuthManagerImplTest.java diff --git a/plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java b/plugins/user-authenticators/sha256salted/src/main/java/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java similarity index 100% rename from plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java rename to plugins/user-authenticators/sha256salted/src/main/java/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java diff --git a/plugins/user-authenticators/sha256salted/resources/META-INF/cloudstack/sha256salted/module.properties b/plugins/user-authenticators/sha256salted/src/main/resources/META-INF/cloudstack/sha256salted/module.properties similarity index 100% rename from plugins/user-authenticators/sha256salted/resources/META-INF/cloudstack/sha256salted/module.properties rename to plugins/user-authenticators/sha256salted/src/main/resources/META-INF/cloudstack/sha256salted/module.properties diff --git a/plugins/user-authenticators/sha256salted/resources/META-INF/cloudstack/sha256salted/spring-sha256salted-context.xml b/plugins/user-authenticators/sha256salted/src/main/resources/META-INF/cloudstack/sha256salted/spring-sha256salted-context.xml similarity index 100% rename from plugins/user-authenticators/sha256salted/resources/META-INF/cloudstack/sha256salted/spring-sha256salted-context.xml rename to plugins/user-authenticators/sha256salted/src/main/resources/META-INF/cloudstack/sha256salted/spring-sha256salted-context.xml diff --git a/plugins/user-authenticators/sha256salted/test/src/com/cloud/server/auth/test/AuthenticatorTest.java b/plugins/user-authenticators/sha256salted/src/test/java/com/cloud/server/auth/test/AuthenticatorTest.java similarity index 99% rename from plugins/user-authenticators/sha256salted/test/src/com/cloud/server/auth/test/AuthenticatorTest.java rename to plugins/user-authenticators/sha256salted/src/test/java/com/cloud/server/auth/test/AuthenticatorTest.java index 0a9bd2fa7c28..f770b74cd9e4 100644 --- a/plugins/user-authenticators/sha256salted/test/src/com/cloud/server/auth/test/AuthenticatorTest.java +++ b/plugins/user-authenticators/sha256salted/src/test/java/com/cloud/server/auth/test/AuthenticatorTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package src.com.cloud.server.auth.test; +package com.cloud.server.auth.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/pom.xml b/pom.xml index 3f096f081198..b1ff1021af13 100644 --- a/pom.xml +++ b/pom.xml @@ -208,7 +208,6 @@ framework client services - maven-standard quickcloud @@ -569,20 +568,6 @@ install - src - test - - - ${basedir}/resources - - - - - test/resources - - - ${basedir}/${cs.target.dir}/classes - ${basedir}/${cs.target.dir}/test-classes org.apache.maven.plugins diff --git a/quickcloud/pom.xml b/quickcloud/pom.xml index 2d882283a700..133fa9b3b630 100644 --- a/quickcloud/pom.xml +++ b/quickcloud/pom.xml @@ -23,8 +23,8 @@ Apache CloudStack Framework - QuickCloud org.apache.cloudstack - cloud-maven-standard + cloudstack 4.12.0.0-SNAPSHOT - ../maven-standard/pom.xml + ../pom.xml diff --git a/server/pom.xml b/server/pom.xml index a891bd12e3b8..8641703f5629 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -143,14 +143,6 @@ - - - test/resources - - %regex[.*[0-9]*To[0-9]*.*Test.*] - - - org.apache.maven.plugins diff --git a/server/src/com/cloud/account/SecurityManager.java b/server/src/main/java/com/cloud/account/SecurityManager.java similarity index 100% rename from server/src/com/cloud/account/SecurityManager.java rename to server/src/main/java/com/cloud/account/SecurityManager.java diff --git a/server/src/com/cloud/acl/AffinityGroupAccessChecker.java b/server/src/main/java/com/cloud/acl/AffinityGroupAccessChecker.java similarity index 100% rename from server/src/com/cloud/acl/AffinityGroupAccessChecker.java rename to server/src/main/java/com/cloud/acl/AffinityGroupAccessChecker.java diff --git a/server/src/com/cloud/acl/DomainChecker.java b/server/src/main/java/com/cloud/acl/DomainChecker.java similarity index 100% rename from server/src/com/cloud/acl/DomainChecker.java rename to server/src/main/java/com/cloud/acl/DomainChecker.java diff --git a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java similarity index 100% rename from server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java rename to server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java diff --git a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java similarity index 100% rename from server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java rename to server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java diff --git a/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java similarity index 100% rename from server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java rename to server/src/main/java/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java diff --git a/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/TestingAllocator.java similarity index 100% rename from server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java rename to server/src/main/java/com/cloud/agent/manager/allocator/impl/TestingAllocator.java diff --git a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java similarity index 100% rename from server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java rename to server/src/main/java/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java diff --git a/server/src/com/cloud/agent/manager/authn/AgentAuthnException.java b/server/src/main/java/com/cloud/agent/manager/authn/AgentAuthnException.java similarity index 100% rename from server/src/com/cloud/agent/manager/authn/AgentAuthnException.java rename to server/src/main/java/com/cloud/agent/manager/authn/AgentAuthnException.java diff --git a/server/src/com/cloud/agent/manager/authn/AgentAuthorizer.java b/server/src/main/java/com/cloud/agent/manager/authn/AgentAuthorizer.java similarity index 100% rename from server/src/com/cloud/agent/manager/authn/AgentAuthorizer.java rename to server/src/main/java/com/cloud/agent/manager/authn/AgentAuthorizer.java diff --git a/server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java b/server/src/main/java/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java similarity index 100% rename from server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java rename to server/src/main/java/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/main/java/com/cloud/alert/AlertManagerImpl.java similarity index 100% rename from server/src/com/cloud/alert/AlertManagerImpl.java rename to server/src/main/java/com/cloud/alert/AlertManagerImpl.java diff --git a/server/src/com/cloud/alert/ClusterAlertAdapter.java b/server/src/main/java/com/cloud/alert/ClusterAlertAdapter.java similarity index 100% rename from server/src/com/cloud/alert/ClusterAlertAdapter.java rename to server/src/main/java/com/cloud/alert/ClusterAlertAdapter.java diff --git a/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java b/server/src/main/java/com/cloud/alert/ConsoleProxyAlertAdapter.java similarity index 100% rename from server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java rename to server/src/main/java/com/cloud/alert/ConsoleProxyAlertAdapter.java diff --git a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java b/server/src/main/java/com/cloud/alert/SecondaryStorageVmAlertAdapter.java similarity index 100% rename from server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java rename to server/src/main/java/com/cloud/alert/SecondaryStorageVmAlertAdapter.java diff --git a/server/src/com/cloud/api/ApiAsyncJobDispatcher.java b/server/src/main/java/com/cloud/api/ApiAsyncJobDispatcher.java similarity index 100% rename from server/src/com/cloud/api/ApiAsyncJobDispatcher.java rename to server/src/main/java/com/cloud/api/ApiAsyncJobDispatcher.java diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/main/java/com/cloud/api/ApiDBUtils.java similarity index 100% rename from server/src/com/cloud/api/ApiDBUtils.java rename to server/src/main/java/com/cloud/api/ApiDBUtils.java diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/main/java/com/cloud/api/ApiDispatcher.java similarity index 100% rename from server/src/com/cloud/api/ApiDispatcher.java rename to server/src/main/java/com/cloud/api/ApiDispatcher.java diff --git a/server/src/com/cloud/api/ApiGsonHelper.java b/server/src/main/java/com/cloud/api/ApiGsonHelper.java similarity index 100% rename from server/src/com/cloud/api/ApiGsonHelper.java rename to server/src/main/java/com/cloud/api/ApiGsonHelper.java diff --git a/server/src/com/cloud/api/ApiResponseGsonHelper.java b/server/src/main/java/com/cloud/api/ApiResponseGsonHelper.java similarity index 100% rename from server/src/com/cloud/api/ApiResponseGsonHelper.java rename to server/src/main/java/com/cloud/api/ApiResponseGsonHelper.java diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java similarity index 100% rename from server/src/com/cloud/api/ApiResponseHelper.java rename to server/src/main/java/com/cloud/api/ApiResponseHelper.java diff --git a/server/src/com/cloud/api/ApiSerializerHelper.java b/server/src/main/java/com/cloud/api/ApiSerializerHelper.java similarity index 100% rename from server/src/com/cloud/api/ApiSerializerHelper.java rename to server/src/main/java/com/cloud/api/ApiSerializerHelper.java diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/main/java/com/cloud/api/ApiServer.java similarity index 100% rename from server/src/com/cloud/api/ApiServer.java rename to server/src/main/java/com/cloud/api/ApiServer.java diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/main/java/com/cloud/api/ApiServlet.java similarity index 100% rename from server/src/com/cloud/api/ApiServlet.java rename to server/src/main/java/com/cloud/api/ApiServlet.java diff --git a/server/src/com/cloud/api/EncodedStringTypeAdapter.java b/server/src/main/java/com/cloud/api/EncodedStringTypeAdapter.java similarity index 100% rename from server/src/com/cloud/api/EncodedStringTypeAdapter.java rename to server/src/main/java/com/cloud/api/EncodedStringTypeAdapter.java diff --git a/server/src/com/cloud/api/ResponseObjectTypeAdapter.java b/server/src/main/java/com/cloud/api/ResponseObjectTypeAdapter.java similarity index 100% rename from server/src/com/cloud/api/ResponseObjectTypeAdapter.java rename to server/src/main/java/com/cloud/api/ResponseObjectTypeAdapter.java diff --git a/server/src/com/cloud/api/SerializationContext.java b/server/src/main/java/com/cloud/api/SerializationContext.java similarity index 100% rename from server/src/com/cloud/api/SerializationContext.java rename to server/src/main/java/com/cloud/api/SerializationContext.java diff --git a/server/src/com/cloud/api/StringMapTypeAdapter.java b/server/src/main/java/com/cloud/api/StringMapTypeAdapter.java similarity index 100% rename from server/src/com/cloud/api/StringMapTypeAdapter.java rename to server/src/main/java/com/cloud/api/StringMapTypeAdapter.java diff --git a/server/src/com/cloud/api/auth/APIAuthenticationManagerImpl.java b/server/src/main/java/com/cloud/api/auth/APIAuthenticationManagerImpl.java similarity index 100% rename from server/src/com/cloud/api/auth/APIAuthenticationManagerImpl.java rename to server/src/main/java/com/cloud/api/auth/APIAuthenticationManagerImpl.java diff --git a/server/src/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java b/server/src/main/java/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java similarity index 100% rename from server/src/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java rename to server/src/main/java/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java diff --git a/server/src/com/cloud/api/auth/DefaultLogoutAPIAuthenticatorCmd.java b/server/src/main/java/com/cloud/api/auth/DefaultLogoutAPIAuthenticatorCmd.java similarity index 100% rename from server/src/com/cloud/api/auth/DefaultLogoutAPIAuthenticatorCmd.java rename to server/src/main/java/com/cloud/api/auth/DefaultLogoutAPIAuthenticatorCmd.java diff --git a/server/src/com/cloud/api/dispatch/CommandCreationWorker.java b/server/src/main/java/com/cloud/api/dispatch/CommandCreationWorker.java similarity index 100% rename from server/src/com/cloud/api/dispatch/CommandCreationWorker.java rename to server/src/main/java/com/cloud/api/dispatch/CommandCreationWorker.java diff --git a/server/src/com/cloud/api/dispatch/DispatchChain.java b/server/src/main/java/com/cloud/api/dispatch/DispatchChain.java similarity index 100% rename from server/src/com/cloud/api/dispatch/DispatchChain.java rename to server/src/main/java/com/cloud/api/dispatch/DispatchChain.java diff --git a/server/src/com/cloud/api/dispatch/DispatchChainFactory.java b/server/src/main/java/com/cloud/api/dispatch/DispatchChainFactory.java similarity index 100% rename from server/src/com/cloud/api/dispatch/DispatchChainFactory.java rename to server/src/main/java/com/cloud/api/dispatch/DispatchChainFactory.java diff --git a/server/src/com/cloud/api/dispatch/DispatchTask.java b/server/src/main/java/com/cloud/api/dispatch/DispatchTask.java similarity index 100% rename from server/src/com/cloud/api/dispatch/DispatchTask.java rename to server/src/main/java/com/cloud/api/dispatch/DispatchTask.java diff --git a/server/src/com/cloud/api/dispatch/DispatchWorker.java b/server/src/main/java/com/cloud/api/dispatch/DispatchWorker.java similarity index 100% rename from server/src/com/cloud/api/dispatch/DispatchWorker.java rename to server/src/main/java/com/cloud/api/dispatch/DispatchWorker.java diff --git a/server/src/com/cloud/api/dispatch/ParamGenericValidationWorker.java b/server/src/main/java/com/cloud/api/dispatch/ParamGenericValidationWorker.java similarity index 100% rename from server/src/com/cloud/api/dispatch/ParamGenericValidationWorker.java rename to server/src/main/java/com/cloud/api/dispatch/ParamGenericValidationWorker.java diff --git a/server/src/com/cloud/api/dispatch/ParamProcessWorker.java b/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java similarity index 100% rename from server/src/com/cloud/api/dispatch/ParamProcessWorker.java rename to server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java diff --git a/server/src/com/cloud/api/dispatch/ParamUnpackWorker.java b/server/src/main/java/com/cloud/api/dispatch/ParamUnpackWorker.java similarity index 100% rename from server/src/com/cloud/api/dispatch/ParamUnpackWorker.java rename to server/src/main/java/com/cloud/api/dispatch/ParamUnpackWorker.java diff --git a/server/src/com/cloud/api/dispatch/SpecificCmdValidationWorker.java b/server/src/main/java/com/cloud/api/dispatch/SpecificCmdValidationWorker.java similarity index 100% rename from server/src/com/cloud/api/dispatch/SpecificCmdValidationWorker.java rename to server/src/main/java/com/cloud/api/dispatch/SpecificCmdValidationWorker.java diff --git a/server/src/com/cloud/api/doc/Alert.java b/server/src/main/java/com/cloud/api/doc/Alert.java similarity index 100% rename from server/src/com/cloud/api/doc/Alert.java rename to server/src/main/java/com/cloud/api/doc/Alert.java diff --git a/server/src/com/cloud/api/doc/ApiXmlDocReader.java b/server/src/main/java/com/cloud/api/doc/ApiXmlDocReader.java similarity index 100% rename from server/src/com/cloud/api/doc/ApiXmlDocReader.java rename to server/src/main/java/com/cloud/api/doc/ApiXmlDocReader.java diff --git a/server/src/com/cloud/api/doc/ApiXmlDocWriter.java b/server/src/main/java/com/cloud/api/doc/ApiXmlDocWriter.java similarity index 100% rename from server/src/com/cloud/api/doc/ApiXmlDocWriter.java rename to server/src/main/java/com/cloud/api/doc/ApiXmlDocWriter.java diff --git a/server/src/com/cloud/api/doc/Argument.java b/server/src/main/java/com/cloud/api/doc/Argument.java similarity index 100% rename from server/src/com/cloud/api/doc/Argument.java rename to server/src/main/java/com/cloud/api/doc/Argument.java diff --git a/server/src/com/cloud/api/doc/Command.java b/server/src/main/java/com/cloud/api/doc/Command.java similarity index 100% rename from server/src/com/cloud/api/doc/Command.java rename to server/src/main/java/com/cloud/api/doc/Command.java diff --git a/server/src/com/cloud/api/query/MutualExclusiveIdsManagerBase.java b/server/src/main/java/com/cloud/api/query/MutualExclusiveIdsManagerBase.java similarity index 100% rename from server/src/com/cloud/api/query/MutualExclusiveIdsManagerBase.java rename to server/src/main/java/com/cloud/api/query/MutualExclusiveIdsManagerBase.java diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java similarity index 100% rename from server/src/com/cloud/api/query/QueryManagerImpl.java rename to server/src/main/java/com/cloud/api/query/QueryManagerImpl.java diff --git a/server/src/com/cloud/api/query/ViewResponseHelper.java b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java similarity index 100% rename from server/src/com/cloud/api/query/ViewResponseHelper.java rename to server/src/main/java/com/cloud/api/query/ViewResponseHelper.java diff --git a/server/src/com/cloud/api/query/dao/AccountJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/AccountJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/AccountJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/AccountJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/AccountJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/AccountJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/AffinityGroupJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/AffinityGroupJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/AffinityGroupJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/AsyncJobJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/AsyncJobJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/AsyncJobJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/AsyncJobJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/AsyncJobJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/AsyncJobJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/AsyncJobJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/AsyncJobJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/DataCenterJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/DataCenterJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/DiskOfferingJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/DiskOfferingJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/DiskOfferingJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/DiskOfferingJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/DomainJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/DomainJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/DomainJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/DomainJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/DomainJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/DomainJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/DomainJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/DomainJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/DomainRouterJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/GenericDaoBaseWithTagInformation.java b/server/src/main/java/com/cloud/api/query/dao/GenericDaoBaseWithTagInformation.java similarity index 100% rename from server/src/com/cloud/api/query/dao/GenericDaoBaseWithTagInformation.java rename to server/src/main/java/com/cloud/api/query/dao/GenericDaoBaseWithTagInformation.java diff --git a/server/src/com/cloud/api/query/dao/HostJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/HostJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/HostJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/HostJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/HostTagDao.java b/server/src/main/java/com/cloud/api/query/dao/HostTagDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/HostTagDao.java rename to server/src/main/java/com/cloud/api/query/dao/HostTagDao.java diff --git a/server/src/com/cloud/api/query/dao/HostTagDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/HostTagDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/HostTagDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/HostTagDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/ImageStoreJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/ImageStoreJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/ImageStoreJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/ImageStoreJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/InstanceGroupJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/InstanceGroupJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/InstanceGroupJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/InstanceGroupJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/ProjectAccountJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/ProjectAccountJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/ProjectAccountJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/ProjectAccountJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/ProjectInvitationJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/ProjectInvitationJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/ProjectInvitationJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/ProjectJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/ProjectJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/ProjectJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/ProjectJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ProjectJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/ProjectJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/ResourceTagJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/ResourceTagJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/ResourceTagJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/ResourceTagJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/SecurityGroupJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/SecurityGroupJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/SecurityGroupJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/SecurityGroupJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/ServiceOfferingJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/ServiceOfferingJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/StoragePoolJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/StoragePoolJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/StoragePoolJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/TemplateJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/TemplateJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/TemplateJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/UserAccountJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/UserAccountJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/UserAccountJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/UserAccountJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/UserVmJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/UserVmJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDao.java similarity index 100% rename from server/src/com/cloud/api/query/dao/VolumeJoinDao.java rename to server/src/main/java/com/cloud/api/query/dao/VolumeJoinDao.java diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java rename to server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java diff --git a/server/src/com/cloud/api/query/vo/AccountJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/AccountJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/AccountJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/AccountJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/AffinityGroupJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/AffinityGroupJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/AsyncJobJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/AsyncJobJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/BaseViewVO.java b/server/src/main/java/com/cloud/api/query/vo/BaseViewVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/BaseViewVO.java rename to server/src/main/java/com/cloud/api/query/vo/BaseViewVO.java diff --git a/server/src/com/cloud/api/query/vo/BaseViewWithTagInformationVO.java b/server/src/main/java/com/cloud/api/query/vo/BaseViewWithTagInformationVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/BaseViewWithTagInformationVO.java rename to server/src/main/java/com/cloud/api/query/vo/BaseViewWithTagInformationVO.java diff --git a/server/src/com/cloud/api/query/vo/ControlledViewEntity.java b/server/src/main/java/com/cloud/api/query/vo/ControlledViewEntity.java similarity index 100% rename from server/src/com/cloud/api/query/vo/ControlledViewEntity.java rename to server/src/main/java/com/cloud/api/query/vo/ControlledViewEntity.java diff --git a/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/DataCenterJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/DataCenterJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/DataCenterJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/DiskOfferingJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/DiskOfferingJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/DomainJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/DomainJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/DomainJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/DomainJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/DomainRouterJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/DomainRouterJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/EventJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/EventJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/EventJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/EventJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/HostJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/HostJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/HostJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/HostJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/HostTagVO.java b/server/src/main/java/com/cloud/api/query/vo/HostTagVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/HostTagVO.java rename to server/src/main/java/com/cloud/api/query/vo/HostTagVO.java diff --git a/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/ImageStoreJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/ImageStoreJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/InstanceGroupJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/InstanceGroupJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/ProjectAccountJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/ProjectAccountJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/ProjectInvitationJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/ProjectInvitationJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/ProjectJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/ProjectJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/ProjectJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/ProjectJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/ResourceTagJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/ResourceTagJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/SecurityGroupJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/SecurityGroupJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/StoragePoolJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/StoragePoolJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/TemplateJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/TemplateJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/TemplateJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/TemplateJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/UserAccountJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/UserAccountJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/UserAccountJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/UserVmJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/UserVmJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/UserVmJoinVO.java diff --git a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/VolumeJoinVO.java similarity index 100% rename from server/src/com/cloud/api/query/vo/VolumeJoinVO.java rename to server/src/main/java/com/cloud/api/query/vo/VolumeJoinVO.java diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java similarity index 100% rename from server/src/com/cloud/api/response/ApiResponseSerializer.java rename to server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java diff --git a/server/src/com/cloud/api/response/EmptyFieldExclusionStrategy.java b/server/src/main/java/com/cloud/api/response/EmptyFieldExclusionStrategy.java similarity index 100% rename from server/src/com/cloud/api/response/EmptyFieldExclusionStrategy.java rename to server/src/main/java/com/cloud/api/response/EmptyFieldExclusionStrategy.java diff --git a/server/src/com/cloud/api/response/SecurityGroupResultObject.java b/server/src/main/java/com/cloud/api/response/SecurityGroupResultObject.java similarity index 100% rename from server/src/com/cloud/api/response/SecurityGroupResultObject.java rename to server/src/main/java/com/cloud/api/response/SecurityGroupResultObject.java diff --git a/server/src/com/cloud/api/response/SecurityGroupRuleResultObject.java b/server/src/main/java/com/cloud/api/response/SecurityGroupRuleResultObject.java similarity index 100% rename from server/src/com/cloud/api/response/SecurityGroupRuleResultObject.java rename to server/src/main/java/com/cloud/api/response/SecurityGroupRuleResultObject.java diff --git a/server/src/com/cloud/async/AsyncJobResult.java b/server/src/main/java/com/cloud/async/AsyncJobResult.java similarity index 100% rename from server/src/com/cloud/async/AsyncJobResult.java rename to server/src/main/java/com/cloud/async/AsyncJobResult.java diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java similarity index 100% rename from server/src/com/cloud/capacity/CapacityManagerImpl.java rename to server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java diff --git a/server/src/com/cloud/capacity/ComputeCapacityListener.java b/server/src/main/java/com/cloud/capacity/ComputeCapacityListener.java similarity index 100% rename from server/src/com/cloud/capacity/ComputeCapacityListener.java rename to server/src/main/java/com/cloud/capacity/ComputeCapacityListener.java diff --git a/server/src/com/cloud/capacity/StorageCapacityListener.java b/server/src/main/java/com/cloud/capacity/StorageCapacityListener.java similarity index 100% rename from server/src/com/cloud/capacity/StorageCapacityListener.java rename to server/src/main/java/com/cloud/capacity/StorageCapacityListener.java diff --git a/server/src/com/cloud/network/NetworkMigrationManager.java b/server/src/main/java/com/cloud/cloud/network/NetworkMigrationManager.java similarity index 100% rename from server/src/com/cloud/network/NetworkMigrationManager.java rename to server/src/main/java/com/cloud/cloud/network/NetworkMigrationManager.java diff --git a/server/src/com/cloud/network/NetworkMigrationManagerImpl.java b/server/src/main/java/com/cloud/cloud/network/NetworkMigrationManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/NetworkMigrationManagerImpl.java rename to server/src/main/java/com/cloud/cloud/network/NetworkMigrationManagerImpl.java diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/main/java/com/cloud/configuration/Config.java similarity index 100% rename from server/src/com/cloud/configuration/Config.java rename to server/src/main/java/com/cloud/configuration/Config.java diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java similarity index 100% rename from server/src/com/cloud/configuration/ConfigurationManagerImpl.java rename to server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java diff --git a/server/src/com/cloud/configuration/ZoneConfig.java b/server/src/main/java/com/cloud/configuration/ZoneConfig.java similarity index 100% rename from server/src/com/cloud/configuration/ZoneConfig.java rename to server/src/main/java/com/cloud/configuration/ZoneConfig.java diff --git a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java b/server/src/main/java/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java similarity index 100% rename from server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java rename to server/src/main/java/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java diff --git a/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java b/server/src/main/java/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java similarity index 100% rename from server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java rename to server/src/main/java/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java diff --git a/server/src/com/cloud/consoleproxy/AgentHook.java b/server/src/main/java/com/cloud/consoleproxy/AgentHook.java similarity index 100% rename from server/src/com/cloud/consoleproxy/AgentHook.java rename to server/src/main/java/com/cloud/consoleproxy/AgentHook.java diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java b/server/src/main/java/com/cloud/consoleproxy/AgentHookBase.java similarity index 100% rename from server/src/com/cloud/consoleproxy/AgentHookBase.java rename to server/src/main/java/com/cloud/consoleproxy/AgentHookBase.java diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyAlertEventArgs.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyAlertEventArgs.java similarity index 100% rename from server/src/com/cloud/consoleproxy/ConsoleProxyAlertEventArgs.java rename to server/src/main/java/com/cloud/consoleproxy/ConsoleProxyAlertEventArgs.java diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java similarity index 100% rename from server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java rename to server/src/main/java/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyListener.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyListener.java similarity index 100% rename from server/src/com/cloud/consoleproxy/ConsoleProxyListener.java rename to server/src/main/java/com/cloud/consoleproxy/ConsoleProxyListener.java diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagementState.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagementState.java similarity index 100% rename from server/src/com/cloud/consoleproxy/ConsoleProxyManagementState.java rename to server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagementState.java diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManager.java similarity index 100% rename from server/src/com/cloud/consoleproxy/ConsoleProxyManager.java rename to server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManager.java diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java similarity index 100% rename from server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java rename to server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyService.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyService.java similarity index 100% rename from server/src/com/cloud/consoleproxy/ConsoleProxyService.java rename to server/src/main/java/com/cloud/consoleproxy/ConsoleProxyService.java diff --git a/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java b/server/src/main/java/com/cloud/consoleproxy/StaticConsoleProxyManager.java similarity index 100% rename from server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java rename to server/src/main/java/com/cloud/consoleproxy/StaticConsoleProxyManager.java diff --git a/server/src/com/cloud/dc/DedicatedResourceVO.java b/server/src/main/java/com/cloud/dc/DedicatedResourceVO.java similarity index 100% rename from server/src/com/cloud/dc/DedicatedResourceVO.java rename to server/src/main/java/com/cloud/dc/DedicatedResourceVO.java diff --git a/server/src/com/cloud/dc/dao/DedicatedResourceDao.java b/server/src/main/java/com/cloud/dc/dao/DedicatedResourceDao.java similarity index 100% rename from server/src/com/cloud/dc/dao/DedicatedResourceDao.java rename to server/src/main/java/com/cloud/dc/dao/DedicatedResourceDao.java diff --git a/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java b/server/src/main/java/com/cloud/dc/dao/DedicatedResourceDaoImpl.java similarity index 100% rename from server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java rename to server/src/main/java/com/cloud/dc/dao/DedicatedResourceDaoImpl.java diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java similarity index 100% rename from server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java rename to server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java similarity index 100% rename from server/src/com/cloud/deploy/FirstFitPlanner.java rename to server/src/main/java/com/cloud/deploy/FirstFitPlanner.java diff --git a/server/src/com/cloud/deploy/PlannerHostReservationVO.java b/server/src/main/java/com/cloud/deploy/PlannerHostReservationVO.java similarity index 100% rename from server/src/com/cloud/deploy/PlannerHostReservationVO.java rename to server/src/main/java/com/cloud/deploy/PlannerHostReservationVO.java diff --git a/server/src/com/cloud/deploy/dao/PlannerHostReservationDao.java b/server/src/main/java/com/cloud/deploy/dao/PlannerHostReservationDao.java similarity index 100% rename from server/src/com/cloud/deploy/dao/PlannerHostReservationDao.java rename to server/src/main/java/com/cloud/deploy/dao/PlannerHostReservationDao.java diff --git a/server/src/com/cloud/deploy/dao/PlannerHostReservationDaoImpl.java b/server/src/main/java/com/cloud/deploy/dao/PlannerHostReservationDaoImpl.java similarity index 100% rename from server/src/com/cloud/deploy/dao/PlannerHostReservationDaoImpl.java rename to server/src/main/java/com/cloud/deploy/dao/PlannerHostReservationDaoImpl.java diff --git a/server/src/com/cloud/event/ActionEventInterceptor.java b/server/src/main/java/com/cloud/event/ActionEventInterceptor.java similarity index 100% rename from server/src/com/cloud/event/ActionEventInterceptor.java rename to server/src/main/java/com/cloud/event/ActionEventInterceptor.java diff --git a/server/src/com/cloud/event/ActionEventUtils.java b/server/src/main/java/com/cloud/event/ActionEventUtils.java similarity index 100% rename from server/src/com/cloud/event/ActionEventUtils.java rename to server/src/main/java/com/cloud/event/ActionEventUtils.java diff --git a/server/src/com/cloud/event/AlertGenerator.java b/server/src/main/java/com/cloud/event/AlertGenerator.java similarity index 100% rename from server/src/com/cloud/event/AlertGenerator.java rename to server/src/main/java/com/cloud/event/AlertGenerator.java diff --git a/server/src/com/cloud/event/dao/EventJoinDao.java b/server/src/main/java/com/cloud/event/dao/EventJoinDao.java similarity index 100% rename from server/src/com/cloud/event/dao/EventJoinDao.java rename to server/src/main/java/com/cloud/event/dao/EventJoinDao.java diff --git a/server/src/com/cloud/event/dao/EventJoinDaoImpl.java b/server/src/main/java/com/cloud/event/dao/EventJoinDaoImpl.java similarity index 100% rename from server/src/com/cloud/event/dao/EventJoinDaoImpl.java rename to server/src/main/java/com/cloud/event/dao/EventJoinDaoImpl.java diff --git a/server/src/com/cloud/ha/AbstractInvestigatorImpl.java b/server/src/main/java/com/cloud/ha/AbstractInvestigatorImpl.java similarity index 100% rename from server/src/com/cloud/ha/AbstractInvestigatorImpl.java rename to server/src/main/java/com/cloud/ha/AbstractInvestigatorImpl.java diff --git a/server/src/com/cloud/ha/CheckOnAgentInvestigator.java b/server/src/main/java/com/cloud/ha/CheckOnAgentInvestigator.java similarity index 100% rename from server/src/com/cloud/ha/CheckOnAgentInvestigator.java rename to server/src/main/java/com/cloud/ha/CheckOnAgentInvestigator.java diff --git a/server/src/com/cloud/ha/HaWorkVO.java b/server/src/main/java/com/cloud/ha/HaWorkVO.java similarity index 100% rename from server/src/com/cloud/ha/HaWorkVO.java rename to server/src/main/java/com/cloud/ha/HaWorkVO.java diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java b/server/src/main/java/com/cloud/ha/HighAvailabilityManagerExtImpl.java similarity index 100% rename from server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java rename to server/src/main/java/com/cloud/ha/HighAvailabilityManagerExtImpl.java diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java similarity index 100% rename from server/src/com/cloud/ha/HighAvailabilityManagerImpl.java rename to server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java diff --git a/server/src/com/cloud/ha/KVMFencer.java b/server/src/main/java/com/cloud/ha/KVMFencer.java similarity index 100% rename from server/src/com/cloud/ha/KVMFencer.java rename to server/src/main/java/com/cloud/ha/KVMFencer.java diff --git a/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java b/server/src/main/java/com/cloud/ha/ManagementIPSystemVMInvestigator.java similarity index 100% rename from server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java rename to server/src/main/java/com/cloud/ha/ManagementIPSystemVMInvestigator.java diff --git a/server/src/com/cloud/ha/RecreatableFencer.java b/server/src/main/java/com/cloud/ha/RecreatableFencer.java similarity index 100% rename from server/src/com/cloud/ha/RecreatableFencer.java rename to server/src/main/java/com/cloud/ha/RecreatableFencer.java diff --git a/server/src/com/cloud/ha/UserVmDomRInvestigator.java b/server/src/main/java/com/cloud/ha/UserVmDomRInvestigator.java similarity index 100% rename from server/src/com/cloud/ha/UserVmDomRInvestigator.java rename to server/src/main/java/com/cloud/ha/UserVmDomRInvestigator.java diff --git a/server/src/com/cloud/ha/XenServerInvestigator.java b/server/src/main/java/com/cloud/ha/XenServerInvestigator.java similarity index 100% rename from server/src/com/cloud/ha/XenServerInvestigator.java rename to server/src/main/java/com/cloud/ha/XenServerInvestigator.java diff --git a/server/src/com/cloud/ha/dao/HighAvailabilityDao.java b/server/src/main/java/com/cloud/ha/dao/HighAvailabilityDao.java similarity index 100% rename from server/src/com/cloud/ha/dao/HighAvailabilityDao.java rename to server/src/main/java/com/cloud/ha/dao/HighAvailabilityDao.java diff --git a/server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java b/server/src/main/java/com/cloud/ha/dao/HighAvailabilityDaoImpl.java similarity index 100% rename from server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java rename to server/src/main/java/com/cloud/ha/dao/HighAvailabilityDaoImpl.java diff --git a/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java b/server/src/main/java/com/cloud/hypervisor/CloudZonesStartupProcessor.java similarity index 100% rename from server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java rename to server/src/main/java/com/cloud/hypervisor/CloudZonesStartupProcessor.java diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java similarity index 100% rename from server/src/com/cloud/hypervisor/HypervisorGuruBase.java rename to server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java b/server/src/main/java/com/cloud/hypervisor/HypervisorGuruManagerImpl.java similarity index 100% rename from server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java rename to server/src/main/java/com/cloud/hypervisor/HypervisorGuruManagerImpl.java diff --git a/server/src/com/cloud/hypervisor/KVMGuru.java b/server/src/main/java/com/cloud/hypervisor/KVMGuru.java similarity index 100% rename from server/src/com/cloud/hypervisor/KVMGuru.java rename to server/src/main/java/com/cloud/hypervisor/KVMGuru.java diff --git a/server/src/com/cloud/hypervisor/LXCGuru.java b/server/src/main/java/com/cloud/hypervisor/LXCGuru.java similarity index 100% rename from server/src/com/cloud/hypervisor/LXCGuru.java rename to server/src/main/java/com/cloud/hypervisor/LXCGuru.java diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java b/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java similarity index 100% rename from server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java rename to server/src/main/java/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java similarity index 100% rename from server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java rename to server/src/main/java/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java b/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java similarity index 100% rename from server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java rename to server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java b/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java similarity index 100% rename from server/src/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java rename to server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java diff --git a/server/src/com/cloud/metadata/ResourceMetaDataManager.java b/server/src/main/java/com/cloud/metadata/ResourceMetaDataManager.java similarity index 100% rename from server/src/com/cloud/metadata/ResourceMetaDataManager.java rename to server/src/main/java/com/cloud/metadata/ResourceMetaDataManager.java diff --git a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java b/server/src/main/java/com/cloud/metadata/ResourceMetaDataManagerImpl.java similarity index 100% rename from server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java rename to server/src/main/java/com/cloud/metadata/ResourceMetaDataManagerImpl.java diff --git a/server/src/com/cloud/network/ExternalDeviceUsageManager.java b/server/src/main/java/com/cloud/network/ExternalDeviceUsageManager.java similarity index 100% rename from server/src/com/cloud/network/ExternalDeviceUsageManager.java rename to server/src/main/java/com/cloud/network/ExternalDeviceUsageManager.java diff --git a/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java b/server/src/main/java/com/cloud/network/ExternalDeviceUsageManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java rename to server/src/main/java/com/cloud/network/ExternalDeviceUsageManagerImpl.java diff --git a/server/src/com/cloud/network/ExternalFirewallDeviceManager.java b/server/src/main/java/com/cloud/network/ExternalFirewallDeviceManager.java similarity index 100% rename from server/src/com/cloud/network/ExternalFirewallDeviceManager.java rename to server/src/main/java/com/cloud/network/ExternalFirewallDeviceManager.java diff --git a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java b/server/src/main/java/com/cloud/network/ExternalFirewallDeviceManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java rename to server/src/main/java/com/cloud/network/ExternalFirewallDeviceManagerImpl.java diff --git a/server/src/com/cloud/network/ExternalIpAddressAllocator.java b/server/src/main/java/com/cloud/network/ExternalIpAddressAllocator.java similarity index 100% rename from server/src/com/cloud/network/ExternalIpAddressAllocator.java rename to server/src/main/java/com/cloud/network/ExternalIpAddressAllocator.java diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java b/server/src/main/java/com/cloud/network/ExternalLoadBalancerDeviceManager.java similarity index 100% rename from server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java rename to server/src/main/java/com/cloud/network/ExternalLoadBalancerDeviceManager.java diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/main/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java rename to server/src/main/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java diff --git a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java b/server/src/main/java/com/cloud/network/ExternalNetworkDeviceManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java rename to server/src/main/java/com/cloud/network/ExternalNetworkDeviceManagerImpl.java diff --git a/server/src/com/cloud/network/IpAddrAllocator.java b/server/src/main/java/com/cloud/network/IpAddrAllocator.java similarity index 100% rename from server/src/com/cloud/network/IpAddrAllocator.java rename to server/src/main/java/com/cloud/network/IpAddrAllocator.java diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/IpAddressManagerImpl.java rename to server/src/main/java/com/cloud/network/IpAddressManagerImpl.java diff --git a/server/src/com/cloud/network/Ipv6AddressManager.java b/server/src/main/java/com/cloud/network/Ipv6AddressManager.java similarity index 100% rename from server/src/com/cloud/network/Ipv6AddressManager.java rename to server/src/main/java/com/cloud/network/Ipv6AddressManager.java diff --git a/server/src/com/cloud/network/Ipv6AddressManagerImpl.java b/server/src/main/java/com/cloud/network/Ipv6AddressManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/Ipv6AddressManagerImpl.java rename to server/src/main/java/com/cloud/network/Ipv6AddressManagerImpl.java diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/main/java/com/cloud/network/NetworkModelImpl.java similarity index 100% rename from server/src/com/cloud/network/NetworkModelImpl.java rename to server/src/main/java/com/cloud/network/NetworkModelImpl.java diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java similarity index 100% rename from server/src/com/cloud/network/NetworkServiceImpl.java rename to server/src/main/java/com/cloud/network/NetworkServiceImpl.java diff --git a/server/src/com/cloud/network/NetworkUsageManager.java b/server/src/main/java/com/cloud/network/NetworkUsageManager.java similarity index 100% rename from server/src/com/cloud/network/NetworkUsageManager.java rename to server/src/main/java/com/cloud/network/NetworkUsageManager.java diff --git a/server/src/com/cloud/network/NetworkUsageManagerImpl.java b/server/src/main/java/com/cloud/network/NetworkUsageManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/NetworkUsageManagerImpl.java rename to server/src/main/java/com/cloud/network/NetworkUsageManagerImpl.java diff --git a/server/src/com/cloud/network/PortProfileManagerImpl.java b/server/src/main/java/com/cloud/network/PortProfileManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/PortProfileManagerImpl.java rename to server/src/main/java/com/cloud/network/PortProfileManagerImpl.java diff --git a/server/src/com/cloud/network/SshKeysDistriMonitor.java b/server/src/main/java/com/cloud/network/SshKeysDistriMonitor.java similarity index 100% rename from server/src/com/cloud/network/SshKeysDistriMonitor.java rename to server/src/main/java/com/cloud/network/SshKeysDistriMonitor.java diff --git a/server/src/com/cloud/network/StorageNetworkManager.java b/server/src/main/java/com/cloud/network/StorageNetworkManager.java similarity index 100% rename from server/src/com/cloud/network/StorageNetworkManager.java rename to server/src/main/java/com/cloud/network/StorageNetworkManager.java diff --git a/server/src/com/cloud/network/StorageNetworkManagerImpl.java b/server/src/main/java/com/cloud/network/StorageNetworkManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/StorageNetworkManagerImpl.java rename to server/src/main/java/com/cloud/network/StorageNetworkManagerImpl.java diff --git a/server/src/com/cloud/network/as/AutoScaleManager.java b/server/src/main/java/com/cloud/network/as/AutoScaleManager.java similarity index 100% rename from server/src/com/cloud/network/as/AutoScaleManager.java rename to server/src/main/java/com/cloud/network/as/AutoScaleManager.java diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/as/AutoScaleManagerImpl.java rename to server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java diff --git a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java b/server/src/main/java/com/cloud/network/element/CloudZonesNetworkElement.java similarity index 100% rename from server/src/com/cloud/network/element/CloudZonesNetworkElement.java rename to server/src/main/java/com/cloud/network/element/CloudZonesNetworkElement.java diff --git a/server/src/com/cloud/network/element/ConfigDriveNetworkElement.java b/server/src/main/java/com/cloud/network/element/ConfigDriveNetworkElement.java similarity index 100% rename from server/src/com/cloud/network/element/ConfigDriveNetworkElement.java rename to server/src/main/java/com/cloud/network/element/ConfigDriveNetworkElement.java diff --git a/server/src/com/cloud/network/element/SecurityGroupElement.java b/server/src/main/java/com/cloud/network/element/SecurityGroupElement.java similarity index 100% rename from server/src/com/cloud/network/element/SecurityGroupElement.java rename to server/src/main/java/com/cloud/network/element/SecurityGroupElement.java diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java similarity index 100% rename from server/src/com/cloud/network/element/VirtualRouterElement.java rename to server/src/main/java/com/cloud/network/element/VirtualRouterElement.java diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/main/java/com/cloud/network/element/VpcVirtualRouterElement.java similarity index 100% rename from server/src/com/cloud/network/element/VpcVirtualRouterElement.java rename to server/src/main/java/com/cloud/network/element/VpcVirtualRouterElement.java diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/firewall/FirewallManagerImpl.java rename to server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/ControlNetworkGuru.java similarity index 100% rename from server/src/com/cloud/network/guru/ControlNetworkGuru.java rename to server/src/main/java/com/cloud/network/guru/ControlNetworkGuru.java diff --git a/server/src/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java similarity index 100% rename from server/src/com/cloud/network/guru/DirectNetworkGuru.java rename to server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java diff --git a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/DirectPodBasedNetworkGuru.java similarity index 100% rename from server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java rename to server/src/main/java/com/cloud/network/guru/DirectPodBasedNetworkGuru.java diff --git a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/ExternalGuestNetworkGuru.java similarity index 100% rename from server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java rename to server/src/main/java/com/cloud/network/guru/ExternalGuestNetworkGuru.java diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java similarity index 100% rename from server/src/com/cloud/network/guru/GuestNetworkGuru.java rename to server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java diff --git a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/PodBasedNetworkGuru.java similarity index 100% rename from server/src/com/cloud/network/guru/PodBasedNetworkGuru.java rename to server/src/main/java/com/cloud/network/guru/PodBasedNetworkGuru.java diff --git a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/PrivateNetworkGuru.java similarity index 100% rename from server/src/com/cloud/network/guru/PrivateNetworkGuru.java rename to server/src/main/java/com/cloud/network/guru/PrivateNetworkGuru.java diff --git a/server/src/com/cloud/network/guru/PublicNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/PublicNetworkGuru.java similarity index 100% rename from server/src/com/cloud/network/guru/PublicNetworkGuru.java rename to server/src/main/java/com/cloud/network/guru/PublicNetworkGuru.java diff --git a/server/src/com/cloud/network/guru/StorageNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/StorageNetworkGuru.java similarity index 100% rename from server/src/com/cloud/network/guru/StorageNetworkGuru.java rename to server/src/main/java/com/cloud/network/guru/StorageNetworkGuru.java diff --git a/server/src/com/cloud/network/lb/LBHealthCheckManager.java b/server/src/main/java/com/cloud/network/lb/LBHealthCheckManager.java similarity index 100% rename from server/src/com/cloud/network/lb/LBHealthCheckManager.java rename to server/src/main/java/com/cloud/network/lb/LBHealthCheckManager.java diff --git a/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java b/server/src/main/java/com/cloud/network/lb/LBHealthCheckManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java rename to server/src/main/java/com/cloud/network/lb/LBHealthCheckManagerImpl.java diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java rename to server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java diff --git a/server/src/com/cloud/network/router/CommandSetupHelper.java b/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java similarity index 100% rename from server/src/com/cloud/network/router/CommandSetupHelper.java rename to server/src/main/java/com/cloud/network/router/CommandSetupHelper.java diff --git a/server/src/com/cloud/network/router/NetworkHelper.java b/server/src/main/java/com/cloud/network/router/NetworkHelper.java similarity index 100% rename from server/src/com/cloud/network/router/NetworkHelper.java rename to server/src/main/java/com/cloud/network/router/NetworkHelper.java diff --git a/server/src/com/cloud/network/router/NetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java similarity index 100% rename from server/src/com/cloud/network/router/NetworkHelperImpl.java rename to server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java diff --git a/server/src/com/cloud/network/router/NicProfileHelper.java b/server/src/main/java/com/cloud/network/router/NicProfileHelper.java similarity index 100% rename from server/src/com/cloud/network/router/NicProfileHelper.java rename to server/src/main/java/com/cloud/network/router/NicProfileHelper.java diff --git a/server/src/com/cloud/network/router/NicProfileHelperImpl.java b/server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java similarity index 100% rename from server/src/com/cloud/network/router/NicProfileHelperImpl.java rename to server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java diff --git a/server/src/com/cloud/network/router/RouterControlHelper.java b/server/src/main/java/com/cloud/network/router/RouterControlHelper.java similarity index 100% rename from server/src/com/cloud/network/router/RouterControlHelper.java rename to server/src/main/java/com/cloud/network/router/RouterControlHelper.java diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java similarity index 100% rename from server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java rename to server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java rename to server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java diff --git a/server/src/com/cloud/network/router/VpcNetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/VpcNetworkHelperImpl.java similarity index 100% rename from server/src/com/cloud/network/router/VpcNetworkHelperImpl.java rename to server/src/main/java/com/cloud/network/router/VpcNetworkHelperImpl.java diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java b/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java similarity index 100% rename from server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java rename to server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java rename to server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java diff --git a/server/src/com/cloud/network/rules/AdvancedVpnRules.java b/server/src/main/java/com/cloud/network/rules/AdvancedVpnRules.java similarity index 100% rename from server/src/com/cloud/network/rules/AdvancedVpnRules.java rename to server/src/main/java/com/cloud/network/rules/AdvancedVpnRules.java diff --git a/server/src/com/cloud/network/rules/BasicVpnRules.java b/server/src/main/java/com/cloud/network/rules/BasicVpnRules.java similarity index 100% rename from server/src/com/cloud/network/rules/BasicVpnRules.java rename to server/src/main/java/com/cloud/network/rules/BasicVpnRules.java diff --git a/server/src/com/cloud/network/rules/DhcpEntryRules.java b/server/src/main/java/com/cloud/network/rules/DhcpEntryRules.java similarity index 100% rename from server/src/com/cloud/network/rules/DhcpEntryRules.java rename to server/src/main/java/com/cloud/network/rules/DhcpEntryRules.java diff --git a/server/src/com/cloud/network/rules/DhcpPvlanRules.java b/server/src/main/java/com/cloud/network/rules/DhcpPvlanRules.java similarity index 100% rename from server/src/com/cloud/network/rules/DhcpPvlanRules.java rename to server/src/main/java/com/cloud/network/rules/DhcpPvlanRules.java diff --git a/server/src/com/cloud/network/rules/DhcpSubNetRules.java b/server/src/main/java/com/cloud/network/rules/DhcpSubNetRules.java similarity index 100% rename from server/src/com/cloud/network/rules/DhcpSubNetRules.java rename to server/src/main/java/com/cloud/network/rules/DhcpSubNetRules.java diff --git a/server/src/com/cloud/network/rules/FirewallRules.java b/server/src/main/java/com/cloud/network/rules/FirewallRules.java similarity index 100% rename from server/src/com/cloud/network/rules/FirewallRules.java rename to server/src/main/java/com/cloud/network/rules/FirewallRules.java diff --git a/server/src/com/cloud/network/rules/IpAssociationRules.java b/server/src/main/java/com/cloud/network/rules/IpAssociationRules.java similarity index 100% rename from server/src/com/cloud/network/rules/IpAssociationRules.java rename to server/src/main/java/com/cloud/network/rules/IpAssociationRules.java diff --git a/server/src/com/cloud/network/rules/LoadBalancingRules.java b/server/src/main/java/com/cloud/network/rules/LoadBalancingRules.java similarity index 100% rename from server/src/com/cloud/network/rules/LoadBalancingRules.java rename to server/src/main/java/com/cloud/network/rules/LoadBalancingRules.java diff --git a/server/src/com/cloud/network/rules/NetworkAclsRules.java b/server/src/main/java/com/cloud/network/rules/NetworkAclsRules.java similarity index 100% rename from server/src/com/cloud/network/rules/NetworkAclsRules.java rename to server/src/main/java/com/cloud/network/rules/NetworkAclsRules.java diff --git a/server/src/com/cloud/network/rules/NicPlugInOutRules.java b/server/src/main/java/com/cloud/network/rules/NicPlugInOutRules.java similarity index 100% rename from server/src/com/cloud/network/rules/NicPlugInOutRules.java rename to server/src/main/java/com/cloud/network/rules/NicPlugInOutRules.java diff --git a/server/src/com/cloud/network/rules/PasswordToRouterRules.java b/server/src/main/java/com/cloud/network/rules/PasswordToRouterRules.java similarity index 100% rename from server/src/com/cloud/network/rules/PasswordToRouterRules.java rename to server/src/main/java/com/cloud/network/rules/PasswordToRouterRules.java diff --git a/server/src/com/cloud/network/rules/PrivateGatewayRules.java b/server/src/main/java/com/cloud/network/rules/PrivateGatewayRules.java similarity index 100% rename from server/src/com/cloud/network/rules/PrivateGatewayRules.java rename to server/src/main/java/com/cloud/network/rules/PrivateGatewayRules.java diff --git a/server/src/com/cloud/network/rules/RuleApplier.java b/server/src/main/java/com/cloud/network/rules/RuleApplier.java similarity index 100% rename from server/src/com/cloud/network/rules/RuleApplier.java rename to server/src/main/java/com/cloud/network/rules/RuleApplier.java diff --git a/server/src/com/cloud/network/rules/RuleApplierWrapper.java b/server/src/main/java/com/cloud/network/rules/RuleApplierWrapper.java similarity index 100% rename from server/src/com/cloud/network/rules/RuleApplierWrapper.java rename to server/src/main/java/com/cloud/network/rules/RuleApplierWrapper.java diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/rules/RulesManagerImpl.java rename to server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java diff --git a/server/src/com/cloud/network/rules/SshKeyToRouterRules.java b/server/src/main/java/com/cloud/network/rules/SshKeyToRouterRules.java similarity index 100% rename from server/src/com/cloud/network/rules/SshKeyToRouterRules.java rename to server/src/main/java/com/cloud/network/rules/SshKeyToRouterRules.java diff --git a/server/src/com/cloud/network/rules/StaticNatImpl.java b/server/src/main/java/com/cloud/network/rules/StaticNatImpl.java similarity index 100% rename from server/src/com/cloud/network/rules/StaticNatImpl.java rename to server/src/main/java/com/cloud/network/rules/StaticNatImpl.java diff --git a/server/src/com/cloud/network/rules/StaticNatRules.java b/server/src/main/java/com/cloud/network/rules/StaticNatRules.java similarity index 100% rename from server/src/com/cloud/network/rules/StaticNatRules.java rename to server/src/main/java/com/cloud/network/rules/StaticNatRules.java diff --git a/server/src/com/cloud/network/rules/StaticRoutesRules.java b/server/src/main/java/com/cloud/network/rules/StaticRoutesRules.java similarity index 100% rename from server/src/com/cloud/network/rules/StaticRoutesRules.java rename to server/src/main/java/com/cloud/network/rules/StaticRoutesRules.java diff --git a/server/src/com/cloud/network/rules/UserdataPwdRules.java b/server/src/main/java/com/cloud/network/rules/UserdataPwdRules.java similarity index 100% rename from server/src/com/cloud/network/rules/UserdataPwdRules.java rename to server/src/main/java/com/cloud/network/rules/UserdataPwdRules.java diff --git a/server/src/com/cloud/network/rules/UserdataToRouterRules.java b/server/src/main/java/com/cloud/network/rules/UserdataToRouterRules.java similarity index 100% rename from server/src/com/cloud/network/rules/UserdataToRouterRules.java rename to server/src/main/java/com/cloud/network/rules/UserdataToRouterRules.java diff --git a/server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java b/server/src/main/java/com/cloud/network/rules/VirtualNetworkApplianceFactory.java similarity index 100% rename from server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java rename to server/src/main/java/com/cloud/network/rules/VirtualNetworkApplianceFactory.java diff --git a/server/src/com/cloud/network/rules/VpcIpAssociationRules.java b/server/src/main/java/com/cloud/network/rules/VpcIpAssociationRules.java similarity index 100% rename from server/src/com/cloud/network/rules/VpcIpAssociationRules.java rename to server/src/main/java/com/cloud/network/rules/VpcIpAssociationRules.java diff --git a/server/src/com/cloud/network/security/LocalSecurityGroupWorkQueue.java b/server/src/main/java/com/cloud/network/security/LocalSecurityGroupWorkQueue.java similarity index 100% rename from server/src/com/cloud/network/security/LocalSecurityGroupWorkQueue.java rename to server/src/main/java/com/cloud/network/security/LocalSecurityGroupWorkQueue.java diff --git a/server/src/com/cloud/network/security/RuleUpdateLog.java b/server/src/main/java/com/cloud/network/security/RuleUpdateLog.java similarity index 100% rename from server/src/com/cloud/network/security/RuleUpdateLog.java rename to server/src/main/java/com/cloud/network/security/RuleUpdateLog.java diff --git a/server/src/com/cloud/network/security/SecurityGroupListener.java b/server/src/main/java/com/cloud/network/security/SecurityGroupListener.java similarity index 100% rename from server/src/com/cloud/network/security/SecurityGroupListener.java rename to server/src/main/java/com/cloud/network/security/SecurityGroupListener.java diff --git a/server/src/com/cloud/network/security/SecurityGroupManager.java b/server/src/main/java/com/cloud/network/security/SecurityGroupManager.java similarity index 100% rename from server/src/com/cloud/network/security/SecurityGroupManager.java rename to server/src/main/java/com/cloud/network/security/SecurityGroupManager.java diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/security/SecurityGroupManagerImpl.java rename to server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java similarity index 100% rename from server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java rename to server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerMBean.java b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerMBean.java similarity index 100% rename from server/src/com/cloud/network/security/SecurityGroupManagerMBean.java rename to server/src/main/java/com/cloud/network/security/SecurityGroupManagerMBean.java diff --git a/server/src/com/cloud/network/security/SecurityGroupWorkQueue.java b/server/src/main/java/com/cloud/network/security/SecurityGroupWorkQueue.java similarity index 100% rename from server/src/com/cloud/network/security/SecurityGroupWorkQueue.java rename to server/src/main/java/com/cloud/network/security/SecurityGroupWorkQueue.java diff --git a/server/src/com/cloud/network/security/SecurityGroupWorkTracker.java b/server/src/main/java/com/cloud/network/security/SecurityGroupWorkTracker.java similarity index 100% rename from server/src/com/cloud/network/security/SecurityGroupWorkTracker.java rename to server/src/main/java/com/cloud/network/security/SecurityGroupWorkTracker.java diff --git a/server/src/com/cloud/network/security/SecurityManagerMBeanImpl.java b/server/src/main/java/com/cloud/network/security/SecurityManagerMBeanImpl.java similarity index 100% rename from server/src/com/cloud/network/security/SecurityManagerMBeanImpl.java rename to server/src/main/java/com/cloud/network/security/SecurityManagerMBeanImpl.java diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java rename to server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java similarity index 100% rename from server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java rename to server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java diff --git a/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java b/server/src/main/java/com/cloud/network/vpc/PrivateGatewayProfile.java similarity index 100% rename from server/src/com/cloud/network/vpc/PrivateGatewayProfile.java rename to server/src/main/java/com/cloud/network/vpc/PrivateGatewayProfile.java diff --git a/server/src/com/cloud/network/vpc/PrivateIpAddress.java b/server/src/main/java/com/cloud/network/vpc/PrivateIpAddress.java similarity index 100% rename from server/src/com/cloud/network/vpc/PrivateIpAddress.java rename to server/src/main/java/com/cloud/network/vpc/PrivateIpAddress.java diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/vpc/VpcManagerImpl.java rename to server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java diff --git a/server/src/com/cloud/network/vpc/VpcPrivateGatewayTransactionCallable.java b/server/src/main/java/com/cloud/network/vpc/VpcPrivateGatewayTransactionCallable.java similarity index 100% rename from server/src/com/cloud/network/vpc/VpcPrivateGatewayTransactionCallable.java rename to server/src/main/java/com/cloud/network/vpc/VpcPrivateGatewayTransactionCallable.java diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/main/java/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java rename to server/src/main/java/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManager.java b/server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManager.java similarity index 100% rename from server/src/com/cloud/network/vpn/Site2SiteVpnManager.java rename to server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManager.java diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java similarity index 100% rename from server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java rename to server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java diff --git a/server/src/com/cloud/projects/ProjectManager.java b/server/src/main/java/com/cloud/projects/ProjectManager.java similarity index 100% rename from server/src/com/cloud/projects/ProjectManager.java rename to server/src/main/java/com/cloud/projects/ProjectManager.java diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/main/java/com/cloud/projects/ProjectManagerImpl.java similarity index 100% rename from server/src/com/cloud/projects/ProjectManagerImpl.java rename to server/src/main/java/com/cloud/projects/ProjectManagerImpl.java diff --git a/server/src/com/cloud/resource/DiscovererBase.java b/server/src/main/java/com/cloud/resource/DiscovererBase.java similarity index 100% rename from server/src/com/cloud/resource/DiscovererBase.java rename to server/src/main/java/com/cloud/resource/DiscovererBase.java diff --git a/server/src/com/cloud/resource/DummyHostDiscoverer.java b/server/src/main/java/com/cloud/resource/DummyHostDiscoverer.java similarity index 100% rename from server/src/com/cloud/resource/DummyHostDiscoverer.java rename to server/src/main/java/com/cloud/resource/DummyHostDiscoverer.java diff --git a/server/src/com/cloud/resource/DummyHostServerResource.java b/server/src/main/java/com/cloud/resource/DummyHostServerResource.java similarity index 100% rename from server/src/com/cloud/resource/DummyHostServerResource.java rename to server/src/main/java/com/cloud/resource/DummyHostServerResource.java diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java similarity index 100% rename from server/src/com/cloud/resource/ResourceManagerImpl.java rename to server/src/main/java/com/cloud/resource/ResourceManagerImpl.java diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java similarity index 100% rename from server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java rename to server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java diff --git a/server/src/com/cloud/server/ConfigurationServer.java b/server/src/main/java/com/cloud/server/ConfigurationServer.java similarity index 100% rename from server/src/com/cloud/server/ConfigurationServer.java rename to server/src/main/java/com/cloud/server/ConfigurationServer.java diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java similarity index 100% rename from server/src/com/cloud/server/ConfigurationServerImpl.java rename to server/src/main/java/com/cloud/server/ConfigurationServerImpl.java diff --git a/server/src/com/cloud/server/Criteria.java b/server/src/main/java/com/cloud/server/Criteria.java similarity index 100% rename from server/src/com/cloud/server/Criteria.java rename to server/src/main/java/com/cloud/server/Criteria.java diff --git a/server/src/com/cloud/server/LockMasterListener.java b/server/src/main/java/com/cloud/server/LockMasterListener.java similarity index 100% rename from server/src/com/cloud/server/LockMasterListener.java rename to server/src/main/java/com/cloud/server/LockMasterListener.java diff --git a/server/src/com/cloud/server/ManagementServer.java b/server/src/main/java/com/cloud/server/ManagementServer.java similarity index 100% rename from server/src/com/cloud/server/ManagementServer.java rename to server/src/main/java/com/cloud/server/ManagementServer.java diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java similarity index 100% rename from server/src/com/cloud/server/ManagementServerImpl.java rename to server/src/main/java/com/cloud/server/ManagementServerImpl.java diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/main/java/com/cloud/server/StatsCollector.java similarity index 100% rename from server/src/com/cloud/server/StatsCollector.java rename to server/src/main/java/com/cloud/server/StatsCollector.java diff --git a/server/src/com/cloud/server/api/response/BaremetalTemplateResponse.java b/server/src/main/java/com/cloud/server/api/response/BaremetalTemplateResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/BaremetalTemplateResponse.java rename to server/src/main/java/com/cloud/server/api/response/BaremetalTemplateResponse.java diff --git a/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java b/server/src/main/java/com/cloud/server/api/response/NwDeviceDhcpResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java rename to server/src/main/java/com/cloud/server/api/response/NwDeviceDhcpResponse.java diff --git a/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java b/server/src/main/java/com/cloud/server/api/response/NwDevicePxeServerResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java rename to server/src/main/java/com/cloud/server/api/response/NwDevicePxeServerResponse.java diff --git a/server/src/com/cloud/server/api/response/PxePingResponse.java b/server/src/main/java/com/cloud/server/api/response/PxePingResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/PxePingResponse.java rename to server/src/main/java/com/cloud/server/api/response/PxePingResponse.java diff --git a/server/src/com/cloud/server/api/response/netapp/AssociateLunCmdResponse.java b/server/src/main/java/com/cloud/server/api/response/netapp/AssociateLunCmdResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/netapp/AssociateLunCmdResponse.java rename to server/src/main/java/com/cloud/server/api/response/netapp/AssociateLunCmdResponse.java diff --git a/server/src/com/cloud/server/api/response/netapp/CreateLunCmdResponse.java b/server/src/main/java/com/cloud/server/api/response/netapp/CreateLunCmdResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/netapp/CreateLunCmdResponse.java rename to server/src/main/java/com/cloud/server/api/response/netapp/CreateLunCmdResponse.java diff --git a/server/src/com/cloud/server/api/response/netapp/CreateVolumeOnFilerCmdResponse.java b/server/src/main/java/com/cloud/server/api/response/netapp/CreateVolumeOnFilerCmdResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/netapp/CreateVolumeOnFilerCmdResponse.java rename to server/src/main/java/com/cloud/server/api/response/netapp/CreateVolumeOnFilerCmdResponse.java diff --git a/server/src/com/cloud/server/api/response/netapp/CreateVolumePoolCmdResponse.java b/server/src/main/java/com/cloud/server/api/response/netapp/CreateVolumePoolCmdResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/netapp/CreateVolumePoolCmdResponse.java rename to server/src/main/java/com/cloud/server/api/response/netapp/CreateVolumePoolCmdResponse.java diff --git a/server/src/com/cloud/server/api/response/netapp/DeleteLUNCmdResponse.java b/server/src/main/java/com/cloud/server/api/response/netapp/DeleteLUNCmdResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/netapp/DeleteLUNCmdResponse.java rename to server/src/main/java/com/cloud/server/api/response/netapp/DeleteLUNCmdResponse.java diff --git a/server/src/com/cloud/server/api/response/netapp/DeleteVolumeOnFilerCmdResponse.java b/server/src/main/java/com/cloud/server/api/response/netapp/DeleteVolumeOnFilerCmdResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/netapp/DeleteVolumeOnFilerCmdResponse.java rename to server/src/main/java/com/cloud/server/api/response/netapp/DeleteVolumeOnFilerCmdResponse.java diff --git a/server/src/com/cloud/server/api/response/netapp/DeleteVolumePoolCmdResponse.java b/server/src/main/java/com/cloud/server/api/response/netapp/DeleteVolumePoolCmdResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/netapp/DeleteVolumePoolCmdResponse.java rename to server/src/main/java/com/cloud/server/api/response/netapp/DeleteVolumePoolCmdResponse.java diff --git a/server/src/com/cloud/server/api/response/netapp/DissociateLunCmdResponse.java b/server/src/main/java/com/cloud/server/api/response/netapp/DissociateLunCmdResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/netapp/DissociateLunCmdResponse.java rename to server/src/main/java/com/cloud/server/api/response/netapp/DissociateLunCmdResponse.java diff --git a/server/src/com/cloud/server/api/response/netapp/ListLunsCmdResponse.java b/server/src/main/java/com/cloud/server/api/response/netapp/ListLunsCmdResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/netapp/ListLunsCmdResponse.java rename to server/src/main/java/com/cloud/server/api/response/netapp/ListLunsCmdResponse.java diff --git a/server/src/com/cloud/server/api/response/netapp/ListVolumePoolsCmdResponse.java b/server/src/main/java/com/cloud/server/api/response/netapp/ListVolumePoolsCmdResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/netapp/ListVolumePoolsCmdResponse.java rename to server/src/main/java/com/cloud/server/api/response/netapp/ListVolumePoolsCmdResponse.java diff --git a/server/src/com/cloud/server/api/response/netapp/ListVolumesOnFilerCmdResponse.java b/server/src/main/java/com/cloud/server/api/response/netapp/ListVolumesOnFilerCmdResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/netapp/ListVolumesOnFilerCmdResponse.java rename to server/src/main/java/com/cloud/server/api/response/netapp/ListVolumesOnFilerCmdResponse.java diff --git a/server/src/com/cloud/server/api/response/netapp/ModifyVolumePoolCmdResponse.java b/server/src/main/java/com/cloud/server/api/response/netapp/ModifyVolumePoolCmdResponse.java similarity index 100% rename from server/src/com/cloud/server/api/response/netapp/ModifyVolumePoolCmdResponse.java rename to server/src/main/java/com/cloud/server/api/response/netapp/ModifyVolumePoolCmdResponse.java diff --git a/server/src/com/cloud/server/auth/UserAuthenticator.java b/server/src/main/java/com/cloud/server/auth/UserAuthenticator.java similarity index 100% rename from server/src/com/cloud/server/auth/UserAuthenticator.java rename to server/src/main/java/com/cloud/server/auth/UserAuthenticator.java diff --git a/server/src/com/cloud/servlet/CloudStartupServlet.java b/server/src/main/java/com/cloud/servlet/CloudStartupServlet.java similarity index 100% rename from server/src/com/cloud/servlet/CloudStartupServlet.java rename to server/src/main/java/com/cloud/servlet/CloudStartupServlet.java diff --git a/server/src/com/cloud/servlet/ConsoleProxyClientParam.java b/server/src/main/java/com/cloud/servlet/ConsoleProxyClientParam.java similarity index 100% rename from server/src/com/cloud/servlet/ConsoleProxyClientParam.java rename to server/src/main/java/com/cloud/servlet/ConsoleProxyClientParam.java diff --git a/server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java b/server/src/main/java/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java similarity index 100% rename from server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java rename to server/src/main/java/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java similarity index 100% rename from server/src/com/cloud/servlet/ConsoleProxyServlet.java rename to server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java diff --git a/server/src/com/cloud/storage/CreateSnapshotPayload.java b/server/src/main/java/com/cloud/storage/CreateSnapshotPayload.java similarity index 100% rename from server/src/com/cloud/storage/CreateSnapshotPayload.java rename to server/src/main/java/com/cloud/storage/CreateSnapshotPayload.java diff --git a/server/src/com/cloud/storage/ImageStoreDetailsUtil.java b/server/src/main/java/com/cloud/storage/ImageStoreDetailsUtil.java similarity index 100% rename from server/src/com/cloud/storage/ImageStoreDetailsUtil.java rename to server/src/main/java/com/cloud/storage/ImageStoreDetailsUtil.java diff --git a/server/src/com/cloud/storage/ImageStoreUploadMonitor.java b/server/src/main/java/com/cloud/storage/ImageStoreUploadMonitor.java similarity index 100% rename from server/src/com/cloud/storage/ImageStoreUploadMonitor.java rename to server/src/main/java/com/cloud/storage/ImageStoreUploadMonitor.java diff --git a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java b/server/src/main/java/com/cloud/storage/ImageStoreUploadMonitorImpl.java similarity index 100% rename from server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java rename to server/src/main/java/com/cloud/storage/ImageStoreUploadMonitorImpl.java diff --git a/server/src/com/cloud/storage/LocalStoragePoolListener.java b/server/src/main/java/com/cloud/storage/LocalStoragePoolListener.java similarity index 100% rename from server/src/com/cloud/storage/LocalStoragePoolListener.java rename to server/src/main/java/com/cloud/storage/LocalStoragePoolListener.java diff --git a/server/src/com/cloud/storage/OCFS2Manager.java b/server/src/main/java/com/cloud/storage/OCFS2Manager.java similarity index 100% rename from server/src/com/cloud/storage/OCFS2Manager.java rename to server/src/main/java/com/cloud/storage/OCFS2Manager.java diff --git a/server/src/com/cloud/storage/OCFS2ManagerImpl.java b/server/src/main/java/com/cloud/storage/OCFS2ManagerImpl.java similarity index 100% rename from server/src/com/cloud/storage/OCFS2ManagerImpl.java rename to server/src/main/java/com/cloud/storage/OCFS2ManagerImpl.java diff --git a/server/src/com/cloud/storage/RegisterVolumePayload.java b/server/src/main/java/com/cloud/storage/RegisterVolumePayload.java similarity index 100% rename from server/src/com/cloud/storage/RegisterVolumePayload.java rename to server/src/main/java/com/cloud/storage/RegisterVolumePayload.java diff --git a/server/src/com/cloud/storage/ResizeVolumePayload.java b/server/src/main/java/com/cloud/storage/ResizeVolumePayload.java similarity index 100% rename from server/src/com/cloud/storage/ResizeVolumePayload.java rename to server/src/main/java/com/cloud/storage/ResizeVolumePayload.java diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java similarity index 100% rename from server/src/com/cloud/storage/StorageManagerImpl.java rename to server/src/main/java/com/cloud/storage/StorageManagerImpl.java diff --git a/server/src/com/cloud/storage/StoragePoolAutomation.java b/server/src/main/java/com/cloud/storage/StoragePoolAutomation.java similarity index 100% rename from server/src/com/cloud/storage/StoragePoolAutomation.java rename to server/src/main/java/com/cloud/storage/StoragePoolAutomation.java diff --git a/server/src/com/cloud/storage/StoragePoolAutomationImpl.java b/server/src/main/java/com/cloud/storage/StoragePoolAutomationImpl.java similarity index 100% rename from server/src/com/cloud/storage/StoragePoolAutomationImpl.java rename to server/src/main/java/com/cloud/storage/StoragePoolAutomationImpl.java diff --git a/server/src/com/cloud/storage/TemplateProfile.java b/server/src/main/java/com/cloud/storage/TemplateProfile.java similarity index 100% rename from server/src/com/cloud/storage/TemplateProfile.java rename to server/src/main/java/com/cloud/storage/TemplateProfile.java diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java similarity index 100% rename from server/src/com/cloud/storage/VolumeApiServiceImpl.java rename to server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java diff --git a/server/src/com/cloud/storage/download/DownloadAbandonedState.java b/server/src/main/java/com/cloud/storage/download/DownloadAbandonedState.java similarity index 100% rename from server/src/com/cloud/storage/download/DownloadAbandonedState.java rename to server/src/main/java/com/cloud/storage/download/DownloadAbandonedState.java diff --git a/server/src/com/cloud/storage/download/DownloadActiveState.java b/server/src/main/java/com/cloud/storage/download/DownloadActiveState.java similarity index 100% rename from server/src/com/cloud/storage/download/DownloadActiveState.java rename to server/src/main/java/com/cloud/storage/download/DownloadActiveState.java diff --git a/server/src/com/cloud/storage/download/DownloadCompleteState.java b/server/src/main/java/com/cloud/storage/download/DownloadCompleteState.java similarity index 100% rename from server/src/com/cloud/storage/download/DownloadCompleteState.java rename to server/src/main/java/com/cloud/storage/download/DownloadCompleteState.java diff --git a/server/src/com/cloud/storage/download/DownloadErrorState.java b/server/src/main/java/com/cloud/storage/download/DownloadErrorState.java similarity index 100% rename from server/src/com/cloud/storage/download/DownloadErrorState.java rename to server/src/main/java/com/cloud/storage/download/DownloadErrorState.java diff --git a/server/src/com/cloud/storage/download/DownloadInProgressState.java b/server/src/main/java/com/cloud/storage/download/DownloadInProgressState.java similarity index 100% rename from server/src/com/cloud/storage/download/DownloadInProgressState.java rename to server/src/main/java/com/cloud/storage/download/DownloadInProgressState.java diff --git a/server/src/com/cloud/storage/download/DownloadInactiveState.java b/server/src/main/java/com/cloud/storage/download/DownloadInactiveState.java similarity index 100% rename from server/src/com/cloud/storage/download/DownloadInactiveState.java rename to server/src/main/java/com/cloud/storage/download/DownloadInactiveState.java diff --git a/server/src/com/cloud/storage/download/DownloadListener.java b/server/src/main/java/com/cloud/storage/download/DownloadListener.java similarity index 100% rename from server/src/com/cloud/storage/download/DownloadListener.java rename to server/src/main/java/com/cloud/storage/download/DownloadListener.java diff --git a/server/src/com/cloud/storage/download/DownloadMonitor.java b/server/src/main/java/com/cloud/storage/download/DownloadMonitor.java similarity index 100% rename from server/src/com/cloud/storage/download/DownloadMonitor.java rename to server/src/main/java/com/cloud/storage/download/DownloadMonitor.java diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/main/java/com/cloud/storage/download/DownloadMonitorImpl.java similarity index 100% rename from server/src/com/cloud/storage/download/DownloadMonitorImpl.java rename to server/src/main/java/com/cloud/storage/download/DownloadMonitorImpl.java diff --git a/server/src/com/cloud/storage/download/DownloadState.java b/server/src/main/java/com/cloud/storage/download/DownloadState.java similarity index 100% rename from server/src/com/cloud/storage/download/DownloadState.java rename to server/src/main/java/com/cloud/storage/download/DownloadState.java diff --git a/server/src/com/cloud/storage/download/NotDownloadedState.java b/server/src/main/java/com/cloud/storage/download/NotDownloadedState.java similarity index 100% rename from server/src/com/cloud/storage/download/NotDownloadedState.java rename to server/src/main/java/com/cloud/storage/download/NotDownloadedState.java diff --git a/server/src/com/cloud/storage/listener/SnapshotStateListener.java b/server/src/main/java/com/cloud/storage/listener/SnapshotStateListener.java similarity index 100% rename from server/src/com/cloud/storage/listener/SnapshotStateListener.java rename to server/src/main/java/com/cloud/storage/listener/SnapshotStateListener.java diff --git a/server/src/com/cloud/storage/listener/StoragePoolMonitor.java b/server/src/main/java/com/cloud/storage/listener/StoragePoolMonitor.java similarity index 100% rename from server/src/com/cloud/storage/listener/StoragePoolMonitor.java rename to server/src/main/java/com/cloud/storage/listener/StoragePoolMonitor.java diff --git a/server/src/com/cloud/storage/listener/StorageSyncListener.java b/server/src/main/java/com/cloud/storage/listener/StorageSyncListener.java similarity index 100% rename from server/src/com/cloud/storage/listener/StorageSyncListener.java rename to server/src/main/java/com/cloud/storage/listener/StorageSyncListener.java diff --git a/server/src/com/cloud/storage/listener/VolumeStateListener.java b/server/src/main/java/com/cloud/storage/listener/VolumeStateListener.java similarity index 100% rename from server/src/com/cloud/storage/listener/VolumeStateListener.java rename to server/src/main/java/com/cloud/storage/listener/VolumeStateListener.java diff --git a/server/src/com/cloud/storage/monitor/StorageHostMonitor.java b/server/src/main/java/com/cloud/storage/monitor/StorageHostMonitor.java similarity index 100% rename from server/src/com/cloud/storage/monitor/StorageHostMonitor.java rename to server/src/main/java/com/cloud/storage/monitor/StorageHostMonitor.java diff --git a/server/src/com/cloud/storage/resource/DummySecondaryStorageResource.java b/server/src/main/java/com/cloud/storage/resource/DummySecondaryStorageResource.java similarity index 100% rename from server/src/com/cloud/storage/resource/DummySecondaryStorageResource.java rename to server/src/main/java/com/cloud/storage/resource/DummySecondaryStorageResource.java diff --git a/server/src/com/cloud/storage/secondary/SecStorageVmAlertEventArgs.java b/server/src/main/java/com/cloud/storage/secondary/SecStorageVmAlertEventArgs.java similarity index 100% rename from server/src/com/cloud/storage/secondary/SecStorageVmAlertEventArgs.java rename to server/src/main/java/com/cloud/storage/secondary/SecStorageVmAlertEventArgs.java diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java b/server/src/main/java/com/cloud/storage/secondary/SecondaryStorageListener.java similarity index 100% rename from server/src/com/cloud/storage/secondary/SecondaryStorageListener.java rename to server/src/main/java/com/cloud/storage/secondary/SecondaryStorageListener.java diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageVmAllocator.java b/server/src/main/java/com/cloud/storage/secondary/SecondaryStorageVmAllocator.java similarity index 100% rename from server/src/com/cloud/storage/secondary/SecondaryStorageVmAllocator.java rename to server/src/main/java/com/cloud/storage/secondary/SecondaryStorageVmAllocator.java diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java b/server/src/main/java/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java similarity index 100% rename from server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java rename to server/src/main/java/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java b/server/src/main/java/com/cloud/storage/secondary/SecondaryStorageVmManager.java similarity index 100% rename from server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java rename to server/src/main/java/com/cloud/storage/secondary/SecondaryStorageVmManager.java diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManager.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java similarity index 100% rename from server/src/com/cloud/storage/snapshot/SnapshotManager.java rename to server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java similarity index 100% rename from server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java rename to server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java diff --git a/server/src/com/cloud/storage/snapshot/SnapshotScheduler.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotScheduler.java similarity index 100% rename from server/src/com/cloud/storage/snapshot/SnapshotScheduler.java rename to server/src/main/java/com/cloud/storage/snapshot/SnapshotScheduler.java diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java similarity index 100% rename from server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java rename to server/src/main/java/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java diff --git a/server/src/com/cloud/storage/upload/NotUploadedState.java b/server/src/main/java/com/cloud/storage/upload/NotUploadedState.java similarity index 100% rename from server/src/com/cloud/storage/upload/NotUploadedState.java rename to server/src/main/java/com/cloud/storage/upload/NotUploadedState.java diff --git a/server/src/com/cloud/storage/upload/UploadAbandonedState.java b/server/src/main/java/com/cloud/storage/upload/UploadAbandonedState.java similarity index 100% rename from server/src/com/cloud/storage/upload/UploadAbandonedState.java rename to server/src/main/java/com/cloud/storage/upload/UploadAbandonedState.java diff --git a/server/src/com/cloud/storage/upload/UploadActiveState.java b/server/src/main/java/com/cloud/storage/upload/UploadActiveState.java similarity index 100% rename from server/src/com/cloud/storage/upload/UploadActiveState.java rename to server/src/main/java/com/cloud/storage/upload/UploadActiveState.java diff --git a/server/src/com/cloud/storage/upload/UploadCompleteState.java b/server/src/main/java/com/cloud/storage/upload/UploadCompleteState.java similarity index 100% rename from server/src/com/cloud/storage/upload/UploadCompleteState.java rename to server/src/main/java/com/cloud/storage/upload/UploadCompleteState.java diff --git a/server/src/com/cloud/storage/upload/UploadErrorState.java b/server/src/main/java/com/cloud/storage/upload/UploadErrorState.java similarity index 100% rename from server/src/com/cloud/storage/upload/UploadErrorState.java rename to server/src/main/java/com/cloud/storage/upload/UploadErrorState.java diff --git a/server/src/com/cloud/storage/upload/UploadInProgressState.java b/server/src/main/java/com/cloud/storage/upload/UploadInProgressState.java similarity index 100% rename from server/src/com/cloud/storage/upload/UploadInProgressState.java rename to server/src/main/java/com/cloud/storage/upload/UploadInProgressState.java diff --git a/server/src/com/cloud/storage/upload/UploadInactiveState.java b/server/src/main/java/com/cloud/storage/upload/UploadInactiveState.java similarity index 100% rename from server/src/com/cloud/storage/upload/UploadInactiveState.java rename to server/src/main/java/com/cloud/storage/upload/UploadInactiveState.java diff --git a/server/src/com/cloud/storage/upload/UploadListener.java b/server/src/main/java/com/cloud/storage/upload/UploadListener.java similarity index 100% rename from server/src/com/cloud/storage/upload/UploadListener.java rename to server/src/main/java/com/cloud/storage/upload/UploadListener.java diff --git a/server/src/com/cloud/storage/upload/UploadMonitor.java b/server/src/main/java/com/cloud/storage/upload/UploadMonitor.java similarity index 100% rename from server/src/com/cloud/storage/upload/UploadMonitor.java rename to server/src/main/java/com/cloud/storage/upload/UploadMonitor.java diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java b/server/src/main/java/com/cloud/storage/upload/UploadMonitorImpl.java similarity index 100% rename from server/src/com/cloud/storage/upload/UploadMonitorImpl.java rename to server/src/main/java/com/cloud/storage/upload/UploadMonitorImpl.java diff --git a/server/src/com/cloud/storage/upload/UploadState.java b/server/src/main/java/com/cloud/storage/upload/UploadState.java similarity index 100% rename from server/src/com/cloud/storage/upload/UploadState.java rename to server/src/main/java/com/cloud/storage/upload/UploadState.java diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/main/java/com/cloud/tags/TaggedResourceManagerImpl.java similarity index 100% rename from server/src/com/cloud/tags/TaggedResourceManagerImpl.java rename to server/src/main/java/com/cloud/tags/TaggedResourceManagerImpl.java diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java similarity index 100% rename from server/src/com/cloud/template/HypervisorTemplateAdapter.java rename to server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java diff --git a/server/src/com/cloud/template/TemplateAdapter.java b/server/src/main/java/com/cloud/template/TemplateAdapter.java similarity index 100% rename from server/src/com/cloud/template/TemplateAdapter.java rename to server/src/main/java/com/cloud/template/TemplateAdapter.java diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java b/server/src/main/java/com/cloud/template/TemplateAdapterBase.java similarity index 100% rename from server/src/com/cloud/template/TemplateAdapterBase.java rename to server/src/main/java/com/cloud/template/TemplateAdapterBase.java diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java similarity index 100% rename from server/src/com/cloud/template/TemplateManagerImpl.java rename to server/src/main/java/com/cloud/template/TemplateManagerImpl.java diff --git a/server/src/com/cloud/test/DatabaseConfig.java b/server/src/main/java/com/cloud/test/DatabaseConfig.java similarity index 100% rename from server/src/com/cloud/test/DatabaseConfig.java rename to server/src/main/java/com/cloud/test/DatabaseConfig.java diff --git a/server/src/com/cloud/test/IPRangeConfig.java b/server/src/main/java/com/cloud/test/IPRangeConfig.java similarity index 100% rename from server/src/com/cloud/test/IPRangeConfig.java rename to server/src/main/java/com/cloud/test/IPRangeConfig.java diff --git a/server/src/com/cloud/test/PodZoneConfig.java b/server/src/main/java/com/cloud/test/PodZoneConfig.java similarity index 100% rename from server/src/com/cloud/test/PodZoneConfig.java rename to server/src/main/java/com/cloud/test/PodZoneConfig.java diff --git a/server/src/com/cloud/test/TestAppender.java b/server/src/main/java/com/cloud/test/TestAppender.java similarity index 100% rename from server/src/com/cloud/test/TestAppender.java rename to server/src/main/java/com/cloud/test/TestAppender.java diff --git a/server/src/com/cloud/usage/UsageServiceImpl.java b/server/src/main/java/com/cloud/usage/UsageServiceImpl.java similarity index 100% rename from server/src/com/cloud/usage/UsageServiceImpl.java rename to server/src/main/java/com/cloud/usage/UsageServiceImpl.java diff --git a/server/src/com/cloud/user/AccountManager.java b/server/src/main/java/com/cloud/user/AccountManager.java similarity index 100% rename from server/src/com/cloud/user/AccountManager.java rename to server/src/main/java/com/cloud/user/AccountManager.java diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java similarity index 100% rename from server/src/com/cloud/user/AccountManagerImpl.java rename to server/src/main/java/com/cloud/user/AccountManagerImpl.java diff --git a/server/src/com/cloud/user/DomainManager.java b/server/src/main/java/com/cloud/user/DomainManager.java similarity index 100% rename from server/src/com/cloud/user/DomainManager.java rename to server/src/main/java/com/cloud/user/DomainManager.java diff --git a/server/src/com/cloud/user/DomainManagerImpl.java b/server/src/main/java/com/cloud/user/DomainManagerImpl.java similarity index 100% rename from server/src/com/cloud/user/DomainManagerImpl.java rename to server/src/main/java/com/cloud/user/DomainManagerImpl.java diff --git a/server/src/com/cloud/uuididentity/UUIDManagerImpl.java b/server/src/main/java/com/cloud/uuididentity/UUIDManagerImpl.java similarity index 100% rename from server/src/com/cloud/uuididentity/UUIDManagerImpl.java rename to server/src/main/java/com/cloud/uuididentity/UUIDManagerImpl.java diff --git a/server/src/com/cloud/vm/SystemVmLoadScanHandler.java b/server/src/main/java/com/cloud/vm/SystemVmLoadScanHandler.java similarity index 100% rename from server/src/com/cloud/vm/SystemVmLoadScanHandler.java rename to server/src/main/java/com/cloud/vm/SystemVmLoadScanHandler.java diff --git a/server/src/com/cloud/vm/SystemVmLoadScanner.java b/server/src/main/java/com/cloud/vm/SystemVmLoadScanner.java similarity index 100% rename from server/src/com/cloud/vm/SystemVmLoadScanner.java rename to server/src/main/java/com/cloud/vm/SystemVmLoadScanner.java diff --git a/server/src/com/cloud/vm/UserVmManager.java b/server/src/main/java/com/cloud/vm/UserVmManager.java similarity index 100% rename from server/src/com/cloud/vm/UserVmManager.java rename to server/src/main/java/com/cloud/vm/UserVmManager.java diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java similarity index 100% rename from server/src/com/cloud/vm/UserVmManagerImpl.java rename to server/src/main/java/com/cloud/vm/UserVmManagerImpl.java diff --git a/server/src/com/cloud/vm/UserVmStateListener.java b/server/src/main/java/com/cloud/vm/UserVmStateListener.java similarity index 100% rename from server/src/com/cloud/vm/UserVmStateListener.java rename to server/src/main/java/com/cloud/vm/UserVmStateListener.java diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java similarity index 100% rename from server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java rename to server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java diff --git a/server/src/com/cloud/vm/snapshot/VmWorkCreateVMSnapshot.java b/server/src/main/java/com/cloud/vm/snapshot/VmWorkCreateVMSnapshot.java similarity index 100% rename from server/src/com/cloud/vm/snapshot/VmWorkCreateVMSnapshot.java rename to server/src/main/java/com/cloud/vm/snapshot/VmWorkCreateVMSnapshot.java diff --git a/server/src/com/cloud/vm/snapshot/VmWorkDeleteAllVMSnapshots.java b/server/src/main/java/com/cloud/vm/snapshot/VmWorkDeleteAllVMSnapshots.java similarity index 100% rename from server/src/com/cloud/vm/snapshot/VmWorkDeleteAllVMSnapshots.java rename to server/src/main/java/com/cloud/vm/snapshot/VmWorkDeleteAllVMSnapshots.java diff --git a/server/src/com/cloud/vm/snapshot/VmWorkDeleteVMSnapshot.java b/server/src/main/java/com/cloud/vm/snapshot/VmWorkDeleteVMSnapshot.java similarity index 100% rename from server/src/com/cloud/vm/snapshot/VmWorkDeleteVMSnapshot.java rename to server/src/main/java/com/cloud/vm/snapshot/VmWorkDeleteVMSnapshot.java diff --git a/server/src/com/cloud/vm/snapshot/VmWorkRevertToVMSnapshot.java b/server/src/main/java/com/cloud/vm/snapshot/VmWorkRevertToVMSnapshot.java similarity index 100% rename from server/src/com/cloud/vm/snapshot/VmWorkRevertToVMSnapshot.java rename to server/src/main/java/com/cloud/vm/snapshot/VmWorkRevertToVMSnapshot.java diff --git a/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java b/server/src/main/java/org/apache/cloudstack/acl/RoleManagerImpl.java similarity index 100% rename from server/src/org/apache/cloudstack/acl/RoleManagerImpl.java rename to server/src/main/java/org/apache/cloudstack/acl/RoleManagerImpl.java diff --git a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java b/server/src/main/java/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java similarity index 100% rename from server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java rename to server/src/main/java/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java diff --git a/server/src/org/apache/cloudstack/annotation/AnnotationManagerImpl.java b/server/src/main/java/org/apache/cloudstack/annotation/AnnotationManagerImpl.java similarity index 100% rename from server/src/org/apache/cloudstack/annotation/AnnotationManagerImpl.java rename to server/src/main/java/org/apache/cloudstack/annotation/AnnotationManagerImpl.java diff --git a/server/src/org/apache/cloudstack/ca/CAManagerImpl.java b/server/src/main/java/org/apache/cloudstack/ca/CAManagerImpl.java similarity index 100% rename from server/src/org/apache/cloudstack/ca/CAManagerImpl.java rename to server/src/main/java/org/apache/cloudstack/ca/CAManagerImpl.java diff --git a/server/src/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java b/server/src/main/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManagerImpl.java similarity index 100% rename from server/src/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java rename to server/src/main/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManagerImpl.java diff --git a/server/src/org/apache/cloudstack/ha/HAManager.java b/server/src/main/java/org/apache/cloudstack/ha/HAManager.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/HAManager.java rename to server/src/main/java/org/apache/cloudstack/ha/HAManager.java diff --git a/server/src/org/apache/cloudstack/ha/HAManagerImpl.java b/server/src/main/java/org/apache/cloudstack/ha/HAManagerImpl.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/HAManagerImpl.java rename to server/src/main/java/org/apache/cloudstack/ha/HAManagerImpl.java diff --git a/server/src/org/apache/cloudstack/ha/HAResourceCounter.java b/server/src/main/java/org/apache/cloudstack/ha/HAResourceCounter.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/HAResourceCounter.java rename to server/src/main/java/org/apache/cloudstack/ha/HAResourceCounter.java diff --git a/server/src/org/apache/cloudstack/ha/provider/ActivityCheckerInterface.java b/server/src/main/java/org/apache/cloudstack/ha/provider/ActivityCheckerInterface.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/provider/ActivityCheckerInterface.java rename to server/src/main/java/org/apache/cloudstack/ha/provider/ActivityCheckerInterface.java diff --git a/server/src/org/apache/cloudstack/ha/provider/HACheckerException.java b/server/src/main/java/org/apache/cloudstack/ha/provider/HACheckerException.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/provider/HACheckerException.java rename to server/src/main/java/org/apache/cloudstack/ha/provider/HACheckerException.java diff --git a/server/src/org/apache/cloudstack/ha/provider/HAFenceException.java b/server/src/main/java/org/apache/cloudstack/ha/provider/HAFenceException.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/provider/HAFenceException.java rename to server/src/main/java/org/apache/cloudstack/ha/provider/HAFenceException.java diff --git a/server/src/org/apache/cloudstack/ha/provider/HAProvider.java b/server/src/main/java/org/apache/cloudstack/ha/provider/HAProvider.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/provider/HAProvider.java rename to server/src/main/java/org/apache/cloudstack/ha/provider/HAProvider.java diff --git a/server/src/org/apache/cloudstack/ha/provider/HARecoveryException.java b/server/src/main/java/org/apache/cloudstack/ha/provider/HARecoveryException.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/provider/HARecoveryException.java rename to server/src/main/java/org/apache/cloudstack/ha/provider/HARecoveryException.java diff --git a/server/src/org/apache/cloudstack/ha/provider/HealthCheckerInterface.java b/server/src/main/java/org/apache/cloudstack/ha/provider/HealthCheckerInterface.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/provider/HealthCheckerInterface.java rename to server/src/main/java/org/apache/cloudstack/ha/provider/HealthCheckerInterface.java diff --git a/server/src/org/apache/cloudstack/ha/provider/HostHAProvider.java b/server/src/main/java/org/apache/cloudstack/ha/provider/HostHAProvider.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/provider/HostHAProvider.java rename to server/src/main/java/org/apache/cloudstack/ha/provider/HostHAProvider.java diff --git a/server/src/org/apache/cloudstack/ha/provider/host/HAAbstractHostProvider.java b/server/src/main/java/org/apache/cloudstack/ha/provider/host/HAAbstractHostProvider.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/provider/host/HAAbstractHostProvider.java rename to server/src/main/java/org/apache/cloudstack/ha/provider/host/HAAbstractHostProvider.java diff --git a/server/src/org/apache/cloudstack/ha/task/ActivityCheckTask.java b/server/src/main/java/org/apache/cloudstack/ha/task/ActivityCheckTask.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/task/ActivityCheckTask.java rename to server/src/main/java/org/apache/cloudstack/ha/task/ActivityCheckTask.java diff --git a/server/src/org/apache/cloudstack/ha/task/BaseHATask.java b/server/src/main/java/org/apache/cloudstack/ha/task/BaseHATask.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/task/BaseHATask.java rename to server/src/main/java/org/apache/cloudstack/ha/task/BaseHATask.java diff --git a/server/src/org/apache/cloudstack/ha/task/FenceTask.java b/server/src/main/java/org/apache/cloudstack/ha/task/FenceTask.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/task/FenceTask.java rename to server/src/main/java/org/apache/cloudstack/ha/task/FenceTask.java diff --git a/server/src/org/apache/cloudstack/ha/task/HealthCheckTask.java b/server/src/main/java/org/apache/cloudstack/ha/task/HealthCheckTask.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/task/HealthCheckTask.java rename to server/src/main/java/org/apache/cloudstack/ha/task/HealthCheckTask.java diff --git a/server/src/org/apache/cloudstack/ha/task/RecoveryTask.java b/server/src/main/java/org/apache/cloudstack/ha/task/RecoveryTask.java similarity index 100% rename from server/src/org/apache/cloudstack/ha/task/RecoveryTask.java rename to server/src/main/java/org/apache/cloudstack/ha/task/RecoveryTask.java diff --git a/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java b/server/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java similarity index 100% rename from server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java rename to server/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java diff --git a/server/src/org/apache/cloudstack/network/ssl/CertServiceImpl.java b/server/src/main/java/org/apache/cloudstack/network/ssl/CertServiceImpl.java similarity index 100% rename from server/src/org/apache/cloudstack/network/ssl/CertServiceImpl.java rename to server/src/main/java/org/apache/cloudstack/network/ssl/CertServiceImpl.java diff --git a/server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java b/server/src/main/java/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java similarity index 100% rename from server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java rename to server/src/main/java/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java diff --git a/server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java b/server/src/main/java/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java similarity index 100% rename from server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java rename to server/src/main/java/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java diff --git a/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java b/server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkTopology.java similarity index 100% rename from server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java rename to server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkTopology.java diff --git a/server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java b/server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java similarity index 100% rename from server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java rename to server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java diff --git a/server/src/org/apache/cloudstack/network/topology/NetworkTopology.java b/server/src/main/java/org/apache/cloudstack/network/topology/NetworkTopology.java similarity index 100% rename from server/src/org/apache/cloudstack/network/topology/NetworkTopology.java rename to server/src/main/java/org/apache/cloudstack/network/topology/NetworkTopology.java diff --git a/server/src/org/apache/cloudstack/network/topology/NetworkTopologyContext.java b/server/src/main/java/org/apache/cloudstack/network/topology/NetworkTopologyContext.java similarity index 100% rename from server/src/org/apache/cloudstack/network/topology/NetworkTopologyContext.java rename to server/src/main/java/org/apache/cloudstack/network/topology/NetworkTopologyContext.java diff --git a/server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java b/server/src/main/java/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java similarity index 100% rename from server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java rename to server/src/main/java/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java diff --git a/server/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImpl.java b/server/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImpl.java similarity index 100% rename from server/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImpl.java rename to server/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImpl.java diff --git a/server/src/org/apache/cloudstack/outofbandmanagement/PowerOperationTask.java b/server/src/main/java/org/apache/cloudstack/outofbandmanagement/PowerOperationTask.java similarity index 100% rename from server/src/org/apache/cloudstack/outofbandmanagement/PowerOperationTask.java rename to server/src/main/java/org/apache/cloudstack/outofbandmanagement/PowerOperationTask.java diff --git a/server/src/org/apache/cloudstack/poll/BackgroundPollManagerImpl.java b/server/src/main/java/org/apache/cloudstack/poll/BackgroundPollManagerImpl.java similarity index 100% rename from server/src/org/apache/cloudstack/poll/BackgroundPollManagerImpl.java rename to server/src/main/java/org/apache/cloudstack/poll/BackgroundPollManagerImpl.java diff --git a/server/src/org/apache/cloudstack/region/RegionAccount.java b/server/src/main/java/org/apache/cloudstack/region/RegionAccount.java similarity index 100% rename from server/src/org/apache/cloudstack/region/RegionAccount.java rename to server/src/main/java/org/apache/cloudstack/region/RegionAccount.java diff --git a/server/src/org/apache/cloudstack/region/RegionDomain.java b/server/src/main/java/org/apache/cloudstack/region/RegionDomain.java similarity index 100% rename from server/src/org/apache/cloudstack/region/RegionDomain.java rename to server/src/main/java/org/apache/cloudstack/region/RegionDomain.java diff --git a/server/src/org/apache/cloudstack/region/RegionManager.java b/server/src/main/java/org/apache/cloudstack/region/RegionManager.java similarity index 100% rename from server/src/org/apache/cloudstack/region/RegionManager.java rename to server/src/main/java/org/apache/cloudstack/region/RegionManager.java diff --git a/server/src/org/apache/cloudstack/region/RegionManagerImpl.java b/server/src/main/java/org/apache/cloudstack/region/RegionManagerImpl.java similarity index 100% rename from server/src/org/apache/cloudstack/region/RegionManagerImpl.java rename to server/src/main/java/org/apache/cloudstack/region/RegionManagerImpl.java diff --git a/server/src/org/apache/cloudstack/region/RegionServiceImpl.java b/server/src/main/java/org/apache/cloudstack/region/RegionServiceImpl.java similarity index 100% rename from server/src/org/apache/cloudstack/region/RegionServiceImpl.java rename to server/src/main/java/org/apache/cloudstack/region/RegionServiceImpl.java diff --git a/server/src/org/apache/cloudstack/region/RegionServiceProvider.java b/server/src/main/java/org/apache/cloudstack/region/RegionServiceProvider.java similarity index 100% rename from server/src/org/apache/cloudstack/region/RegionServiceProvider.java rename to server/src/main/java/org/apache/cloudstack/region/RegionServiceProvider.java diff --git a/server/src/org/apache/cloudstack/region/RegionUser.java b/server/src/main/java/org/apache/cloudstack/region/RegionUser.java similarity index 100% rename from server/src/org/apache/cloudstack/region/RegionUser.java rename to server/src/main/java/org/apache/cloudstack/region/RegionUser.java diff --git a/server/src/org/apache/cloudstack/region/RegionsApiUtil.java b/server/src/main/java/org/apache/cloudstack/region/RegionsApiUtil.java similarity index 100% rename from server/src/org/apache/cloudstack/region/RegionsApiUtil.java rename to server/src/main/java/org/apache/cloudstack/region/RegionsApiUtil.java diff --git a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java b/server/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java similarity index 100% rename from server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java rename to server/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java diff --git a/server/src/org/apache/cloudstack/region/gslb/GslbServiceProvider.java b/server/src/main/java/org/apache/cloudstack/region/gslb/GslbServiceProvider.java similarity index 100% rename from server/src/org/apache/cloudstack/region/gslb/GslbServiceProvider.java rename to server/src/main/java/org/apache/cloudstack/region/gslb/GslbServiceProvider.java diff --git a/server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java b/server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinition.java similarity index 100% rename from server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java rename to server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinition.java diff --git a/server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java b/server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java similarity index 100% rename from server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java rename to server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java diff --git a/server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java b/server/src/main/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java similarity index 100% rename from server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java rename to server/src/main/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java diff --git a/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml rename to server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml diff --git a/server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml rename to server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml diff --git a/server/resources/META-INF/cloudstack/server-alert-adapter-backend/module.properties b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/module.properties similarity index 100% rename from server/resources/META-INF/cloudstack/server-alert-adapter-backend/module.properties rename to server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/module.properties diff --git a/server/resources/META-INF/cloudstack/server-alert-adapter-backend/spring-server-alert-adapter-backend-context.xml b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/spring-server-alert-adapter-backend-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/server-alert-adapter-backend/spring-server-alert-adapter-backend-context.xml rename to server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/spring-server-alert-adapter-backend-context.xml diff --git a/server/resources/META-INF/cloudstack/server-alert-adapter-compute/module.properties b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/module.properties similarity index 100% rename from server/resources/META-INF/cloudstack/server-alert-adapter-compute/module.properties rename to server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/module.properties diff --git a/server/resources/META-INF/cloudstack/server-alert-adapter-compute/spring-server-alert-adapter-compute-context.xml b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/spring-server-alert-adapter-compute-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/server-alert-adapter-compute/spring-server-alert-adapter-compute-context.xml rename to server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/spring-server-alert-adapter-compute-context.xml diff --git a/server/resources/META-INF/cloudstack/server-alert-adapter-storage/module.properties b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/module.properties similarity index 100% rename from server/resources/META-INF/cloudstack/server-alert-adapter-storage/module.properties rename to server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/module.properties diff --git a/server/resources/META-INF/cloudstack/server-alert-adapter-storage/spring-server-alert-adapter-storage-context.xml b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/spring-server-alert-adapter-storage-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/server-alert-adapter-storage/spring-server-alert-adapter-storage-context.xml rename to server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/spring-server-alert-adapter-storage-context.xml diff --git a/server/resources/META-INF/cloudstack/server-allocator/module.properties b/server/src/main/resources/META-INF/cloudstack/server-allocator/module.properties similarity index 100% rename from server/resources/META-INF/cloudstack/server-allocator/module.properties rename to server/src/main/resources/META-INF/cloudstack/server-allocator/module.properties diff --git a/server/resources/META-INF/cloudstack/server-allocator/spring-server-allocator-context.xml b/server/src/main/resources/META-INF/cloudstack/server-allocator/spring-server-allocator-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/server-allocator/spring-server-allocator-context.xml rename to server/src/main/resources/META-INF/cloudstack/server-allocator/spring-server-allocator-context.xml diff --git a/server/resources/META-INF/cloudstack/server-api/module.properties b/server/src/main/resources/META-INF/cloudstack/server-api/module.properties similarity index 100% rename from server/resources/META-INF/cloudstack/server-api/module.properties rename to server/src/main/resources/META-INF/cloudstack/server-api/module.properties diff --git a/server/resources/META-INF/cloudstack/server-api/spring-server-api-context.xml b/server/src/main/resources/META-INF/cloudstack/server-api/spring-server-api-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/server-api/spring-server-api-context.xml rename to server/src/main/resources/META-INF/cloudstack/server-api/spring-server-api-context.xml diff --git a/server/resources/META-INF/cloudstack/server-compute/module.properties b/server/src/main/resources/META-INF/cloudstack/server-compute/module.properties similarity index 100% rename from server/resources/META-INF/cloudstack/server-compute/module.properties rename to server/src/main/resources/META-INF/cloudstack/server-compute/module.properties diff --git a/server/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml b/server/src/main/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml rename to server/src/main/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml diff --git a/server/resources/META-INF/cloudstack/server-discoverer/module.properties b/server/src/main/resources/META-INF/cloudstack/server-discoverer/module.properties similarity index 100% rename from server/resources/META-INF/cloudstack/server-discoverer/module.properties rename to server/src/main/resources/META-INF/cloudstack/server-discoverer/module.properties diff --git a/server/resources/META-INF/cloudstack/server-discoverer/spring-server-discoverer-context.xml b/server/src/main/resources/META-INF/cloudstack/server-discoverer/spring-server-discoverer-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/server-discoverer/spring-server-discoverer-context.xml rename to server/src/main/resources/META-INF/cloudstack/server-discoverer/spring-server-discoverer-context.xml diff --git a/server/resources/META-INF/cloudstack/server-fencer/module.properties b/server/src/main/resources/META-INF/cloudstack/server-fencer/module.properties similarity index 100% rename from server/resources/META-INF/cloudstack/server-fencer/module.properties rename to server/src/main/resources/META-INF/cloudstack/server-fencer/module.properties diff --git a/server/resources/META-INF/cloudstack/server-fencer/spring-server-fencer-context.xml b/server/src/main/resources/META-INF/cloudstack/server-fencer/spring-server-fencer-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/server-fencer/spring-server-fencer-context.xml rename to server/src/main/resources/META-INF/cloudstack/server-fencer/spring-server-fencer-context.xml diff --git a/server/resources/META-INF/cloudstack/server-investigator/module.properties b/server/src/main/resources/META-INF/cloudstack/server-investigator/module.properties similarity index 100% rename from server/resources/META-INF/cloudstack/server-investigator/module.properties rename to server/src/main/resources/META-INF/cloudstack/server-investigator/module.properties diff --git a/server/resources/META-INF/cloudstack/server-investigator/spring-server-investigator-context.xml b/server/src/main/resources/META-INF/cloudstack/server-investigator/spring-server-investigator-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/server-investigator/spring-server-investigator-context.xml rename to server/src/main/resources/META-INF/cloudstack/server-investigator/spring-server-investigator-context.xml diff --git a/server/resources/META-INF/cloudstack/server-network/module.properties b/server/src/main/resources/META-INF/cloudstack/server-network/module.properties similarity index 100% rename from server/resources/META-INF/cloudstack/server-network/module.properties rename to server/src/main/resources/META-INF/cloudstack/server-network/module.properties diff --git a/server/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml b/server/src/main/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml rename to server/src/main/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml diff --git a/server/resources/META-INF/cloudstack/server-planner/module.properties b/server/src/main/resources/META-INF/cloudstack/server-planner/module.properties similarity index 100% rename from server/resources/META-INF/cloudstack/server-planner/module.properties rename to server/src/main/resources/META-INF/cloudstack/server-planner/module.properties diff --git a/server/resources/META-INF/cloudstack/server-planner/spring-server-planner-context.xml b/server/src/main/resources/META-INF/cloudstack/server-planner/spring-server-planner-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/server-planner/spring-server-planner-context.xml rename to server/src/main/resources/META-INF/cloudstack/server-planner/spring-server-planner-context.xml diff --git a/server/resources/META-INF/cloudstack/server-storage/module.properties b/server/src/main/resources/META-INF/cloudstack/server-storage/module.properties similarity index 100% rename from server/resources/META-INF/cloudstack/server-storage/module.properties rename to server/src/main/resources/META-INF/cloudstack/server-storage/module.properties diff --git a/server/resources/META-INF/cloudstack/server-storage/spring-server-storage-context.xml b/server/src/main/resources/META-INF/cloudstack/server-storage/spring-server-storage-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/server-storage/spring-server-storage-context.xml rename to server/src/main/resources/META-INF/cloudstack/server-storage/spring-server-storage-context.xml diff --git a/server/resources/META-INF/cloudstack/server-template-adapter/module.properties b/server/src/main/resources/META-INF/cloudstack/server-template-adapter/module.properties similarity index 100% rename from server/resources/META-INF/cloudstack/server-template-adapter/module.properties rename to server/src/main/resources/META-INF/cloudstack/server-template-adapter/module.properties diff --git a/server/resources/META-INF/cloudstack/server-template-adapter/spring-server-template-adapter-context.xml b/server/src/main/resources/META-INF/cloudstack/server-template-adapter/spring-server-template-adapter-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/server-template-adapter/spring-server-template-adapter-context.xml rename to server/src/main/resources/META-INF/cloudstack/server-template-adapter/spring-server-template-adapter-context.xml diff --git a/server/resources/META-INF/cloudstack/system/spring-server-system-context.xml b/server/src/main/resources/META-INF/cloudstack/system/spring-server-system-context.xml similarity index 100% rename from server/resources/META-INF/cloudstack/system/spring-server-system-context.xml rename to server/src/main/resources/META-INF/cloudstack/system/spring-server-system-context.xml diff --git a/server/resources/com/cloud/upgrade/databaseCreatorContext.xml b/server/src/main/resources/com/cloud/upgrade/databaseCreatorContext.xml similarity index 100% rename from server/resources/com/cloud/upgrade/databaseCreatorContext.xml rename to server/src/main/resources/com/cloud/upgrade/databaseCreatorContext.xml diff --git a/server/scripts/vmops-fix-mysql-config b/server/src/main/scripts/vmops-fix-mysql-config similarity index 100% rename from server/scripts/vmops-fix-mysql-config rename to server/src/main/scripts/vmops-fix-mysql-config diff --git a/server/test/async-job-component.xml b/server/src/test/async-job-component.xml similarity index 100% rename from server/test/async-job-component.xml rename to server/src/test/async-job-component.xml diff --git a/server/test/com/cloud/alert/AlertControlsUnitTest.java b/server/src/test/java/com/cloud/alert/AlertControlsUnitTest.java similarity index 100% rename from server/test/com/cloud/alert/AlertControlsUnitTest.java rename to server/src/test/java/com/cloud/alert/AlertControlsUnitTest.java diff --git a/server/test/com/cloud/alert/MockAlertManagerImpl.java b/server/src/test/java/com/cloud/alert/MockAlertManagerImpl.java similarity index 100% rename from server/test/com/cloud/alert/MockAlertManagerImpl.java rename to server/src/test/java/com/cloud/alert/MockAlertManagerImpl.java diff --git a/server/test/com/cloud/api/APITest.java b/server/src/test/java/com/cloud/api/APITest.java similarity index 100% rename from server/test/com/cloud/api/APITest.java rename to server/src/test/java/com/cloud/api/APITest.java diff --git a/server/test/com/cloud/api/ApiResponseHelperTest.java b/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java similarity index 100% rename from server/test/com/cloud/api/ApiResponseHelperTest.java rename to server/src/test/java/com/cloud/api/ApiResponseHelperTest.java diff --git a/server/test/com/cloud/api/ApiServletTest.java b/server/src/test/java/com/cloud/api/ApiServletTest.java similarity index 100% rename from server/test/com/cloud/api/ApiServletTest.java rename to server/src/test/java/com/cloud/api/ApiServletTest.java diff --git a/server/test/com/cloud/api/ListPerfTest.java b/server/src/test/java/com/cloud/api/ListPerfTest.java similarity index 100% rename from server/test/com/cloud/api/ListPerfTest.java rename to server/src/test/java/com/cloud/api/ListPerfTest.java diff --git a/server/test/com/cloud/api/LoginResponse.java b/server/src/test/java/com/cloud/api/LoginResponse.java similarity index 100% rename from server/test/com/cloud/api/LoginResponse.java rename to server/src/test/java/com/cloud/api/LoginResponse.java diff --git a/server/test/com/cloud/api/dispatch/CommandCreationWorkerTest.java b/server/src/test/java/com/cloud/api/dispatch/CommandCreationWorkerTest.java similarity index 100% rename from server/test/com/cloud/api/dispatch/CommandCreationWorkerTest.java rename to server/src/test/java/com/cloud/api/dispatch/CommandCreationWorkerTest.java diff --git a/server/test/com/cloud/api/dispatch/DispatchChainFactoryTest.java b/server/src/test/java/com/cloud/api/dispatch/DispatchChainFactoryTest.java similarity index 100% rename from server/test/com/cloud/api/dispatch/DispatchChainFactoryTest.java rename to server/src/test/java/com/cloud/api/dispatch/DispatchChainFactoryTest.java diff --git a/server/test/com/cloud/api/dispatch/ParamGenericValidationWorkerTest.java b/server/src/test/java/com/cloud/api/dispatch/ParamGenericValidationWorkerTest.java similarity index 100% rename from server/test/com/cloud/api/dispatch/ParamGenericValidationWorkerTest.java rename to server/src/test/java/com/cloud/api/dispatch/ParamGenericValidationWorkerTest.java diff --git a/server/test/com/cloud/api/dispatch/ParamProcessWorkerTest.java b/server/src/test/java/com/cloud/api/dispatch/ParamProcessWorkerTest.java similarity index 100% rename from server/test/com/cloud/api/dispatch/ParamProcessWorkerTest.java rename to server/src/test/java/com/cloud/api/dispatch/ParamProcessWorkerTest.java diff --git a/server/test/com/cloud/api/dispatch/SpecificCmdValidationWorkerTest.java b/server/src/test/java/com/cloud/api/dispatch/SpecificCmdValidationWorkerTest.java similarity index 100% rename from server/test/com/cloud/api/dispatch/SpecificCmdValidationWorkerTest.java rename to server/src/test/java/com/cloud/api/dispatch/SpecificCmdValidationWorkerTest.java diff --git a/server/test/com/cloud/api/query/MutualExclusiveIdsManagerBaseTest.java b/server/src/test/java/com/cloud/api/query/MutualExclusiveIdsManagerBaseTest.java similarity index 100% rename from server/test/com/cloud/api/query/MutualExclusiveIdsManagerBaseTest.java rename to server/src/test/java/com/cloud/api/query/MutualExclusiveIdsManagerBaseTest.java diff --git a/server/test/com/cloud/api/query/dao/GenericDaoBaseWithTagInformationBaseTest.java b/server/src/test/java/com/cloud/api/query/dao/GenericDaoBaseWithTagInformationBaseTest.java similarity index 100% rename from server/test/com/cloud/api/query/dao/GenericDaoBaseWithTagInformationBaseTest.java rename to server/src/test/java/com/cloud/api/query/dao/GenericDaoBaseWithTagInformationBaseTest.java diff --git a/server/test/com/cloud/api/query/dao/SecurityGroupJoinDaoImplTest.java b/server/src/test/java/com/cloud/api/query/dao/SecurityGroupJoinDaoImplTest.java similarity index 100% rename from server/test/com/cloud/api/query/dao/SecurityGroupJoinDaoImplTest.java rename to server/src/test/java/com/cloud/api/query/dao/SecurityGroupJoinDaoImplTest.java diff --git a/server/test/com/cloud/api/query/dao/TemplateJoinDaoImplTest.java b/server/src/test/java/com/cloud/api/query/dao/TemplateJoinDaoImplTest.java similarity index 100% rename from server/test/com/cloud/api/query/dao/TemplateJoinDaoImplTest.java rename to server/src/test/java/com/cloud/api/query/dao/TemplateJoinDaoImplTest.java diff --git a/server/test/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java b/server/src/test/java/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java similarity index 100% rename from server/test/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java rename to server/src/test/java/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java diff --git a/server/test/com/cloud/api/query/dao/VolumeJoinDaoImplTest.java b/server/src/test/java/com/cloud/api/query/dao/VolumeJoinDaoImplTest.java similarity index 100% rename from server/test/com/cloud/api/query/dao/VolumeJoinDaoImplTest.java rename to server/src/test/java/com/cloud/api/query/dao/VolumeJoinDaoImplTest.java diff --git a/server/test/com/cloud/capacity/CapacityManagerTest.java b/server/src/test/java/com/cloud/capacity/CapacityManagerTest.java similarity index 100% rename from server/test/com/cloud/capacity/CapacityManagerTest.java rename to server/src/test/java/com/cloud/capacity/CapacityManagerTest.java diff --git a/server/test/com/cloud/configuration/ConfigurationManagerTest.java b/server/src/test/java/com/cloud/configuration/ConfigurationManagerTest.java similarity index 100% rename from server/test/com/cloud/configuration/ConfigurationManagerTest.java rename to server/src/test/java/com/cloud/configuration/ConfigurationManagerTest.java diff --git a/server/test/com/cloud/configuration/ValidateIpRangeTest.java b/server/src/test/java/com/cloud/configuration/ValidateIpRangeTest.java similarity index 100% rename from server/test/com/cloud/configuration/ValidateIpRangeTest.java rename to server/src/test/java/com/cloud/configuration/ValidateIpRangeTest.java diff --git a/server/test/com/cloud/consoleproxy/ConsoleProxyManagerTest.java b/server/src/test/java/com/cloud/consoleproxy/ConsoleProxyManagerTest.java similarity index 100% rename from server/test/com/cloud/consoleproxy/ConsoleProxyManagerTest.java rename to server/src/test/java/com/cloud/consoleproxy/ConsoleProxyManagerTest.java diff --git a/server/test/com/cloud/event/ActionEventUtilsTest.java b/server/src/test/java/com/cloud/event/ActionEventUtilsTest.java similarity index 100% rename from server/test/com/cloud/event/ActionEventUtilsTest.java rename to server/src/test/java/com/cloud/event/ActionEventUtilsTest.java diff --git a/server/test/com/cloud/event/EventControlsUnitTest.java b/server/src/test/java/com/cloud/event/EventControlsUnitTest.java similarity index 100% rename from server/test/com/cloud/event/EventControlsUnitTest.java rename to server/src/test/java/com/cloud/event/EventControlsUnitTest.java diff --git a/server/test/com/cloud/ha/HighAvailabilityManagerImplTest.java b/server/src/test/java/com/cloud/ha/HighAvailabilityManagerImplTest.java similarity index 100% rename from server/test/com/cloud/ha/HighAvailabilityManagerImplTest.java rename to server/src/test/java/com/cloud/ha/HighAvailabilityManagerImplTest.java diff --git a/server/test/com/cloud/ha/KVMFencerTest.java b/server/src/test/java/com/cloud/ha/KVMFencerTest.java similarity index 100% rename from server/test/com/cloud/ha/KVMFencerTest.java rename to server/src/test/java/com/cloud/ha/KVMFencerTest.java diff --git a/server/test/com/cloud/keystore/KeystoreTest.java b/server/src/test/java/com/cloud/keystore/KeystoreTest.java similarity index 100% rename from server/test/com/cloud/keystore/KeystoreTest.java rename to server/src/test/java/com/cloud/keystore/KeystoreTest.java diff --git a/server/test/com/cloud/metadata/ResourceMetaDataManagerTest.java b/server/src/test/java/com/cloud/metadata/ResourceMetaDataManagerTest.java similarity index 100% rename from server/test/com/cloud/metadata/ResourceMetaDataManagerTest.java rename to server/src/test/java/com/cloud/metadata/ResourceMetaDataManagerTest.java diff --git a/server/test/com/cloud/network/CreatePrivateNetworkTest.java b/server/src/test/java/com/cloud/network/CreatePrivateNetworkTest.java similarity index 100% rename from server/test/com/cloud/network/CreatePrivateNetworkTest.java rename to server/src/test/java/com/cloud/network/CreatePrivateNetworkTest.java diff --git a/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java b/server/src/test/java/com/cloud/network/DedicateGuestVlanRangesTest.java similarity index 100% rename from server/test/com/cloud/network/DedicateGuestVlanRangesTest.java rename to server/src/test/java/com/cloud/network/DedicateGuestVlanRangesTest.java diff --git a/server/test/com/cloud/network/ExternalLoadBalancerDeviceManagerImplTest.java b/server/src/test/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImplTest.java similarity index 100% rename from server/test/com/cloud/network/ExternalLoadBalancerDeviceManagerImplTest.java rename to server/src/test/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImplTest.java diff --git a/server/test/com/cloud/network/IpAddressManagerTest.java b/server/src/test/java/com/cloud/network/IpAddressManagerTest.java similarity index 100% rename from server/test/com/cloud/network/IpAddressManagerTest.java rename to server/src/test/java/com/cloud/network/IpAddressManagerTest.java diff --git a/server/test/com/cloud/network/MockFirewallManagerImpl.java b/server/src/test/java/com/cloud/network/MockFirewallManagerImpl.java similarity index 100% rename from server/test/com/cloud/network/MockFirewallManagerImpl.java rename to server/src/test/java/com/cloud/network/MockFirewallManagerImpl.java diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java b/server/src/test/java/com/cloud/network/MockNetworkModelImpl.java similarity index 100% rename from server/test/com/cloud/network/MockNetworkModelImpl.java rename to server/src/test/java/com/cloud/network/MockNetworkModelImpl.java diff --git a/server/test/com/cloud/network/NetworkManagerTestComponentLibrary.java b/server/src/test/java/com/cloud/network/NetworkManagerTestComponentLibrary.java similarity index 100% rename from server/test/com/cloud/network/NetworkManagerTestComponentLibrary.java rename to server/src/test/java/com/cloud/network/NetworkManagerTestComponentLibrary.java diff --git a/server/test/com/cloud/network/NetworkModelTest.java b/server/src/test/java/com/cloud/network/NetworkModelTest.java similarity index 100% rename from server/test/com/cloud/network/NetworkModelTest.java rename to server/src/test/java/com/cloud/network/NetworkModelTest.java diff --git a/server/test/com/cloud/network/UpdatePhysicalNetworkTest.java b/server/src/test/java/com/cloud/network/UpdatePhysicalNetworkTest.java similarity index 100% rename from server/test/com/cloud/network/UpdatePhysicalNetworkTest.java rename to server/src/test/java/com/cloud/network/UpdatePhysicalNetworkTest.java diff --git a/server/test/com/cloud/network/dao/NetworkDaoTest.java b/server/src/test/java/com/cloud/network/dao/NetworkDaoTest.java similarity index 100% rename from server/test/com/cloud/network/dao/NetworkDaoTest.java rename to server/src/test/java/com/cloud/network/dao/NetworkDaoTest.java diff --git a/server/test/com/cloud/network/element/ConfigDriveNetworkElementTest.java b/server/src/test/java/com/cloud/network/element/ConfigDriveNetworkElementTest.java similarity index 100% rename from server/test/com/cloud/network/element/ConfigDriveNetworkElementTest.java rename to server/src/test/java/com/cloud/network/element/ConfigDriveNetworkElementTest.java diff --git a/server/test/com/cloud/network/element/VirtualRouterElementTest.java b/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java similarity index 100% rename from server/test/com/cloud/network/element/VirtualRouterElementTest.java rename to server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java diff --git a/server/test/com/cloud/network/element/VpcVirtualRouterElementTest.java b/server/src/test/java/com/cloud/network/element/VpcVirtualRouterElementTest.java similarity index 100% rename from server/test/com/cloud/network/element/VpcVirtualRouterElementTest.java rename to server/src/test/java/com/cloud/network/element/VpcVirtualRouterElementTest.java diff --git a/server/test/com/cloud/network/firewall/FirewallManagerTest.java b/server/src/test/java/com/cloud/network/firewall/FirewallManagerTest.java similarity index 100% rename from server/test/com/cloud/network/firewall/FirewallManagerTest.java rename to server/src/test/java/com/cloud/network/firewall/FirewallManagerTest.java diff --git a/server/test/com/cloud/network/lb/AssignLoadBalancerTest.java b/server/src/test/java/com/cloud/network/lb/AssignLoadBalancerTest.java similarity index 100% rename from server/test/com/cloud/network/lb/AssignLoadBalancerTest.java rename to server/src/test/java/com/cloud/network/lb/AssignLoadBalancerTest.java diff --git a/server/test/com/cloud/network/lb/UpdateLoadBalancerTest.java b/server/src/test/java/com/cloud/network/lb/UpdateLoadBalancerTest.java similarity index 100% rename from server/test/com/cloud/network/lb/UpdateLoadBalancerTest.java rename to server/src/test/java/com/cloud/network/lb/UpdateLoadBalancerTest.java diff --git a/server/test/com/cloud/network/router/NetworkHelperImplTest.java b/server/src/test/java/com/cloud/network/router/NetworkHelperImplTest.java similarity index 100% rename from server/test/com/cloud/network/router/NetworkHelperImplTest.java rename to server/src/test/java/com/cloud/network/router/NetworkHelperImplTest.java diff --git a/server/test/com/cloud/network/router/RouterControlHelperTest.java b/server/src/test/java/com/cloud/network/router/RouterControlHelperTest.java similarity index 100% rename from server/test/com/cloud/network/router/RouterControlHelperTest.java rename to server/src/test/java/com/cloud/network/router/RouterControlHelperTest.java diff --git a/server/test/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java b/server/src/test/java/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java similarity index 100% rename from server/test/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java rename to server/src/test/java/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java diff --git a/server/test/com/cloud/network/security/SecurityGroupManagerImpl2Test.java b/server/src/test/java/com/cloud/network/security/SecurityGroupManagerImpl2Test.java similarity index 100% rename from server/test/com/cloud/network/security/SecurityGroupManagerImpl2Test.java rename to server/src/test/java/com/cloud/network/security/SecurityGroupManagerImpl2Test.java diff --git a/server/test/com/cloud/network/security/SecurityGroupManagerImplTest.java b/server/src/test/java/com/cloud/network/security/SecurityGroupManagerImplTest.java similarity index 100% rename from server/test/com/cloud/network/security/SecurityGroupManagerImplTest.java rename to server/src/test/java/com/cloud/network/security/SecurityGroupManagerImplTest.java diff --git a/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java b/server/src/test/java/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java similarity index 100% rename from server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java rename to server/src/test/java/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java diff --git a/server/test/com/cloud/network/security/SecurityGroupQueueTest.java b/server/src/test/java/com/cloud/network/security/SecurityGroupQueueTest.java similarity index 100% rename from server/test/com/cloud/network/security/SecurityGroupQueueTest.java rename to server/src/test/java/com/cloud/network/security/SecurityGroupQueueTest.java diff --git a/server/test/com/cloud/network/vpc/VpcManagerImplTest.java b/server/src/test/java/com/cloud/network/vpc/VpcManagerImplTest.java similarity index 100% rename from server/test/com/cloud/network/vpc/VpcManagerImplTest.java rename to server/src/test/java/com/cloud/network/vpc/VpcManagerImplTest.java diff --git a/server/test/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java b/server/src/test/java/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java similarity index 100% rename from server/test/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java rename to server/src/test/java/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java diff --git a/server/test/com/cloud/network/vpn/RemoteAccessVpnTest.java b/server/src/test/java/com/cloud/network/vpn/RemoteAccessVpnTest.java similarity index 100% rename from server/test/com/cloud/network/vpn/RemoteAccessVpnTest.java rename to server/src/test/java/com/cloud/network/vpn/RemoteAccessVpnTest.java diff --git a/server/test/com/cloud/projects/MockProjectManagerImpl.java b/server/src/test/java/com/cloud/projects/MockProjectManagerImpl.java similarity index 100% rename from server/test/com/cloud/projects/MockProjectManagerImpl.java rename to server/src/test/java/com/cloud/projects/MockProjectManagerImpl.java diff --git a/server/test/com/cloud/resource/MockResourceManagerImpl.java b/server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java similarity index 100% rename from server/test/com/cloud/resource/MockResourceManagerImpl.java rename to server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java diff --git a/server/test/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java b/server/src/test/java/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java similarity index 100% rename from server/test/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java rename to server/src/test/java/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java diff --git a/server/test/com/cloud/server/ConfigurationServerImplTest.java b/server/src/test/java/com/cloud/server/ConfigurationServerImplTest.java similarity index 100% rename from server/test/com/cloud/server/ConfigurationServerImplTest.java rename to server/src/test/java/com/cloud/server/ConfigurationServerImplTest.java diff --git a/server/test/com/cloud/server/ManagementServerImplTest.java b/server/src/test/java/com/cloud/server/ManagementServerImplTest.java similarity index 100% rename from server/test/com/cloud/server/ManagementServerImplTest.java rename to server/src/test/java/com/cloud/server/ManagementServerImplTest.java diff --git a/server/test/com/cloud/servlet/ConsoleProxyServletTest.java b/server/src/test/java/com/cloud/servlet/ConsoleProxyServletTest.java similarity index 100% rename from server/test/com/cloud/servlet/ConsoleProxyServletTest.java rename to server/src/test/java/com/cloud/servlet/ConsoleProxyServletTest.java diff --git a/server/test/com/cloud/snapshot/SnapshotDaoTest.java b/server/src/test/java/com/cloud/snapshot/SnapshotDaoTest.java similarity index 100% rename from server/test/com/cloud/snapshot/SnapshotDaoTest.java rename to server/src/test/java/com/cloud/snapshot/SnapshotDaoTest.java diff --git a/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java b/server/src/test/java/com/cloud/snapshot/SnapshotDaoTestConfiguration.java similarity index 100% rename from server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java rename to server/src/test/java/com/cloud/snapshot/SnapshotDaoTestConfiguration.java diff --git a/server/test/com/cloud/storage/ImageStoreDetailsUtilTest.java b/server/src/test/java/com/cloud/storage/ImageStoreDetailsUtilTest.java similarity index 100% rename from server/test/com/cloud/storage/ImageStoreDetailsUtilTest.java rename to server/src/test/java/com/cloud/storage/ImageStoreDetailsUtilTest.java diff --git a/server/test/com/cloud/storage/VolumeApiServiceImplTest.java b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java similarity index 100% rename from server/test/com/cloud/storage/VolumeApiServiceImplTest.java rename to server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java diff --git a/server/test/com/cloud/storage/dao/StoragePoolDaoTest.java b/server/src/test/java/com/cloud/storage/dao/StoragePoolDaoTest.java similarity index 100% rename from server/test/com/cloud/storage/dao/StoragePoolDaoTest.java rename to server/src/test/java/com/cloud/storage/dao/StoragePoolDaoTest.java diff --git a/server/test/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java b/server/src/test/java/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java similarity index 100% rename from server/test/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java rename to server/src/test/java/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java diff --git a/server/test/com/cloud/storage/listener/StoragePoolMonitorTest.java b/server/src/test/java/com/cloud/storage/listener/StoragePoolMonitorTest.java similarity index 100% rename from server/test/com/cloud/storage/listener/StoragePoolMonitorTest.java rename to server/src/test/java/com/cloud/storage/listener/StoragePoolMonitorTest.java diff --git a/server/test/com/cloud/storage/snapshot/SnapshotManagerTest.java b/server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerTest.java similarity index 100% rename from server/test/com/cloud/storage/snapshot/SnapshotManagerTest.java rename to server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerTest.java diff --git a/server/test/com/cloud/template/HypervisorTemplateAdapterTest.java b/server/src/test/java/com/cloud/template/HypervisorTemplateAdapterTest.java similarity index 100% rename from server/test/com/cloud/template/HypervisorTemplateAdapterTest.java rename to server/src/test/java/com/cloud/template/HypervisorTemplateAdapterTest.java diff --git a/server/test/com/cloud/template/TemplateManagerImplTest.java b/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java similarity index 100% rename from server/test/com/cloud/template/TemplateManagerImplTest.java rename to server/src/test/java/com/cloud/template/TemplateManagerImplTest.java diff --git a/server/test/com/cloud/user/AccountManagerImplTest.java b/server/src/test/java/com/cloud/user/AccountManagerImplTest.java similarity index 100% rename from server/test/com/cloud/user/AccountManagerImplTest.java rename to server/src/test/java/com/cloud/user/AccountManagerImplTest.java diff --git a/server/test/com/cloud/user/AccountManagerImplVolumeDeleteEventTest.java b/server/src/test/java/com/cloud/user/AccountManagerImplVolumeDeleteEventTest.java similarity index 100% rename from server/test/com/cloud/user/AccountManagerImplVolumeDeleteEventTest.java rename to server/src/test/java/com/cloud/user/AccountManagerImplVolumeDeleteEventTest.java diff --git a/server/test/com/cloud/user/AccountManagetImplTestBase.java b/server/src/test/java/com/cloud/user/AccountManagetImplTestBase.java similarity index 100% rename from server/test/com/cloud/user/AccountManagetImplTestBase.java rename to server/src/test/java/com/cloud/user/AccountManagetImplTestBase.java diff --git a/server/test/com/cloud/user/DomainManagerImplTest.java b/server/src/test/java/com/cloud/user/DomainManagerImplTest.java similarity index 100% rename from server/test/com/cloud/user/DomainManagerImplTest.java rename to server/src/test/java/com/cloud/user/DomainManagerImplTest.java diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java b/server/src/test/java/com/cloud/user/MockAccountManagerImpl.java similarity index 100% rename from server/test/com/cloud/user/MockAccountManagerImpl.java rename to server/src/test/java/com/cloud/user/MockAccountManagerImpl.java diff --git a/server/test/com/cloud/user/MockDomainManagerImpl.java b/server/src/test/java/com/cloud/user/MockDomainManagerImpl.java similarity index 100% rename from server/test/com/cloud/user/MockDomainManagerImpl.java rename to server/src/test/java/com/cloud/user/MockDomainManagerImpl.java diff --git a/server/test/com/cloud/user/MockUsageEventDao.java b/server/src/test/java/com/cloud/user/MockUsageEventDao.java similarity index 100% rename from server/test/com/cloud/user/MockUsageEventDao.java rename to server/src/test/java/com/cloud/user/MockUsageEventDao.java diff --git a/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java b/server/src/test/java/com/cloud/vm/DeploymentPlanningManagerImplTest.java similarity index 100% rename from server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java rename to server/src/test/java/com/cloud/vm/DeploymentPlanningManagerImplTest.java diff --git a/server/test/com/cloud/vm/FirstFitPlannerTest.java b/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java similarity index 100% rename from server/test/com/cloud/vm/FirstFitPlannerTest.java rename to server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java diff --git a/server/test/com/cloud/vm/UserVmManagerTest.java b/server/src/test/java/com/cloud/vm/UserVmManagerTest.java similarity index 100% rename from server/test/com/cloud/vm/UserVmManagerTest.java rename to server/src/test/java/com/cloud/vm/UserVmManagerTest.java diff --git a/server/test/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java b/server/src/test/java/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java similarity index 100% rename from server/test/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java rename to server/src/test/java/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java diff --git a/server/test/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java b/server/src/test/java/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java similarity index 100% rename from server/test/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java rename to server/src/test/java/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java diff --git a/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java b/server/src/test/java/com/cloud/vm/dao/UserVmDaoImplTest.java similarity index 100% rename from server/test/com/cloud/vm/dao/UserVmDaoImplTest.java rename to server/src/test/java/com/cloud/vm/dao/UserVmDaoImplTest.java diff --git a/server/test/com/cloud/vm/dao/UserVmDaoTestConfiguration.java b/server/src/test/java/com/cloud/vm/dao/UserVmDaoTestConfiguration.java similarity index 100% rename from server/test/com/cloud/vm/dao/UserVmDaoTestConfiguration.java rename to server/src/test/java/com/cloud/vm/dao/UserVmDaoTestConfiguration.java diff --git a/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java b/server/src/test/java/com/cloud/vm/snapshot/VMSnapshotManagerTest.java similarity index 100% rename from server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java rename to server/src/test/java/com/cloud/vm/snapshot/VMSnapshotManagerTest.java diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java similarity index 100% rename from server/test/com/cloud/vpc/MockConfigurationManagerImpl.java rename to server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java similarity index 100% rename from server/test/com/cloud/vpc/MockNetworkManagerImpl.java rename to server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java diff --git a/server/test/com/cloud/vpc/MockNetworkModelImpl.java b/server/src/test/java/com/cloud/vpc/MockNetworkModelImpl.java similarity index 100% rename from server/test/com/cloud/vpc/MockNetworkModelImpl.java rename to server/src/test/java/com/cloud/vpc/MockNetworkModelImpl.java diff --git a/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java b/server/src/test/java/com/cloud/vpc/MockResourceLimitManagerImpl.java similarity index 100% rename from server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java rename to server/src/test/java/com/cloud/vpc/MockResourceLimitManagerImpl.java diff --git a/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java b/server/src/test/java/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java similarity index 100% rename from server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java rename to server/src/test/java/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java diff --git a/server/test/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java b/server/src/test/java/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java similarity index 100% rename from server/test/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java rename to server/src/test/java/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java diff --git a/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java b/server/src/test/java/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java similarity index 100% rename from server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java rename to server/src/test/java/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java diff --git a/server/test/com/cloud/vpc/NetworkACLManagerTest.java b/server/src/test/java/com/cloud/vpc/NetworkACLManagerTest.java similarity index 100% rename from server/test/com/cloud/vpc/NetworkACLManagerTest.java rename to server/src/test/java/com/cloud/vpc/NetworkACLManagerTest.java diff --git a/server/test/com/cloud/vpc/NetworkACLServiceTest.java b/server/src/test/java/com/cloud/vpc/NetworkACLServiceTest.java similarity index 100% rename from server/test/com/cloud/vpc/NetworkACLServiceTest.java rename to server/src/test/java/com/cloud/vpc/NetworkACLServiceTest.java diff --git a/server/test/com/cloud/vpc/Site2SiteVpnTest.java b/server/src/test/java/com/cloud/vpc/Site2SiteVpnTest.java similarity index 100% rename from server/test/com/cloud/vpc/Site2SiteVpnTest.java rename to server/src/test/java/com/cloud/vpc/Site2SiteVpnTest.java diff --git a/server/test/com/cloud/vpc/VpcApiUnitTest.java b/server/src/test/java/com/cloud/vpc/VpcApiUnitTest.java similarity index 100% rename from server/test/com/cloud/vpc/VpcApiUnitTest.java rename to server/src/test/java/com/cloud/vpc/VpcApiUnitTest.java diff --git a/server/test/com/cloud/vpc/VpcTestConfiguration.java b/server/src/test/java/com/cloud/vpc/VpcTestConfiguration.java similarity index 100% rename from server/test/com/cloud/vpc/VpcTestConfiguration.java rename to server/src/test/java/com/cloud/vpc/VpcTestConfiguration.java diff --git a/server/test/com/cloud/vpc/dao/MockConfigurationDaoImpl.java b/server/src/test/java/com/cloud/vpc/dao/MockConfigurationDaoImpl.java similarity index 100% rename from server/test/com/cloud/vpc/dao/MockConfigurationDaoImpl.java rename to server/src/test/java/com/cloud/vpc/dao/MockConfigurationDaoImpl.java diff --git a/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java b/server/src/test/java/com/cloud/vpc/dao/MockNetworkDaoImpl.java similarity index 100% rename from server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java rename to server/src/test/java/com/cloud/vpc/dao/MockNetworkDaoImpl.java diff --git a/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java b/server/src/test/java/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java similarity index 100% rename from server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java rename to server/src/test/java/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java diff --git a/server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java b/server/src/test/java/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java similarity index 100% rename from server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java rename to server/src/test/java/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java diff --git a/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java b/server/src/test/java/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java similarity index 100% rename from server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java rename to server/src/test/java/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java diff --git a/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java b/server/src/test/java/com/cloud/vpc/dao/MockVpcDaoImpl.java similarity index 100% rename from server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java rename to server/src/test/java/com/cloud/vpc/dao/MockVpcDaoImpl.java diff --git a/server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java b/server/src/test/java/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java similarity index 100% rename from server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java rename to server/src/test/java/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java diff --git a/server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java b/server/src/test/java/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java similarity index 100% rename from server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java rename to server/src/test/java/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java diff --git a/server/test/com/cloud/vpc/dao/MockVpcVirtualRouterElement.java b/server/src/test/java/com/cloud/vpc/dao/MockVpcVirtualRouterElement.java similarity index 100% rename from server/test/com/cloud/vpc/dao/MockVpcVirtualRouterElement.java rename to server/src/test/java/com/cloud/vpc/dao/MockVpcVirtualRouterElement.java diff --git a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java b/server/src/test/java/org/apache/cloudstack/affinity/AffinityApiUnitTest.java similarity index 100% rename from server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java rename to server/src/test/java/org/apache/cloudstack/affinity/AffinityApiUnitTest.java diff --git a/server/test/org/apache/cloudstack/affinity/AffinityGroupServiceImplTest.java b/server/src/test/java/org/apache/cloudstack/affinity/AffinityGroupServiceImplTest.java similarity index 100% rename from server/test/org/apache/cloudstack/affinity/AffinityGroupServiceImplTest.java rename to server/src/test/java/org/apache/cloudstack/affinity/AffinityGroupServiceImplTest.java diff --git a/server/test/org/apache/cloudstack/ca/CABackgroundTaskTest.java b/server/src/test/java/org/apache/cloudstack/ca/CABackgroundTaskTest.java similarity index 100% rename from server/test/org/apache/cloudstack/ca/CABackgroundTaskTest.java rename to server/src/test/java/org/apache/cloudstack/ca/CABackgroundTaskTest.java diff --git a/server/test/org/apache/cloudstack/ca/CAManagerImplTest.java b/server/src/test/java/org/apache/cloudstack/ca/CAManagerImplTest.java similarity index 100% rename from server/test/org/apache/cloudstack/ca/CAManagerImplTest.java rename to server/src/test/java/org/apache/cloudstack/ca/CAManagerImplTest.java diff --git a/server/test/org/apache/cloudstack/direct/download/DirectDownloadManagerImplTest.java b/server/src/test/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManagerImplTest.java similarity index 100% rename from server/test/org/apache/cloudstack/direct/download/DirectDownloadManagerImplTest.java rename to server/src/test/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManagerImplTest.java diff --git a/server/test/org/apache/cloudstack/network/lb/ApplicationLoadBalancerTest.java b/server/src/test/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerTest.java similarity index 100% rename from server/test/org/apache/cloudstack/network/lb/ApplicationLoadBalancerTest.java rename to server/src/test/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerTest.java diff --git a/server/test/org/apache/cloudstack/network/ssl/CertServiceTest.java b/server/src/test/java/org/apache/cloudstack/network/ssl/CertServiceTest.java similarity index 100% rename from server/test/org/apache/cloudstack/network/ssl/CertServiceTest.java rename to server/src/test/java/org/apache/cloudstack/network/ssl/CertServiceTest.java diff --git a/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java b/server/src/test/java/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java similarity index 100% rename from server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java rename to server/src/test/java/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java diff --git a/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java b/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java similarity index 100% rename from server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java rename to server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java diff --git a/server/test/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceTest.java b/server/src/test/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceTest.java similarity index 100% rename from server/test/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceTest.java rename to server/src/test/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceTest.java diff --git a/server/test/org/apache/cloudstack/poll/BackgroundPollManagerImplTest.java b/server/src/test/java/org/apache/cloudstack/poll/BackgroundPollManagerImplTest.java similarity index 100% rename from server/test/org/apache/cloudstack/poll/BackgroundPollManagerImplTest.java rename to server/src/test/java/org/apache/cloudstack/poll/BackgroundPollManagerImplTest.java diff --git a/server/test/org/apache/cloudstack/privategw/AclOnPrivateGwTest.java b/server/src/test/java/org/apache/cloudstack/privategw/AclOnPrivateGwTest.java similarity index 100% rename from server/test/org/apache/cloudstack/privategw/AclOnPrivateGwTest.java rename to server/src/test/java/org/apache/cloudstack/privategw/AclOnPrivateGwTest.java diff --git a/server/test/org/apache/cloudstack/region/RegionManagerTest.java b/server/src/test/java/org/apache/cloudstack/region/RegionManagerTest.java similarity index 100% rename from server/test/org/apache/cloudstack/region/RegionManagerTest.java rename to server/src/test/java/org/apache/cloudstack/region/RegionManagerTest.java diff --git a/server/test/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java b/server/src/test/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java similarity index 100% rename from server/test/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java rename to server/src/test/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java diff --git a/server/test/org/apache/cloudstack/service/ServiceOfferingVOTest.java b/server/src/test/java/org/apache/cloudstack/service/ServiceOfferingVOTest.java similarity index 100% rename from server/test/org/apache/cloudstack/service/ServiceOfferingVOTest.java rename to server/src/test/java/org/apache/cloudstack/service/ServiceOfferingVOTest.java diff --git a/server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java b/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java similarity index 100% rename from server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java rename to server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java diff --git a/server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java b/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java similarity index 100% rename from server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java rename to server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java diff --git a/server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java b/server/src/test/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java similarity index 100% rename from server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java rename to server/src/test/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java diff --git a/server/test/resources/CloneSettingDaoTestContext.xml b/server/src/test/resources/CloneSettingDaoTestContext.xml similarity index 100% rename from server/test/resources/CloneSettingDaoTestContext.xml rename to server/src/test/resources/CloneSettingDaoTestContext.xml diff --git a/server/test/resources/SecurityGroupManagerTestContext.xml b/server/src/test/resources/SecurityGroupManagerTestContext.xml similarity index 100% rename from server/test/resources/SecurityGroupManagerTestContext.xml rename to server/src/test/resources/SecurityGroupManagerTestContext.xml diff --git a/server/test/resources/SnapshotDaoTestContext.xml b/server/src/test/resources/SnapshotDaoTestContext.xml similarity index 100% rename from server/test/resources/SnapshotDaoTestContext.xml rename to server/src/test/resources/SnapshotDaoTestContext.xml diff --git a/server/test/resources/StoragePoolDaoTestContext.xml b/server/src/test/resources/StoragePoolDaoTestContext.xml similarity index 100% rename from server/test/resources/StoragePoolDaoTestContext.xml rename to server/src/test/resources/StoragePoolDaoTestContext.xml diff --git a/server/test/resources/UserVMDaoTestContext.xml b/server/src/test/resources/UserVMDaoTestContext.xml similarity index 100% rename from server/test/resources/UserVMDaoTestContext.xml rename to server/src/test/resources/UserVMDaoTestContext.xml diff --git a/server/test/resources/VpcApiUnitTestContext.xml b/server/src/test/resources/VpcApiUnitTestContext.xml similarity index 100% rename from server/test/resources/VpcApiUnitTestContext.xml rename to server/src/test/resources/VpcApiUnitTestContext.xml diff --git a/server/test/resources/VpcTestContext.xml b/server/src/test/resources/VpcTestContext.xml similarity index 100% rename from server/test/resources/VpcTestContext.xml rename to server/src/test/resources/VpcTestContext.xml diff --git a/server/test/resources/appLoadBalancer.xml b/server/src/test/resources/appLoadBalancer.xml similarity index 100% rename from server/test/resources/appLoadBalancer.xml rename to server/src/test/resources/appLoadBalancer.xml diff --git a/server/test/resources/certs/bad_format_cert.crt b/server/src/test/resources/certs/bad_format_cert.crt similarity index 100% rename from server/test/resources/certs/bad_format_cert.crt rename to server/src/test/resources/certs/bad_format_cert.crt diff --git a/server/test/resources/certs/dsa_self_signed.key b/server/src/test/resources/certs/dsa_self_signed.key similarity index 100% rename from server/test/resources/certs/dsa_self_signed.key rename to server/src/test/resources/certs/dsa_self_signed.key diff --git a/server/test/resources/certs/expired_cert.crt b/server/src/test/resources/certs/expired_cert.crt similarity index 100% rename from server/test/resources/certs/expired_cert.crt rename to server/src/test/resources/certs/expired_cert.crt diff --git a/server/test/resources/certs/non_root.crt b/server/src/test/resources/certs/non_root.crt similarity index 100% rename from server/test/resources/certs/non_root.crt rename to server/src/test/resources/certs/non_root.crt diff --git a/server/test/resources/certs/non_root.csr b/server/src/test/resources/certs/non_root.csr similarity index 100% rename from server/test/resources/certs/non_root.csr rename to server/src/test/resources/certs/non_root.csr diff --git a/server/test/resources/certs/non_root.key b/server/src/test/resources/certs/non_root.key similarity index 100% rename from server/test/resources/certs/non_root.key rename to server/src/test/resources/certs/non_root.key diff --git a/server/test/resources/certs/non_x509_pem.crt b/server/src/test/resources/certs/non_x509_pem.crt similarity index 100% rename from server/test/resources/certs/non_x509_pem.crt rename to server/src/test/resources/certs/non_x509_pem.crt diff --git a/server/test/resources/certs/root_chain.crt b/server/src/test/resources/certs/root_chain.crt similarity index 100% rename from server/test/resources/certs/root_chain.crt rename to server/src/test/resources/certs/root_chain.crt diff --git a/server/test/resources/certs/root_chain.csr b/server/src/test/resources/certs/root_chain.csr similarity index 100% rename from server/test/resources/certs/root_chain.csr rename to server/src/test/resources/certs/root_chain.csr diff --git a/server/test/resources/certs/root_chain.key b/server/src/test/resources/certs/root_chain.key similarity index 100% rename from server/test/resources/certs/root_chain.key rename to server/src/test/resources/certs/root_chain.key diff --git a/server/test/resources/certs/rsa_ca_signed.crt b/server/src/test/resources/certs/rsa_ca_signed.crt similarity index 100% rename from server/test/resources/certs/rsa_ca_signed.crt rename to server/src/test/resources/certs/rsa_ca_signed.crt diff --git a/server/test/resources/certs/rsa_ca_signed.csr b/server/src/test/resources/certs/rsa_ca_signed.csr similarity index 100% rename from server/test/resources/certs/rsa_ca_signed.csr rename to server/src/test/resources/certs/rsa_ca_signed.csr diff --git a/server/test/resources/certs/rsa_ca_signed.key b/server/src/test/resources/certs/rsa_ca_signed.key similarity index 100% rename from server/test/resources/certs/rsa_ca_signed.key rename to server/src/test/resources/certs/rsa_ca_signed.key diff --git a/server/test/resources/certs/rsa_self_signed.crt b/server/src/test/resources/certs/rsa_self_signed.crt similarity index 100% rename from server/test/resources/certs/rsa_self_signed.crt rename to server/src/test/resources/certs/rsa_self_signed.crt diff --git a/server/test/resources/certs/rsa_self_signed.csr b/server/src/test/resources/certs/rsa_self_signed.csr similarity index 100% rename from server/test/resources/certs/rsa_self_signed.csr rename to server/src/test/resources/certs/rsa_self_signed.csr diff --git a/server/test/resources/certs/rsa_self_signed.key b/server/src/test/resources/certs/rsa_self_signed.key similarity index 100% rename from server/test/resources/certs/rsa_self_signed.key rename to server/src/test/resources/certs/rsa_self_signed.key diff --git a/server/test/resources/certs/rsa_self_signed_with_pwd.crt b/server/src/test/resources/certs/rsa_self_signed_with_pwd.crt similarity index 100% rename from server/test/resources/certs/rsa_self_signed_with_pwd.crt rename to server/src/test/resources/certs/rsa_self_signed_with_pwd.crt diff --git a/server/test/resources/certs/rsa_self_signed_with_pwd.csr b/server/src/test/resources/certs/rsa_self_signed_with_pwd.csr similarity index 100% rename from server/test/resources/certs/rsa_self_signed_with_pwd.csr rename to server/src/test/resources/certs/rsa_self_signed_with_pwd.csr diff --git a/server/test/resources/certs/rsa_self_signed_with_pwd.key b/server/src/test/resources/certs/rsa_self_signed_with_pwd.key similarity index 100% rename from server/test/resources/certs/rsa_self_signed_with_pwd.key rename to server/src/test/resources/certs/rsa_self_signed_with_pwd.key diff --git a/server/test/resources/cleanup.sql b/server/src/test/resources/cleanup.sql similarity index 100% rename from server/test/resources/cleanup.sql rename to server/src/test/resources/cleanup.sql diff --git a/server/test/resources/createNetworkOffering.xml b/server/src/test/resources/createNetworkOffering.xml similarity index 100% rename from server/test/resources/createNetworkOffering.xml rename to server/src/test/resources/createNetworkOffering.xml diff --git a/server/test/resources/db.properties b/server/src/test/resources/db.properties similarity index 100% rename from server/test/resources/db.properties rename to server/src/test/resources/db.properties diff --git a/server/test/resources/fake.sql b/server/src/test/resources/fake.sql similarity index 100% rename from server/test/resources/fake.sql rename to server/src/test/resources/fake.sql diff --git a/server/test/resources/network-mgr-component.xml b/server/src/test/resources/network-mgr-component.xml similarity index 100% rename from server/test/resources/network-mgr-component.xml rename to server/src/test/resources/network-mgr-component.xml diff --git a/server/test/resources/testContext.xml b/server/src/test/resources/testContext.xml similarity index 100% rename from server/test/resources/testContext.xml rename to server/src/test/resources/testContext.xml diff --git a/server/test/sync-queue-component.xml b/server/src/test/sync-queue-component.xml similarity index 100% rename from server/test/sync-queue-component.xml rename to server/src/test/sync-queue-component.xml diff --git a/services/console-proxy-rdp/rdpconsole/README.txt b/services/console-proxy-rdp/rdpconsole/README.txt old mode 100755 new mode 100644 diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml old mode 100755 new mode 100644 index 57a038a26ed4..29ee6ae59a33 --- a/services/console-proxy-rdp/rdpconsole/pom.xml +++ b/services/console-proxy-rdp/rdpconsole/pom.xml @@ -35,25 +35,6 @@ UTF-8 - - - ${basedir}/src/main/java - ${basedir}/src/main/scripts - ${basedir}/src/test/java - ${basedir}/target/classes - ${basedir}/target/test-classes - - - ${basedir}/src/main/resources - - - - - ${basedir}/src/test/resources - - - - junit diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/AjaxFIFOImageCache.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/AjaxFIFOImageCache.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/AjaxFIFOImageCache.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/AjaxFIFOImageCache.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/AuthenticationException.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/AuthenticationException.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/AuthenticationException.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/AuthenticationException.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAuthenticationResult.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyAuthenticationResult.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAuthenticationResult.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyAuthenticationResult.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyBaseServerFactoryImpl.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyBaseServerFactoryImpl.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyBaseServerFactoryImpl.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyBaseServerFactoryImpl.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClient.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClient.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClient.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClient.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClientBase.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClientBase.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientListener.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClientListener.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientListener.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClientListener.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientParam.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClientParam.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientParam.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClientParam.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientStatsCollector.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClientStatsCollector.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientStatsCollector.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClientStatsCollector.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyCmdHandler.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyCmdHandler.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyCmdHandler.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyCmdHandler.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyGCThread.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyGCThread.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyLoggerFactory.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyLoggerFactory.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyLoggerFactory.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyLoggerFactory.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyMonitor.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyMonitor.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyMonitor.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyMonitor.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyRdpClient.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyRdpClient.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyRdpClient.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyRdpClient.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyResourceHandler.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyResourceHandler.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyResourceHandler.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyResourceHandler.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyServerFactory.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyServerFactory.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyServerFactory.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyServerFactory.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyThumbnailHandler.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyThumbnailHandler.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyThumbnailHandler.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyThumbnailHandler.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyVncClient.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyVncClient.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/InputEventType.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/InputEventType.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/InputEventType.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/InputEventType.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/rdp/KeysymToKeycode.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/rdp/KeysymToKeycode.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/rdp/KeysymToKeycode.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/rdp/KeysymToKeycode.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/rdp/RdpBufferedImageCanvas.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/rdp/RdpBufferedImageCanvas.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/rdp/RdpBufferedImageCanvas.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/rdp/RdpBufferedImageCanvas.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/util/ITileScanListener.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/ITileScanListener.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/util/ITileScanListener.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/ITileScanListener.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/util/ImageHelper.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/ImageHelper.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/util/ImageHelper.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/ImageHelper.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/util/Logger.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/Logger.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/util/Logger.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/Logger.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/util/LoggerFactory.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/LoggerFactory.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/util/LoggerFactory.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/LoggerFactory.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/util/RawHTTP.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/RawHTTP.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/util/RawHTTP.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/RawHTTP.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/util/Region.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/Region.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/util/Region.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/Region.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/util/RegionClassifier.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/RegionClassifier.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/util/RegionClassifier.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/RegionClassifier.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/util/TileInfo.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/TileInfo.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/util/TileInfo.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/TileInfo.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/util/TileTracker.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/TileTracker.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/util/TileTracker.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/TileTracker.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/BufferedImageCanvas.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/BufferedImageCanvas.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/BufferedImageCanvas.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/BufferedImageCanvas.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/FrameBufferCanvas.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/FrameBufferCanvas.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/FrameBufferCanvas.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/FrameBufferCanvas.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/FrameBufferUpdateListener.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/FrameBufferUpdateListener.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/FrameBufferUpdateListener.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/FrameBufferUpdateListener.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/PaintNotificationListener.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/PaintNotificationListener.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/PaintNotificationListener.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/PaintNotificationListener.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/RfbConstants.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/RfbConstants.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/RfbConstants.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/RfbConstants.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClient.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/VncClient.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClient.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/VncClient.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClientPacketSender.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/VncClientPacketSender.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClientPacketSender.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/VncClientPacketSender.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncScreenDescription.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/VncScreenDescription.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncScreenDescription.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/VncScreenDescription.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncServerPacketReceiver.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/VncServerPacketReceiver.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncServerPacketReceiver.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/VncServerPacketReceiver.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/ClientPacket.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/client/ClientPacket.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/ClientPacket.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/client/ClientPacket.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/FramebufferUpdateRequestPacket.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/client/FramebufferUpdateRequestPacket.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/FramebufferUpdateRequestPacket.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/client/FramebufferUpdateRequestPacket.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/KeyboardEventPacket.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/client/KeyboardEventPacket.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/KeyboardEventPacket.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/client/KeyboardEventPacket.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/MouseEventPacket.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/client/MouseEventPacket.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/MouseEventPacket.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/client/MouseEventPacket.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/SetEncodingsPacket.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/client/SetEncodingsPacket.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/SetEncodingsPacket.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/client/SetEncodingsPacket.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/SetPixelFormatPacket.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/client/SetPixelFormatPacket.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/SetPixelFormatPacket.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/client/SetPixelFormatPacket.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/AbstractRect.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/AbstractRect.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/AbstractRect.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/AbstractRect.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/CopyRect.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/CopyRect.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/CopyRect.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/CopyRect.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/FrameBufferSizeChangeRequest.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/FrameBufferSizeChangeRequest.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/FrameBufferSizeChangeRequest.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/FrameBufferSizeChangeRequest.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/FramebufferUpdatePacket.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/FramebufferUpdatePacket.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/FramebufferUpdatePacket.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/FramebufferUpdatePacket.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/RawRect.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/RawRect.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/RawRect.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/RawRect.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/Rect.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/Rect.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/Rect.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/Rect.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/ServerCutText.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/ServerCutText.java similarity index 100% rename from services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/server/ServerCutText.java rename to services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/ServerCutText.java diff --git a/services/console-proxy/server/test/com/cloud/consoleproxy/ConsoleProxyRdpClientTest.java b/services/console-proxy/server/src/test/java/com/cloud/consoleproxy/ConsoleProxyRdpClientTest.java similarity index 100% rename from services/console-proxy/server/test/com/cloud/consoleproxy/ConsoleProxyRdpClientTest.java rename to services/console-proxy/server/src/test/java/com/cloud/consoleproxy/ConsoleProxyRdpClientTest.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/AddAccountToIAMGroupCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/AddAccountToIAMGroupCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/AddAccountToIAMGroupCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/AddAccountToIAMGroupCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/AddIAMPermissionToIAMPolicyCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/AddIAMPermissionToIAMPolicyCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/AddIAMPermissionToIAMPolicyCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/AddIAMPermissionToIAMPolicyCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/AttachIAMPolicyToAccountCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/AttachIAMPolicyToAccountCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/AttachIAMPolicyToAccountCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/AttachIAMPolicyToAccountCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/AttachIAMPolicyToIAMGroupCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/AttachIAMPolicyToIAMGroupCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/AttachIAMPolicyToIAMGroupCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/AttachIAMPolicyToIAMGroupCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/CreateIAMGroupCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/CreateIAMGroupCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/CreateIAMGroupCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/CreateIAMGroupCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/CreateIAMPolicyCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/CreateIAMPolicyCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/CreateIAMPolicyCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/CreateIAMPolicyCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/DeleteIAMGroupCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/DeleteIAMGroupCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/DeleteIAMGroupCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/DeleteIAMGroupCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/DeleteIAMPolicyCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/DeleteIAMPolicyCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/DeleteIAMPolicyCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/DeleteIAMPolicyCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/ListIAMGroupsCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/ListIAMGroupsCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/ListIAMGroupsCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/ListIAMGroupsCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/ListIAMPoliciesCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/ListIAMPoliciesCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/ListIAMPoliciesCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/ListIAMPoliciesCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/RemoveAccountFromIAMGroupCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/RemoveAccountFromIAMGroupCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/RemoveAccountFromIAMGroupCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/RemoveAccountFromIAMGroupCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/RemoveIAMPermissionFromIAMPolicyCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/RemoveIAMPermissionFromIAMPolicyCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/RemoveIAMPermissionFromIAMPolicyCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/RemoveIAMPermissionFromIAMPolicyCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/RemoveIAMPolicyFromAccountCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/RemoveIAMPolicyFromAccountCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/RemoveIAMPolicyFromAccountCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/RemoveIAMPolicyFromAccountCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/command/iam/RemoveIAMPolicyFromIAMGroupCmd.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/RemoveIAMPolicyFromIAMGroupCmd.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/command/iam/RemoveIAMPolicyFromIAMGroupCmd.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/RemoveIAMPolicyFromIAMGroupCmd.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/response/iam/IAMGroupResponse.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/response/iam/IAMGroupResponse.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/response/iam/IAMGroupResponse.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/response/iam/IAMGroupResponse.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/response/iam/IAMPermissionResponse.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/response/iam/IAMPermissionResponse.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/response/iam/IAMPermissionResponse.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/response/iam/IAMPermissionResponse.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/api/response/iam/IAMPolicyResponse.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/api/response/iam/IAMPolicyResponse.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/api/response/iam/IAMPolicyResponse.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/api/response/iam/IAMPolicyResponse.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiService.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/iam/IAMApiService.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiService.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/iam/IAMApiService.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/iam/IAMApiServiceImpl.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/iam/IAMApiServiceImpl.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedEntityAccessChecker.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/iam/RoleBasedEntityAccessChecker.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedEntityAccessChecker.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/iam/RoleBasedEntityAccessChecker.java diff --git a/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedEntityQuerySelector.java b/services/iam/plugin/src/main/java/org/apache/cloudstack/iam/RoleBasedEntityQuerySelector.java similarity index 100% rename from services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedEntityQuerySelector.java rename to services/iam/plugin/src/main/java/org/apache/cloudstack/iam/RoleBasedEntityQuerySelector.java diff --git a/services/iam/plugin/resources/META-INF/cloudstack/iam-access-checkers/module.properties b/services/iam/plugin/src/main/resources/META-INF/cloudstack/iam-access-checkers/module.properties similarity index 100% rename from services/iam/plugin/resources/META-INF/cloudstack/iam-access-checkers/module.properties rename to services/iam/plugin/src/main/resources/META-INF/cloudstack/iam-access-checkers/module.properties diff --git a/services/iam/plugin/resources/META-INF/cloudstack/iam-access-checkers/spring-iam-access-checkers-context.xml b/services/iam/plugin/src/main/resources/META-INF/cloudstack/iam-access-checkers/spring-iam-access-checkers-context.xml similarity index 100% rename from services/iam/plugin/resources/META-INF/cloudstack/iam-access-checkers/spring-iam-access-checkers-context.xml rename to services/iam/plugin/src/main/resources/META-INF/cloudstack/iam-access-checkers/spring-iam-access-checkers-context.xml diff --git a/services/iam/plugin/test/org/apache/cloudstack/iam/test/IAMApiServiceTest.java b/services/iam/plugin/src/test/java/org/apache/cloudstack/iam/test/IAMApiServiceTest.java similarity index 100% rename from services/iam/plugin/test/org/apache/cloudstack/iam/test/IAMApiServiceTest.java rename to services/iam/plugin/src/test/java/org/apache/cloudstack/iam/test/IAMApiServiceTest.java diff --git a/services/iam/plugin/test/resources/db.properties b/services/iam/plugin/src/test/resources/db.properties similarity index 100% rename from services/iam/plugin/test/resources/db.properties rename to services/iam/plugin/src/test/resources/db.properties diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/IAMGroup.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/api/IAMGroup.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/api/IAMGroup.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/api/IAMGroup.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/IAMPolicy.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/api/IAMPolicy.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/api/IAMPolicy.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/api/IAMPolicy.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/IAMPolicyPermission.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/api/IAMPolicyPermission.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/api/IAMPolicyPermission.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/api/IAMPolicyPermission.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/IAMService.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/api/IAMService.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/api/IAMService.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/api/IAMService.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMAccountPolicyMapVO.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMAccountPolicyMapVO.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/IAMAccountPolicyMapVO.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMAccountPolicyMapVO.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMGroupAccountMapVO.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMGroupAccountMapVO.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/IAMGroupAccountMapVO.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMGroupAccountMapVO.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMGroupPolicyMapVO.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMGroupPolicyMapVO.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/IAMGroupPolicyMapVO.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMGroupPolicyMapVO.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMGroupVO.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMGroupVO.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/IAMGroupVO.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMGroupVO.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMPolicyPermissionVO.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMPolicyPermissionVO.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/IAMPolicyPermissionVO.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMPolicyPermissionVO.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMPolicyVO.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMPolicyVO.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/IAMPolicyVO.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMPolicyVO.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMServiceImpl.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/IAMServiceImpl.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMAccountPolicyMapDao.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMAccountPolicyMapDao.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMAccountPolicyMapDao.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMAccountPolicyMapDao.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMAccountPolicyMapDaoImpl.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMAccountPolicyMapDaoImpl.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMAccountPolicyMapDaoImpl.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMAccountPolicyMapDaoImpl.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMGroupAccountMapDao.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMGroupAccountMapDao.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMGroupAccountMapDao.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMGroupAccountMapDao.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMGroupAccountMapDaoImpl.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMGroupAccountMapDaoImpl.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMGroupAccountMapDaoImpl.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMGroupAccountMapDaoImpl.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMGroupDao.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMGroupDao.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMGroupDao.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMGroupDao.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMGroupDaoImpl.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMGroupDaoImpl.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMGroupDaoImpl.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMGroupDaoImpl.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMGroupPolicyMapDao.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMGroupPolicyMapDao.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMGroupPolicyMapDao.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMGroupPolicyMapDao.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMGroupPolicyMapDaoImpl.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMGroupPolicyMapDaoImpl.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMGroupPolicyMapDaoImpl.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMGroupPolicyMapDaoImpl.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMPolicyDao.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMPolicyDao.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMPolicyDao.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMPolicyDao.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMPolicyDaoImpl.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMPolicyDaoImpl.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMPolicyDaoImpl.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMPolicyDaoImpl.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMPolicyPermissionDao.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMPolicyPermissionDao.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMPolicyPermissionDao.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMPolicyPermissionDao.java diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMPolicyPermissionDaoImpl.java b/services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMPolicyPermissionDaoImpl.java similarity index 100% rename from services/iam/server/src/org/apache/cloudstack/iam/server/dao/IAMPolicyPermissionDaoImpl.java rename to services/iam/server/src/main/java/org/apache/cloudstack/iam/server/dao/IAMPolicyPermissionDaoImpl.java diff --git a/services/iam/server/resources/META-INF/cloudstack/core/spring-iam-server-context.xml b/services/iam/server/src/main/resources/META-INF/cloudstack/core/spring-iam-server-context.xml similarity index 100% rename from services/iam/server/resources/META-INF/cloudstack/core/spring-iam-server-context.xml rename to services/iam/server/src/main/resources/META-INF/cloudstack/core/spring-iam-server-context.xml diff --git a/services/iam/server/test/org/apache/cloudstack/iam/IAMServiceUnitTest.java b/services/iam/server/src/test/java/org/apache/cloudstack/iam/IAMServiceUnitTest.java similarity index 100% rename from services/iam/server/test/org/apache/cloudstack/iam/IAMServiceUnitTest.java rename to services/iam/server/src/test/java/org/apache/cloudstack/iam/IAMServiceUnitTest.java diff --git a/services/iam/server/test/resources/db.properties b/services/iam/server/src/test/resources/db.properties similarity index 100% rename from services/iam/server/test/resources/db.properties rename to services/iam/server/src/test/resources/db.properties diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java similarity index 100% rename from services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java rename to services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java similarity index 100% rename from services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java rename to services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java diff --git a/services/secondary-storage/controller/resources/META-INF/cloudstack/core/spring-services-secondary-storage-controller-core-context.xml b/services/secondary-storage/controller/src/main/resources/META-INF/cloudstack/core/spring-services-secondary-storage-controller-core-context.xml similarity index 100% rename from services/secondary-storage/controller/resources/META-INF/cloudstack/core/spring-services-secondary-storage-controller-core-context.xml rename to services/secondary-storage/controller/src/main/resources/META-INF/cloudstack/core/spring-services-secondary-storage-controller-core-context.xml diff --git a/services/secondary-storage/controller/test/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerTest.java b/services/secondary-storage/controller/src/test/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerTest.java similarity index 100% rename from services/secondary-storage/controller/test/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerTest.java rename to services/secondary-storage/controller/src/test/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerTest.java diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java similarity index 100% rename from services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java rename to services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResource.java similarity index 100% rename from services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResource.java rename to services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResource.java diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/LocalSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/LocalSecondaryStorageResource.java similarity index 100% rename from services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/LocalSecondaryStorageResource.java rename to services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/LocalSecondaryStorageResource.java diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java similarity index 100% rename from services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java rename to services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java similarity index 100% rename from services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java rename to services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/SecondaryStorageResource.java similarity index 100% rename from services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageResource.java rename to services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/SecondaryStorageResource.java diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageResourceHandler.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/SecondaryStorageResourceHandler.java similarity index 100% rename from services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageResourceHandler.java rename to services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/SecondaryStorageResourceHandler.java diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManager.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManager.java similarity index 100% rename from services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManager.java rename to services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManager.java diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java similarity index 100% rename from services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java rename to services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadEntity.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadEntity.java similarity index 100% rename from services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadEntity.java rename to services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadEntity.java diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadManager.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadManager.java similarity index 100% rename from services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadManager.java rename to services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadManager.java diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadManagerImpl.java similarity index 100% rename from services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java rename to services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadManagerImpl.java diff --git a/services/secondary-storage/server/resources/META-INF/cloudstack/secondary-storage-discoverer/module.properties b/services/secondary-storage/server/src/main/resources/META-INF/cloudstack/secondary-storage-discoverer/module.properties similarity index 100% rename from services/secondary-storage/server/resources/META-INF/cloudstack/secondary-storage-discoverer/module.properties rename to services/secondary-storage/server/src/main/resources/META-INF/cloudstack/secondary-storage-discoverer/module.properties diff --git a/services/secondary-storage/server/resources/META-INF/cloudstack/secondary-storage-discoverer/spring-secondary-storage-discoverer-context.xml b/services/secondary-storage/server/src/main/resources/META-INF/cloudstack/secondary-storage-discoverer/spring-secondary-storage-discoverer-context.xml similarity index 100% rename from services/secondary-storage/server/resources/META-INF/cloudstack/secondary-storage-discoverer/spring-secondary-storage-discoverer-context.xml rename to services/secondary-storage/server/src/main/resources/META-INF/cloudstack/secondary-storage-discoverer/spring-secondary-storage-discoverer-context.xml diff --git a/services/secondary-storage/server/test/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResourceTest.java b/services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResourceTest.java similarity index 100% rename from services/secondary-storage/server/test/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResourceTest.java rename to services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResourceTest.java diff --git a/services/secondary-storage/server/test/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResourceTest.java b/services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResourceTest.java similarity index 100% rename from services/secondary-storage/server/test/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResourceTest.java rename to services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResourceTest.java diff --git a/test/pom.xml b/test/pom.xml index fd36b0acc9b5..1f35328bffb2 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -67,8 +67,6 @@ compile - test - test org.apache.maven.plugins diff --git a/test/src/com/cloud/sample/UserCloudAPIExecutor.java b/test/src-not-used/main/java/com/cloud/sample/UserCloudAPIExecutor.java similarity index 100% rename from test/src/com/cloud/sample/UserCloudAPIExecutor.java rename to test/src-not-used/main/java/com/cloud/sample/UserCloudAPIExecutor.java diff --git a/test/src/com/cloud/test/longrun/BuildGuestNetwork.java b/test/src-not-used/main/java/com/cloud/test/longrun/BuildGuestNetwork.java similarity index 100% rename from test/src/com/cloud/test/longrun/BuildGuestNetwork.java rename to test/src-not-used/main/java/com/cloud/test/longrun/BuildGuestNetwork.java diff --git a/test/src/com/cloud/test/longrun/GuestNetwork.java b/test/src-not-used/main/java/com/cloud/test/longrun/GuestNetwork.java similarity index 100% rename from test/src/com/cloud/test/longrun/GuestNetwork.java rename to test/src-not-used/main/java/com/cloud/test/longrun/GuestNetwork.java diff --git a/test/src/com/cloud/test/longrun/PerformanceWithAPI.java b/test/src-not-used/main/java/com/cloud/test/longrun/PerformanceWithAPI.java similarity index 100% rename from test/src/com/cloud/test/longrun/PerformanceWithAPI.java rename to test/src-not-used/main/java/com/cloud/test/longrun/PerformanceWithAPI.java diff --git a/test/src/com/cloud/test/longrun/User.java b/test/src-not-used/main/java/com/cloud/test/longrun/User.java similarity index 100% rename from test/src/com/cloud/test/longrun/User.java rename to test/src-not-used/main/java/com/cloud/test/longrun/User.java diff --git a/test/src/com/cloud/test/longrun/VirtualMachine.java b/test/src-not-used/main/java/com/cloud/test/longrun/VirtualMachine.java similarity index 100% rename from test/src/com/cloud/test/longrun/VirtualMachine.java rename to test/src-not-used/main/java/com/cloud/test/longrun/VirtualMachine.java diff --git a/test/src/com/cloud/test/regression/ApiCommand.java b/test/src-not-used/main/java/com/cloud/test/regression/ApiCommand.java similarity index 100% rename from test/src/com/cloud/test/regression/ApiCommand.java rename to test/src-not-used/main/java/com/cloud/test/regression/ApiCommand.java diff --git a/test/src/com/cloud/test/regression/ConfigTest.java b/test/src-not-used/main/java/com/cloud/test/regression/ConfigTest.java similarity index 100% rename from test/src/com/cloud/test/regression/ConfigTest.java rename to test/src-not-used/main/java/com/cloud/test/regression/ConfigTest.java diff --git a/test/src/com/cloud/test/regression/DelegatedAdminTest.java b/test/src-not-used/main/java/com/cloud/test/regression/DelegatedAdminTest.java similarity index 100% rename from test/src/com/cloud/test/regression/DelegatedAdminTest.java rename to test/src-not-used/main/java/com/cloud/test/regression/DelegatedAdminTest.java diff --git a/test/src/com/cloud/test/regression/Deploy.java b/test/src-not-used/main/java/com/cloud/test/regression/Deploy.java similarity index 100% rename from test/src/com/cloud/test/regression/Deploy.java rename to test/src-not-used/main/java/com/cloud/test/regression/Deploy.java diff --git a/test/src/com/cloud/test/regression/EventsApiTest.java b/test/src-not-used/main/java/com/cloud/test/regression/EventsApiTest.java similarity index 100% rename from test/src/com/cloud/test/regression/EventsApiTest.java rename to test/src-not-used/main/java/com/cloud/test/regression/EventsApiTest.java diff --git a/test/src/com/cloud/test/regression/HA.java b/test/src-not-used/main/java/com/cloud/test/regression/HA.java similarity index 100% rename from test/src/com/cloud/test/regression/HA.java rename to test/src-not-used/main/java/com/cloud/test/regression/HA.java diff --git a/test/src/com/cloud/test/regression/LoadBalancingTest.java b/test/src-not-used/main/java/com/cloud/test/regression/LoadBalancingTest.java similarity index 100% rename from test/src/com/cloud/test/regression/LoadBalancingTest.java rename to test/src-not-used/main/java/com/cloud/test/regression/LoadBalancingTest.java diff --git a/test/src/com/cloud/test/regression/PortForwardingTest.java b/test/src-not-used/main/java/com/cloud/test/regression/PortForwardingTest.java similarity index 100% rename from test/src/com/cloud/test/regression/PortForwardingTest.java rename to test/src-not-used/main/java/com/cloud/test/regression/PortForwardingTest.java diff --git a/test/src/com/cloud/test/regression/SanityTest.java b/test/src-not-used/main/java/com/cloud/test/regression/SanityTest.java similarity index 100% rename from test/src/com/cloud/test/regression/SanityTest.java rename to test/src-not-used/main/java/com/cloud/test/regression/SanityTest.java diff --git a/test/src/com/cloud/test/regression/Test.java b/test/src-not-used/main/java/com/cloud/test/regression/Test.java similarity index 100% rename from test/src/com/cloud/test/regression/Test.java rename to test/src-not-used/main/java/com/cloud/test/regression/Test.java diff --git a/test/src/com/cloud/test/regression/TestCase.java b/test/src-not-used/main/java/com/cloud/test/regression/TestCase.java similarity index 100% rename from test/src/com/cloud/test/regression/TestCase.java rename to test/src-not-used/main/java/com/cloud/test/regression/TestCase.java diff --git a/test/src/com/cloud/test/regression/TestCaseEngine.java b/test/src-not-used/main/java/com/cloud/test/regression/TestCaseEngine.java similarity index 100% rename from test/src/com/cloud/test/regression/TestCaseEngine.java rename to test/src-not-used/main/java/com/cloud/test/regression/TestCaseEngine.java diff --git a/test/src/com/cloud/test/regression/VMApiTest.java b/test/src-not-used/main/java/com/cloud/test/regression/VMApiTest.java similarity index 100% rename from test/src/com/cloud/test/regression/VMApiTest.java rename to test/src-not-used/main/java/com/cloud/test/regression/VMApiTest.java diff --git a/test/src/com/cloud/test/stress/SshTest.java b/test/src-not-used/main/java/com/cloud/test/stress/SshTest.java similarity index 100% rename from test/src/com/cloud/test/stress/SshTest.java rename to test/src-not-used/main/java/com/cloud/test/stress/SshTest.java diff --git a/test/src/com/cloud/test/stress/StressTestDirectAttach.java b/test/src-not-used/main/java/com/cloud/test/stress/StressTestDirectAttach.java similarity index 100% rename from test/src/com/cloud/test/stress/StressTestDirectAttach.java rename to test/src-not-used/main/java/com/cloud/test/stress/StressTestDirectAttach.java diff --git a/test/src/com/cloud/test/stress/TestClientWithAPI.java b/test/src-not-used/main/java/com/cloud/test/stress/TestClientWithAPI.java similarity index 100% rename from test/src/com/cloud/test/stress/TestClientWithAPI.java rename to test/src-not-used/main/java/com/cloud/test/stress/TestClientWithAPI.java diff --git a/test/src/com/cloud/test/stress/WgetTest.java b/test/src-not-used/main/java/com/cloud/test/stress/WgetTest.java similarity index 100% rename from test/src/com/cloud/test/stress/WgetTest.java rename to test/src-not-used/main/java/com/cloud/test/stress/WgetTest.java diff --git a/test/src/com/cloud/test/ui/AbstractSeleniumTestCase.java b/test/src-not-used/main/java/com/cloud/test/ui/AbstractSeleniumTestCase.java similarity index 100% rename from test/src/com/cloud/test/ui/AbstractSeleniumTestCase.java rename to test/src-not-used/main/java/com/cloud/test/ui/AbstractSeleniumTestCase.java diff --git a/test/src/com/cloud/test/ui/AddAndDeleteAISO.java b/test/src-not-used/main/java/com/cloud/test/ui/AddAndDeleteAISO.java similarity index 100% rename from test/src/com/cloud/test/ui/AddAndDeleteAISO.java rename to test/src-not-used/main/java/com/cloud/test/ui/AddAndDeleteAISO.java diff --git a/test/src/com/cloud/test/ui/AddAndDeleteATemplate.java b/test/src-not-used/main/java/com/cloud/test/ui/AddAndDeleteATemplate.java similarity index 100% rename from test/src/com/cloud/test/ui/AddAndDeleteATemplate.java rename to test/src-not-used/main/java/com/cloud/test/ui/AddAndDeleteATemplate.java diff --git a/test/src/com/cloud/test/ui/UIScenarioTest.java b/test/src-not-used/main/java/com/cloud/test/ui/UIScenarioTest.java similarity index 100% rename from test/src/com/cloud/test/ui/UIScenarioTest.java rename to test/src-not-used/main/java/com/cloud/test/ui/UIScenarioTest.java diff --git a/test/src/com/cloud/test/utils/ConsoleProxy.java b/test/src-not-used/main/java/com/cloud/test/utils/ConsoleProxy.java similarity index 100% rename from test/src/com/cloud/test/utils/ConsoleProxy.java rename to test/src-not-used/main/java/com/cloud/test/utils/ConsoleProxy.java diff --git a/test/src/com/cloud/test/utils/IpSqlGenerator.java b/test/src-not-used/main/java/com/cloud/test/utils/IpSqlGenerator.java similarity index 100% rename from test/src/com/cloud/test/utils/IpSqlGenerator.java rename to test/src-not-used/main/java/com/cloud/test/utils/IpSqlGenerator.java diff --git a/test/src/com/cloud/test/utils/ProxyLoadTemp.java b/test/src-not-used/main/java/com/cloud/test/utils/ProxyLoadTemp.java similarity index 100% rename from test/src/com/cloud/test/utils/ProxyLoadTemp.java rename to test/src-not-used/main/java/com/cloud/test/utils/ProxyLoadTemp.java diff --git a/test/src/com/cloud/test/utils/SignEC2.java b/test/src-not-used/main/java/com/cloud/test/utils/SignEC2.java similarity index 100% rename from test/src/com/cloud/test/utils/SignEC2.java rename to test/src-not-used/main/java/com/cloud/test/utils/SignEC2.java diff --git a/test/src/com/cloud/test/utils/SignRequest.java b/test/src-not-used/main/java/com/cloud/test/utils/SignRequest.java similarity index 100% rename from test/src/com/cloud/test/utils/SignRequest.java rename to test/src-not-used/main/java/com/cloud/test/utils/SignRequest.java diff --git a/test/src/com/cloud/test/utils/SqlDataGenerator.java b/test/src-not-used/main/java/com/cloud/test/utils/SqlDataGenerator.java similarity index 100% rename from test/src/com/cloud/test/utils/SqlDataGenerator.java rename to test/src-not-used/main/java/com/cloud/test/utils/SqlDataGenerator.java diff --git a/test/src/com/cloud/test/utils/SubmitCert.java b/test/src-not-used/main/java/com/cloud/test/utils/SubmitCert.java similarity index 100% rename from test/src/com/cloud/test/utils/SubmitCert.java rename to test/src-not-used/main/java/com/cloud/test/utils/SubmitCert.java diff --git a/test/src/com/cloud/test/utils/TestClient.java b/test/src-not-used/main/java/com/cloud/test/utils/TestClient.java similarity index 100% rename from test/src/com/cloud/test/utils/TestClient.java rename to test/src-not-used/main/java/com/cloud/test/utils/TestClient.java diff --git a/test/src/com/cloud/test/utils/UtilsForTest.java b/test/src-not-used/main/java/com/cloud/test/utils/UtilsForTest.java similarity index 100% rename from test/src/com/cloud/test/utils/UtilsForTest.java rename to test/src-not-used/main/java/com/cloud/test/utils/UtilsForTest.java diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml index 728cbb4e6497..715ea0b8880f 100644 --- a/tools/apidoc/pom.xml +++ b/tools/apidoc/pom.xml @@ -36,7 +36,7 @@ org.apache.cloudstack cloud-client-ui ${project.version} - pom + pom diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE index e107c4fc8d51..de896208c867 100644 --- a/tools/whisker/LICENSE +++ b/tools/whisker/LICENSE @@ -4726,13 +4726,13 @@ Within the ui/lib/qunit directory qunit.css from http://docs.jquery.com/QUnit qunit.js from http://docs.jquery.com/QUnit -Within the utils/src/com/cloud/utils/db directory +Within the utils/src/main/java/com/cloud/utils/db directory licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) Copyright (c) 2004 Clinton Begin from Clinton Begin http://code.google.com/p/mybatis/ ScriptRunner.java from http://code.google.com/p/mybatis/ -Within the utils/src/org/apache/commons/httpclient/contrib/ssl directory +Within the utils/src/main/java/org/apache/commons/httpclient/contrib/ssl directory licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) Copyright (c) 2007 The Apache Software Foundation from The Apache Software Foundation http://www.apache.org/ diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml index 3a7624d28f54..be02601e99d8 100644 --- a/tools/whisker/descriptor-for-packaging.xml +++ b/tools/whisker/descriptor-for-packaging.xml @@ -2629,7 +2629,7 @@ Copyright (c) 2012 John Resig, Jörn Zaefferer - + Copyright (c) 2004 Clinton Begin @@ -2991,7 +2991,7 @@ Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. - + Copyright (c) 2007 The Apache Software Foundation diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml index 8cad773efefa..c64913c5f088 100644 --- a/tools/whisker/descriptor.xml +++ b/tools/whisker/descriptor.xml @@ -2609,7 +2609,7 @@ Copyright (c) 2012 John Resig, Jörn Zaefferer - + Copyright (c) 2004 Clinton Begin @@ -2639,7 +2639,7 @@ Copyright (c) 2010-2011 OpenStack, LLC. - + Copyright (c) 2007 The Apache Software Foundation diff --git a/tools/wix-cloudstack-maven-plugin/src/org/apache/cloudstack/wix/HeatMojo.java b/tools/wix-cloudstack-maven-plugin/src/main/java/org/apache/cloudstack/wix/HeatMojo.java similarity index 100% rename from tools/wix-cloudstack-maven-plugin/src/org/apache/cloudstack/wix/HeatMojo.java rename to tools/wix-cloudstack-maven-plugin/src/main/java/org/apache/cloudstack/wix/HeatMojo.java diff --git a/usage/pom.xml b/usage/pom.xml index 53eeb5ee6dfb..edb0c5fdf91e 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -68,11 +68,6 @@ - - - resources - - org.apache.maven.plugins diff --git a/usage/src/com/cloud/usage/parser/VMSanpshotOnPrimaryParser.java b/usage/src/main/java/com/cloud/cloud/usage/parser/VMSanpshotOnPrimaryParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/VMSanpshotOnPrimaryParser.java rename to usage/src/main/java/com/cloud/cloud/usage/parser/VMSanpshotOnPrimaryParser.java diff --git a/usage/src/com/cloud/usage/StorageTypes.java b/usage/src/main/java/com/cloud/usage/StorageTypes.java similarity index 100% rename from usage/src/com/cloud/usage/StorageTypes.java rename to usage/src/main/java/com/cloud/usage/StorageTypes.java diff --git a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java b/usage/src/main/java/com/cloud/usage/UsageAlertManagerImpl.java similarity index 100% rename from usage/src/com/cloud/usage/UsageAlertManagerImpl.java rename to usage/src/main/java/com/cloud/usage/UsageAlertManagerImpl.java diff --git a/usage/src/com/cloud/usage/UsageManager.java b/usage/src/main/java/com/cloud/usage/UsageManager.java similarity index 100% rename from usage/src/com/cloud/usage/UsageManager.java rename to usage/src/main/java/com/cloud/usage/UsageManager.java diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java similarity index 100% rename from usage/src/com/cloud/usage/UsageManagerImpl.java rename to usage/src/main/java/com/cloud/usage/UsageManagerImpl.java diff --git a/usage/src/com/cloud/usage/UsageSanityChecker.java b/usage/src/main/java/com/cloud/usage/UsageSanityChecker.java similarity index 100% rename from usage/src/com/cloud/usage/UsageSanityChecker.java rename to usage/src/main/java/com/cloud/usage/UsageSanityChecker.java diff --git a/usage/src/com/cloud/usage/UsageServer.java b/usage/src/main/java/com/cloud/usage/UsageServer.java similarity index 100% rename from usage/src/com/cloud/usage/UsageServer.java rename to usage/src/main/java/com/cloud/usage/UsageServer.java diff --git a/usage/src/com/cloud/usage/parser/IPAddressUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/IPAddressUsageParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/IPAddressUsageParser.java rename to usage/src/main/java/com/cloud/usage/parser/IPAddressUsageParser.java diff --git a/usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/LoadBalancerUsageParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java rename to usage/src/main/java/com/cloud/usage/parser/LoadBalancerUsageParser.java diff --git a/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/NetworkOfferingUsageParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java rename to usage/src/main/java/com/cloud/usage/parser/NetworkOfferingUsageParser.java diff --git a/usage/src/com/cloud/usage/parser/NetworkUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/NetworkUsageParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/NetworkUsageParser.java rename to usage/src/main/java/com/cloud/usage/parser/NetworkUsageParser.java diff --git a/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/PortForwardingUsageParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java rename to usage/src/main/java/com/cloud/usage/parser/PortForwardingUsageParser.java diff --git a/usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/SecurityGroupUsageParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java rename to usage/src/main/java/com/cloud/usage/parser/SecurityGroupUsageParser.java diff --git a/usage/src/com/cloud/usage/parser/StorageUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/StorageUsageParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/StorageUsageParser.java rename to usage/src/main/java/com/cloud/usage/parser/StorageUsageParser.java diff --git a/usage/src/com/cloud/usage/parser/UsageParser.java b/usage/src/main/java/com/cloud/usage/parser/UsageParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/UsageParser.java rename to usage/src/main/java/com/cloud/usage/parser/UsageParser.java diff --git a/usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/VMInstanceUsageParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java rename to usage/src/main/java/com/cloud/usage/parser/VMInstanceUsageParser.java diff --git a/usage/src/com/cloud/usage/parser/VMSnapshotUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/VMSnapshotUsageParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/VMSnapshotUsageParser.java rename to usage/src/main/java/com/cloud/usage/parser/VMSnapshotUsageParser.java diff --git a/usage/src/com/cloud/usage/parser/VPNUserUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/VPNUserUsageParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/VPNUserUsageParser.java rename to usage/src/main/java/com/cloud/usage/parser/VPNUserUsageParser.java diff --git a/usage/src/com/cloud/usage/parser/VmDiskUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/VmDiskUsageParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/VmDiskUsageParser.java rename to usage/src/main/java/com/cloud/usage/parser/VmDiskUsageParser.java diff --git a/usage/src/com/cloud/usage/parser/VolumeUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/VolumeUsageParser.java similarity index 100% rename from usage/src/com/cloud/usage/parser/VolumeUsageParser.java rename to usage/src/main/java/com/cloud/usage/parser/VolumeUsageParser.java diff --git a/usage/resources/usageApplicationContext.xml b/usage/src/main/resources/usageApplicationContext.xml similarity index 100% rename from usage/resources/usageApplicationContext.xml rename to usage/src/main/resources/usageApplicationContext.xml diff --git a/usage/test/com/cloud/usage/UsageManagerTest.java b/usage/src/test/java/com/cloud/usage/UsageManagerTest.java similarity index 100% rename from usage/test/com/cloud/usage/UsageManagerTest.java rename to usage/src/test/java/com/cloud/usage/UsageManagerTest.java diff --git a/usage/test/com/cloud/usage/UsageManagerTestConfiguration.java b/usage/src/test/java/com/cloud/usage/UsageManagerTestConfiguration.java similarity index 100% rename from usage/test/com/cloud/usage/UsageManagerTestConfiguration.java rename to usage/src/test/java/com/cloud/usage/UsageManagerTestConfiguration.java diff --git a/usage/test/com/cloud/usage/UsageSanityCheckerIT.java b/usage/src/test/java/com/cloud/usage/UsageSanityCheckerIT.java similarity index 100% rename from usage/test/com/cloud/usage/UsageSanityCheckerIT.java rename to usage/src/test/java/com/cloud/usage/UsageSanityCheckerIT.java diff --git a/usage/test/com/cloud/usage/UsageSanityCheckerTest.java b/usage/src/test/java/com/cloud/usage/UsageSanityCheckerTest.java similarity index 100% rename from usage/test/com/cloud/usage/UsageSanityCheckerTest.java rename to usage/src/test/java/com/cloud/usage/UsageSanityCheckerTest.java diff --git a/usage/test/resources/UsageManagerTestContext.xml b/usage/src/test/resources/UsageManagerTestContext.xml similarity index 100% rename from usage/test/resources/UsageManagerTestContext.xml rename to usage/src/test/resources/UsageManagerTestContext.xml diff --git a/usage/test/resources/cloud1.xml b/usage/src/test/resources/cloud1.xml similarity index 100% rename from usage/test/resources/cloud1.xml rename to usage/src/test/resources/cloud1.xml diff --git a/usage/test/resources/cloud2.xml b/usage/src/test/resources/cloud2.xml similarity index 100% rename from usage/test/resources/cloud2.xml rename to usage/src/test/resources/cloud2.xml diff --git a/usage/test/resources/cloud3.xml b/usage/src/test/resources/cloud3.xml similarity index 100% rename from usage/test/resources/cloud3.xml rename to usage/src/test/resources/cloud3.xml diff --git a/usage/test/resources/cloud_usage1.xml b/usage/src/test/resources/cloud_usage1.xml similarity index 100% rename from usage/test/resources/cloud_usage1.xml rename to usage/src/test/resources/cloud_usage1.xml diff --git a/usage/test/resources/cloud_usage2.xml b/usage/src/test/resources/cloud_usage2.xml similarity index 100% rename from usage/test/resources/cloud_usage2.xml rename to usage/src/test/resources/cloud_usage2.xml diff --git a/usage/test/resources/cloud_usage3.xml b/usage/src/test/resources/cloud_usage3.xml similarity index 100% rename from usage/test/resources/cloud_usage3.xml rename to usage/src/test/resources/cloud_usage3.xml diff --git a/usage/test/resources/db.properties b/usage/src/test/resources/db.properties similarity index 100% rename from usage/test/resources/db.properties rename to usage/src/test/resources/db.properties diff --git a/utils/pom.xml b/utils/pom.xml index 986827d2908e..6175283129dd 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -188,20 +188,6 @@ - src/main/java - src/test/java - target/classes - target/test-classes - - - src/main/resources - - - - - src/test/resources - - org.apache.maven.plugins diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/BaseMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/BaseMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/ClusterMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ClusterMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/ClusterMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ClusterMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/CustomFieldConstants.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/CustomFieldConstants.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/CustomFieldConstants.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/CustomFieldConstants.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/CustomFieldsManagerMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/CustomFieldsManagerMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/CustomFieldsManagerMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/CustomFieldsManagerMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatacenterMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/DatacenterMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreFile.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreFile.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreFile.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreFile.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DiskControllerType.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DiskControllerType.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/DiskControllerType.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DiskControllerType.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DistributedVirtualSwitchMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DistributedVirtualSwitchMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/DistributedVirtualSwitchMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DistributedVirtualSwitchMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/FeatureKeyConstants.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/FeatureKeyConstants.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/FeatureKeyConstants.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/FeatureKeyConstants.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreBrowserMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostDatastoreBrowserMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreBrowserMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostDatastoreBrowserMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostFirewallSystemMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostFirewallSystemMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/HostFirewallSystemMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostFirewallSystemMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostNetworkSystemMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostNetworkSystemMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/HostNetworkSystemMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostNetworkSystemMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostStorageSystemMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostStorageSystemMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/HostStorageSystemMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostStorageSystemMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostVirtualNicType.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostVirtualNicType.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/HostVirtualNicType.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostVirtualNicType.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/LicenseAssignmentManagerMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/LicenseAssignmentManagerMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/LicenseAssignmentManagerMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/LicenseAssignmentManagerMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/LicenseManagerMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/LicenseManagerMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/LicenseManagerMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/LicenseManagerMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/NetworkDetails.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/NetworkDetails.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/NetworkDetails.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/NetworkDetails.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/NetworkMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/NetworkMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/NetworkMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/NetworkMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/PerfCounterInfoMapper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/PerfCounterInfoMapper.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/PerfCounterInfoMapper.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/PerfCounterInfoMapper.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/PerfManagerMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/PerfManagerMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/PerfManagerMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/PerfManagerMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/ScsiDiskControllerType.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ScsiDiskControllerType.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/ScsiDiskControllerType.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ScsiDiskControllerType.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/TaskMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/TaskMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/TaskMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/TaskMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VersioningContants.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VersioningContants.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/VersioningContants.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VersioningContants.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualDiskManagerMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualDiskManagerMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualDiskManagerMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualDiskManagerMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualEthernetCardType.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualEthernetCardType.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualEthernetCardType.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualEthernetCardType.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineDiskInfoBuilder.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineDiskInfoBuilder.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineDiskInfoBuilder.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineDiskInfoBuilder.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualSwitchType.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualSwitchType.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualSwitchType.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualSwitchType.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VmdkAdapterType.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmdkAdapterType.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/VmdkAdapterType.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmdkAdapterType.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VmwareHostType.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHostType.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/VmwareHostType.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHostType.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHostNetworkSummary.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHostNetworkSummary.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHostNetworkSummary.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHostNetworkSummary.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHostResourceSummary.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHostResourceSummary.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHostResourceSummary.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHostResourceSummary.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareClient.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareClient.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContextPool.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContextPool.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java similarity index 100% rename from vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java rename to vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java diff --git a/vmware-base/test/com/cloud/hypervisor/vmware/mo/DatastoreMOTest.java b/vmware-base/src/test/java/com/cloud/hypervisor/vmware/mo/DatastoreMOTest.java similarity index 100% rename from vmware-base/test/com/cloud/hypervisor/vmware/mo/DatastoreMOTest.java rename to vmware-base/src/test/java/com/cloud/hypervisor/vmware/mo/DatastoreMOTest.java diff --git a/vmware-base/test/com/cloud/hypervisor/vmware/mo/HypervisorHostHelperTest.java b/vmware-base/src/test/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelperTest.java similarity index 100% rename from vmware-base/test/com/cloud/hypervisor/vmware/mo/HypervisorHostHelperTest.java rename to vmware-base/src/test/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelperTest.java diff --git a/vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java b/vmware-base/src/test/java/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java similarity index 100% rename from vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java rename to vmware-base/src/test/java/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java diff --git a/vmware-base/test/com/cloud/hypervisor/vmware/mo/VirtualMachineMOTest.java b/vmware-base/src/test/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMOTest.java similarity index 100% rename from vmware-base/test/com/cloud/hypervisor/vmware/mo/VirtualMachineMOTest.java rename to vmware-base/src/test/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMOTest.java diff --git a/vmware-base/test/com/cloud/hypervisor/vmware/mo/VmwareMOTest.java b/vmware-base/src/test/java/com/cloud/hypervisor/vmware/mo/VmwareMOTest.java similarity index 100% rename from vmware-base/test/com/cloud/hypervisor/vmware/mo/VmwareMOTest.java rename to vmware-base/src/test/java/com/cloud/hypervisor/vmware/mo/VmwareMOTest.java diff --git a/vmware-base/test/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java b/vmware-base/src/test/java/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java similarity index 100% rename from vmware-base/test/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java rename to vmware-base/src/test/java/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java diff --git a/vmware-base/test/com/cloud/hypervisor/vmware/util/VmwareContextTest.java b/vmware-base/src/test/java/com/cloud/hypervisor/vmware/util/VmwareContextTest.java similarity index 100% rename from vmware-base/test/com/cloud/hypervisor/vmware/util/VmwareContextTest.java rename to vmware-base/src/test/java/com/cloud/hypervisor/vmware/util/VmwareContextTest.java From c591c5ad3e270e5e62166a7f1ff6f9895d4b102c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Tue, 23 Jan 2018 09:19:36 -0200 Subject: [PATCH 003/145] CLOUDSTACK-10248: Fix errors that appeared after #2283 (#2417) This fixes move refactoring error introduced in #2283 For instance, the class DatadiskTO is supposed to be in com.cloud.agent.api.to package. However, the folder structure it was placed in is com.cloud.agent.api.api.to. Skip tests for cloud-plugin-hypervisor-ovm3: For some unknown reason, there are quite a lot of broken test cases for cloud-plugin-hypervisor-ovm3. They might have appeared after some dependency upgrade and was overlooked by the person updating them. I checked them to see if they could be fixed, but these tests are not developed in a clear and clean manner. On top of that, we do not see (at least I) people using OVM3-hypervisor with ACS. Therefore, I decided to skip them. Identention corrected to use spaces instead of tabs in XML files --- .../download/DirectTemplateDownloader.java | 0 .../DirectTemplateDownloaderImpl.java | 0 .../HttpDirectTemplateDownloader.java | 0 .../HttpsDirectTemplateDownloader.java | 0 .../MetalinkDirectTemplateDownloader.java | 0 .../download/NfsDirectTemplateDownloader.java | 0 .../DirectTemplateDownloaderImplTest.java | 0 .../api/{api => }/storage/OVFHelper.java | 0 .../agent/api/{api => }/to/DatadiskTO.java | 0 ...loadTemplateDirectDownloadCertificate.java | 178 +++++++++--------- .../CreateManagementNetworkIpRangeCmd.java | 0 .../DeleteManagementNetworkIpRangeCmd.java | 0 .../admin/network/MigrateNetworkCmd.java | 0 .../command/admin/network/MigrateVPCCmd.java | 0 .../api/command/admin/user/MoveUserCmd.java | 0 .../api/response/ChildTemplateResponse.java | 0 .../download/DirectDownloadManager.java | 0 .../agent/api/{api => }/ReplugNicAnswer.java | 0 .../agent/api/{api => }/ReplugNicCommand.java | 0 .../storage/CreateDatadiskTemplateAnswer.java | 0 .../CreateDatadiskTemplateCommand.java | 0 .../{api => }/storage/GetDatadisksAnswer.java | 0 .../storage/GetDatadisksCommand.java | 0 .../template/MetalinkTemplateDownloader.java | 0 .../ManagementServiceConfiguration.java | 0 .../ManagementServiceConfigurationImpl.java | 0 .../domain/{domain => }/DomainDetailVO.java | 0 .../{domain => }/dao/DomainDetailsDao.java | 0 .../dao/DomainDetailsDaoImpl.java | 0 .../usage/UsageSnapshotOnPrimaryVO.java | 0 .../dao/UsageVMSnapshotOnPrimaryDao.java | 0 .../dao/UsageVMSnapshotOnPrimaryDaoImpl.java | 0 .../vm/snapshot/dao/VmSnapshotDaoTest.java | 8 +- .../allocator/StorageAllocatorTest.java | 28 +-- .../test/DirectAgentManagerSimpleImpl.java | 11 +- .../cloudstack/storage/test/SnapshotTest.java | 29 ++- .../test/SnapshotTestWithFakeData.java | 126 ++++++------- .../storage/test/VolumeServiceTest.java | 18 +- .../cloudstack/storage/test/VolumeTest.java | 26 ++- .../storage/test/VolumeTestVmware.java | 21 +-- .../LibvirtReplugNicCommandWrapper.java | 0 plugins/hypervisors/ovm3/pom.xml | 147 ++++++++------- .../hypervisor/ovm3/objects/OvmObject.java | 8 +- .../hypervisor/XenServerGuruTest.java | 0 .../NuageVspCheckHealthCommandWrapper.java | 0 ...uageVspExtraDhcpOptionsCommandWrapper.java | 0 .../command/LinkAccountToLdapCmd.java | 0 .../response/LinkAccountToLdapResponse.java | 0 .../network/NetworkMigrationManager.java | 0 .../network/NetworkMigrationManagerImpl.java | 0 .../download/DirectDownloadManagerImpl.java | 0 .../DirectDownloadManagerImplTest.java | 0 .../parser/VMSanpshotOnPrimaryParser.java | 0 53 files changed, 306 insertions(+), 294 deletions(-) rename agent/src/main/java/com/cloud/agent/{agent => }/direct/download/DirectTemplateDownloader.java (100%) rename agent/src/main/java/com/cloud/agent/{agent => }/direct/download/DirectTemplateDownloaderImpl.java (100%) rename agent/src/main/java/com/cloud/agent/{agent => }/direct/download/HttpDirectTemplateDownloader.java (100%) rename agent/src/main/java/com/cloud/agent/{agent => }/direct/download/HttpsDirectTemplateDownloader.java (100%) rename agent/src/main/java/com/cloud/agent/{agent => }/direct/download/MetalinkDirectTemplateDownloader.java (100%) rename agent/src/main/java/com/cloud/agent/{agent => }/direct/download/NfsDirectTemplateDownloader.java (100%) rename agent/src/test/java/com/cloud/agent/{agent => }/direct/download/DirectTemplateDownloaderImplTest.java (100%) rename api/src/main/java/com/cloud/agent/api/{api => }/storage/OVFHelper.java (100%) rename api/src/main/java/com/cloud/agent/api/{api => }/to/DatadiskTO.java (100%) rename api/src/main/java/org/apache/cloudstack/{cloudstack => }/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java (97%) mode change 100755 => 100644 rename api/src/main/java/org/apache/cloudstack/{cloudstack => }/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java (100%) rename api/src/main/java/org/apache/cloudstack/{cloudstack => }/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java (100%) rename api/src/main/java/org/apache/cloudstack/{cloudstack => }/api/command/admin/network/MigrateNetworkCmd.java (100%) rename api/src/main/java/org/apache/cloudstack/{cloudstack => }/api/command/admin/network/MigrateVPCCmd.java (100%) rename api/src/main/java/org/apache/cloudstack/{cloudstack => }/api/command/admin/user/MoveUserCmd.java (100%) rename api/src/main/java/org/apache/cloudstack/{cloudstack => }/api/response/ChildTemplateResponse.java (100%) rename api/src/main/java/org/apache/cloudstack/{cloudstack => }/direct/download/DirectDownloadManager.java (100%) rename core/src/main/java/com/cloud/agent/api/{api => }/ReplugNicAnswer.java (100%) rename core/src/main/java/com/cloud/agent/api/{api => }/ReplugNicCommand.java (100%) rename core/src/main/java/com/cloud/agent/api/{api => }/storage/CreateDatadiskTemplateAnswer.java (100%) rename core/src/main/java/com/cloud/agent/api/{api => }/storage/CreateDatadiskTemplateCommand.java (100%) rename core/src/main/java/com/cloud/agent/api/{api => }/storage/GetDatadisksAnswer.java (100%) rename core/src/main/java/com/cloud/agent/api/{api => }/storage/GetDatadisksCommand.java (100%) rename core/src/main/java/com/cloud/{cloud => }/storage/template/MetalinkTemplateDownloader.java (100%) rename engine/schema/src/main/java/com/cloud/{cloud => }/configuration/ManagementServiceConfiguration.java (100%) rename engine/schema/src/main/java/com/cloud/{cloud => }/configuration/ManagementServiceConfigurationImpl.java (100%) rename engine/schema/src/main/java/com/cloud/domain/{domain => }/DomainDetailVO.java (100%) rename engine/schema/src/main/java/com/cloud/domain/{domain => }/dao/DomainDetailsDao.java (100%) rename engine/schema/src/main/java/com/cloud/domain/{domain => }/dao/DomainDetailsDaoImpl.java (100%) rename engine/schema/src/main/java/com/cloud/{cloud => }/usage/UsageSnapshotOnPrimaryVO.java (100%) rename engine/schema/src/main/java/com/cloud/{cloud => }/usage/dao/UsageVMSnapshotOnPrimaryDao.java (100%) rename engine/schema/src/main/java/com/cloud/{cloud => }/usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java (100%) rename plugins/hypervisors/kvm/src/main/java/com/cloud/{cloud => }/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java (100%) rename plugins/hypervisors/xenserver/src/test/java/com/cloud/{cloud => }/hypervisor/XenServerGuruTest.java (100%) rename plugins/network-elements/nuage-vsp/src/main/java/com/{com => }/cloud/network/vsp/resource/wrapper/NuageVspCheckHealthCommandWrapper.java (100%) rename plugins/network-elements/nuage-vsp/src/main/java/com/{com => }/cloud/network/vsp/resource/wrapper/NuageVspExtraDhcpOptionsCommandWrapper.java (100%) rename plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/{api => }/command/LinkAccountToLdapCmd.java (100%) rename plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/{api => }/response/LinkAccountToLdapResponse.java (100%) rename server/src/main/java/com/cloud/{cloud => }/network/NetworkMigrationManager.java (100%) rename server/src/main/java/com/cloud/{cloud => }/network/NetworkMigrationManagerImpl.java (100%) rename server/src/main/java/org/apache/cloudstack/{cloudstack => }/direct/download/DirectDownloadManagerImpl.java (100%) mode change 100755 => 100644 rename server/src/test/java/org/apache/cloudstack/{cloudstack => }/direct/download/DirectDownloadManagerImplTest.java (100%) rename usage/src/main/java/com/cloud/{cloud => }/usage/parser/VMSanpshotOnPrimaryParser.java (100%) diff --git a/agent/src/main/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloader.java similarity index 100% rename from agent/src/main/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloader.java rename to agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloader.java diff --git a/agent/src/main/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloaderImpl.java b/agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java similarity index 100% rename from agent/src/main/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloaderImpl.java rename to agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java diff --git a/agent/src/main/java/com/cloud/agent/agent/direct/download/HttpDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/direct/download/HttpDirectTemplateDownloader.java similarity index 100% rename from agent/src/main/java/com/cloud/agent/agent/direct/download/HttpDirectTemplateDownloader.java rename to agent/src/main/java/com/cloud/agent/direct/download/HttpDirectTemplateDownloader.java diff --git a/agent/src/main/java/com/cloud/agent/agent/direct/download/HttpsDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/direct/download/HttpsDirectTemplateDownloader.java similarity index 100% rename from agent/src/main/java/com/cloud/agent/agent/direct/download/HttpsDirectTemplateDownloader.java rename to agent/src/main/java/com/cloud/agent/direct/download/HttpsDirectTemplateDownloader.java diff --git a/agent/src/main/java/com/cloud/agent/agent/direct/download/MetalinkDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java similarity index 100% rename from agent/src/main/java/com/cloud/agent/agent/direct/download/MetalinkDirectTemplateDownloader.java rename to agent/src/main/java/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java diff --git a/agent/src/main/java/com/cloud/agent/agent/direct/download/NfsDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/direct/download/NfsDirectTemplateDownloader.java similarity index 100% rename from agent/src/main/java/com/cloud/agent/agent/direct/download/NfsDirectTemplateDownloader.java rename to agent/src/main/java/com/cloud/agent/direct/download/NfsDirectTemplateDownloader.java diff --git a/agent/src/test/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloaderImplTest.java b/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java similarity index 100% rename from agent/src/test/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloaderImplTest.java rename to agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java diff --git a/api/src/main/java/com/cloud/agent/api/api/storage/OVFHelper.java b/api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java similarity index 100% rename from api/src/main/java/com/cloud/agent/api/api/storage/OVFHelper.java rename to api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java diff --git a/api/src/main/java/com/cloud/agent/api/api/to/DatadiskTO.java b/api/src/main/java/com/cloud/agent/api/to/DatadiskTO.java similarity index 100% rename from api/src/main/java/com/cloud/agent/api/api/to/DatadiskTO.java rename to api/src/main/java/com/cloud/agent/api/to/DatadiskTO.java diff --git a/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java old mode 100755 new mode 100644 similarity index 97% rename from api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java index cd95e10d608d..58fc1005ba28 --- a/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java @@ -1,89 +1,89 @@ -// 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.command.admin.direct.download; - -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.exception.NetworkRuleConflictException; -import org.apache.cloudstack.acl.RoleType; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.direct.download.DirectDownloadManager; -import org.apache.log4j.Logger; - -import javax.inject.Inject; - -@APICommand(name = UploadTemplateDirectDownloadCertificate.APINAME, - description = "Upload a certificate for HTTPS direct template download on KVM hosts", - responseObject = SuccessResponse.class, - requestHasSensitiveInfo = true, - responseHasSensitiveInfo = true, - since = "4.11.0", - authorized = {RoleType.Admin}) -public class UploadTemplateDirectDownloadCertificate extends BaseCmd { - - @Inject - DirectDownloadManager directDownloadManager; - - private static final Logger LOG = Logger.getLogger(UploadTemplateDirectDownloadCertificate.class); - public static final String APINAME = "uploadTemplateDirectDownloadCertificate"; - - @Parameter(name = ApiConstants.CERTIFICATE, type = BaseCmd.CommandType.STRING, required = true, length = 65535, - description = "SSL certificate") - private String certificate; - - @Parameter(name = ApiConstants.NAME , type = BaseCmd.CommandType.STRING, required = true, - description = "Name for the uploaded certificate") - private String name; - - @Parameter(name = ApiConstants.HYPERVISOR, type = BaseCmd.CommandType.STRING, required = true, description = "Hypervisor type") - private String hypervisor; - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException { - if (!hypervisor.equalsIgnoreCase("kvm")) { - throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Currently supporting KVM hosts only"); - } - - try { - directDownloadManager.uploadCertificateToHosts(certificate, name);; - setResponseObject(new SuccessResponse(getCommandName())); - } catch (Exception e) { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); - } - } - - @Override - public String getCommandName() { - return UploadTemplateDirectDownloadCertificate.APINAME; - } - - @Override - public long getEntityOwnerId() { - return CallContext.current().getCallingAccount().getId(); - } -} - - +// 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.command.admin.direct.download; + +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.exception.NetworkRuleConflictException; +import org.apache.cloudstack.acl.RoleType; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.direct.download.DirectDownloadManager; +import org.apache.log4j.Logger; + +import javax.inject.Inject; + +@APICommand(name = UploadTemplateDirectDownloadCertificate.APINAME, + description = "Upload a certificate for HTTPS direct template download on KVM hosts", + responseObject = SuccessResponse.class, + requestHasSensitiveInfo = true, + responseHasSensitiveInfo = true, + since = "4.11.0", + authorized = {RoleType.Admin}) +public class UploadTemplateDirectDownloadCertificate extends BaseCmd { + + @Inject + DirectDownloadManager directDownloadManager; + + private static final Logger LOG = Logger.getLogger(UploadTemplateDirectDownloadCertificate.class); + public static final String APINAME = "uploadTemplateDirectDownloadCertificate"; + + @Parameter(name = ApiConstants.CERTIFICATE, type = BaseCmd.CommandType.STRING, required = true, length = 65535, + description = "SSL certificate") + private String certificate; + + @Parameter(name = ApiConstants.NAME , type = BaseCmd.CommandType.STRING, required = true, + description = "Name for the uploaded certificate") + private String name; + + @Parameter(name = ApiConstants.HYPERVISOR, type = BaseCmd.CommandType.STRING, required = true, description = "Hypervisor type") + private String hypervisor; + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException { + if (!hypervisor.equalsIgnoreCase("kvm")) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Currently supporting KVM hosts only"); + } + + try { + directDownloadManager.uploadCertificateToHosts(certificate, name);; + setResponseObject(new SuccessResponse(getCommandName())); + } catch (Exception e) { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); + } + } + + @Override + public String getCommandName() { + return UploadTemplateDirectDownloadCertificate.APINAME; + } + + @Override + public long getEntityOwnerId() { + return CallContext.current().getCallingAccount().getId(); + } +} + + diff --git a/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java similarity index 100% rename from api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java diff --git a/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java similarity index 100% rename from api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java diff --git a/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/MigrateNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java similarity index 100% rename from api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/MigrateNetworkCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java diff --git a/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/MigrateVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java similarity index 100% rename from api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/MigrateVPCCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java diff --git a/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/user/MoveUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java similarity index 100% rename from api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/user/MoveUserCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java diff --git a/api/src/main/java/org/apache/cloudstack/cloudstack/api/response/ChildTemplateResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ChildTemplateResponse.java similarity index 100% rename from api/src/main/java/org/apache/cloudstack/cloudstack/api/response/ChildTemplateResponse.java rename to api/src/main/java/org/apache/cloudstack/api/response/ChildTemplateResponse.java diff --git a/api/src/main/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManager.java b/api/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManager.java similarity index 100% rename from api/src/main/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManager.java rename to api/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManager.java diff --git a/core/src/main/java/com/cloud/agent/api/api/ReplugNicAnswer.java b/core/src/main/java/com/cloud/agent/api/ReplugNicAnswer.java similarity index 100% rename from core/src/main/java/com/cloud/agent/api/api/ReplugNicAnswer.java rename to core/src/main/java/com/cloud/agent/api/ReplugNicAnswer.java diff --git a/core/src/main/java/com/cloud/agent/api/api/ReplugNicCommand.java b/core/src/main/java/com/cloud/agent/api/ReplugNicCommand.java similarity index 100% rename from core/src/main/java/com/cloud/agent/api/api/ReplugNicCommand.java rename to core/src/main/java/com/cloud/agent/api/ReplugNicCommand.java diff --git a/core/src/main/java/com/cloud/agent/api/api/storage/CreateDatadiskTemplateAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/CreateDatadiskTemplateAnswer.java similarity index 100% rename from core/src/main/java/com/cloud/agent/api/api/storage/CreateDatadiskTemplateAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/CreateDatadiskTemplateAnswer.java diff --git a/core/src/main/java/com/cloud/agent/api/api/storage/CreateDatadiskTemplateCommand.java b/core/src/main/java/com/cloud/agent/api/storage/CreateDatadiskTemplateCommand.java similarity index 100% rename from core/src/main/java/com/cloud/agent/api/api/storage/CreateDatadiskTemplateCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/CreateDatadiskTemplateCommand.java diff --git a/core/src/main/java/com/cloud/agent/api/api/storage/GetDatadisksAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/GetDatadisksAnswer.java similarity index 100% rename from core/src/main/java/com/cloud/agent/api/api/storage/GetDatadisksAnswer.java rename to core/src/main/java/com/cloud/agent/api/storage/GetDatadisksAnswer.java diff --git a/core/src/main/java/com/cloud/agent/api/api/storage/GetDatadisksCommand.java b/core/src/main/java/com/cloud/agent/api/storage/GetDatadisksCommand.java similarity index 100% rename from core/src/main/java/com/cloud/agent/api/api/storage/GetDatadisksCommand.java rename to core/src/main/java/com/cloud/agent/api/storage/GetDatadisksCommand.java diff --git a/core/src/main/java/com/cloud/cloud/storage/template/MetalinkTemplateDownloader.java b/core/src/main/java/com/cloud/storage/template/MetalinkTemplateDownloader.java similarity index 100% rename from core/src/main/java/com/cloud/cloud/storage/template/MetalinkTemplateDownloader.java rename to core/src/main/java/com/cloud/storage/template/MetalinkTemplateDownloader.java diff --git a/engine/schema/src/main/java/com/cloud/cloud/configuration/ManagementServiceConfiguration.java b/engine/schema/src/main/java/com/cloud/configuration/ManagementServiceConfiguration.java similarity index 100% rename from engine/schema/src/main/java/com/cloud/cloud/configuration/ManagementServiceConfiguration.java rename to engine/schema/src/main/java/com/cloud/configuration/ManagementServiceConfiguration.java diff --git a/engine/schema/src/main/java/com/cloud/cloud/configuration/ManagementServiceConfigurationImpl.java b/engine/schema/src/main/java/com/cloud/configuration/ManagementServiceConfigurationImpl.java similarity index 100% rename from engine/schema/src/main/java/com/cloud/cloud/configuration/ManagementServiceConfigurationImpl.java rename to engine/schema/src/main/java/com/cloud/configuration/ManagementServiceConfigurationImpl.java diff --git a/engine/schema/src/main/java/com/cloud/domain/domain/DomainDetailVO.java b/engine/schema/src/main/java/com/cloud/domain/DomainDetailVO.java similarity index 100% rename from engine/schema/src/main/java/com/cloud/domain/domain/DomainDetailVO.java rename to engine/schema/src/main/java/com/cloud/domain/DomainDetailVO.java diff --git a/engine/schema/src/main/java/com/cloud/domain/domain/dao/DomainDetailsDao.java b/engine/schema/src/main/java/com/cloud/domain/dao/DomainDetailsDao.java similarity index 100% rename from engine/schema/src/main/java/com/cloud/domain/domain/dao/DomainDetailsDao.java rename to engine/schema/src/main/java/com/cloud/domain/dao/DomainDetailsDao.java diff --git a/engine/schema/src/main/java/com/cloud/domain/domain/dao/DomainDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/domain/dao/DomainDetailsDaoImpl.java similarity index 100% rename from engine/schema/src/main/java/com/cloud/domain/domain/dao/DomainDetailsDaoImpl.java rename to engine/schema/src/main/java/com/cloud/domain/dao/DomainDetailsDaoImpl.java diff --git a/engine/schema/src/main/java/com/cloud/cloud/usage/UsageSnapshotOnPrimaryVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageSnapshotOnPrimaryVO.java similarity index 100% rename from engine/schema/src/main/java/com/cloud/cloud/usage/UsageSnapshotOnPrimaryVO.java rename to engine/schema/src/main/java/com/cloud/usage/UsageSnapshotOnPrimaryVO.java diff --git a/engine/schema/src/main/java/com/cloud/cloud/usage/dao/UsageVMSnapshotOnPrimaryDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVMSnapshotOnPrimaryDao.java similarity index 100% rename from engine/schema/src/main/java/com/cloud/cloud/usage/dao/UsageVMSnapshotOnPrimaryDao.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageVMSnapshotOnPrimaryDao.java diff --git a/engine/schema/src/main/java/com/cloud/cloud/usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java similarity index 100% rename from engine/schema/src/main/java/com/cloud/cloud/usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java rename to engine/schema/src/main/java/com/cloud/usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java diff --git a/engine/storage/integration-test/src/test/java/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java b/engine/storage/integration-test/src/test/java/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java index 38b4f29a324f..be8d04a8a0e8 100644 --- a/engine/storage/integration-test/src/test/java/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java +++ b/engine/storage/integration-test/src/test/java/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java @@ -22,15 +22,13 @@ import javax.inject.Inject; -import junit.framework.Assert; - +import org.apache.cloudstack.storage.test.CloudStackTestNGBase; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.apache.cloudstack.storage.test.CloudStackTestNGBase; - import com.cloud.vm.snapshot.VMSnapshotDetailsVO; @RunWith(SpringJUnit4ClassRunner.class) @@ -41,7 +39,7 @@ public class VmSnapshotDaoTest extends CloudStackTestNGBase { @Test public void testVmSnapshotDetails() { - VMSnapshotDetailsVO detailsVO = new VMSnapshotDetailsVO(1L, "test", "foo", display); + VMSnapshotDetailsVO detailsVO = new VMSnapshotDetailsVO(1L, "test", "foo", true); vmsnapshotDetailsDao.persist(detailsVO); Map details = vmsnapshotDetailsDao.listDetailsKeyPairs(1L); Assert.assertTrue(details.containsKey("test")); diff --git a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java index 3c4caee036e3..0d2ebf559e89 100644 --- a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java +++ b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java @@ -22,16 +22,6 @@ import javax.inject.Inject; -import junit.framework.Assert; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Matchers; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManager; import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; @@ -41,6 +31,13 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO; import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import com.cloud.configuration.Config; import com.cloud.dc.ClusterVO; @@ -58,6 +55,7 @@ import com.cloud.org.Managed.ManagedState; import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.ScopeType; +import com.cloud.storage.Storage; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePool; @@ -72,6 +70,8 @@ import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachineProfile; +import junit.framework.Assert; + @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:/storageContext.xml") public class StorageAllocatorTest { @@ -119,8 +119,8 @@ public void setup() throws Exception { protected void createDb() { DataCenterVO dc = - new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, - true, null, null); + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); @@ -164,8 +164,8 @@ protected void createDb() { diskOfferingId = diskOffering.getId(); volume = - new VolumeVO(Volume.Type.ROOT, "volume", dcId, 1, 1, diskOffering.getId(), diskOffering.getDiskSize(), diskOffering.getMinIops(), diskOffering.getMaxIops(), - ""); + new VolumeVO(Volume.Type.ROOT, "volume", dcId, 1, 1, diskOffering.getId(), Storage.ProvisioningType.THIN, diskOffering.getDiskSize(), diskOffering.getMinIops(), + diskOffering.getMaxIops(), ""); volume = volumeDao.persist(volume); volumeId = volume.getId(); } diff --git a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java index 0e4755e03452..30cba4d6c71e 100644 --- a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java +++ b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java @@ -154,7 +154,7 @@ protected void loadResource(Long hostId) { VmwareServerDiscoverer discover = new VmwareServerDiscoverer(); Map> resources = - discover.find(host.getDataCenterId(), host.getPodId(), host.getClusterId(), uri, userName, password, null); + discover.find(host.getDataCenterId(), host.getPodId(), host.getClusterId(), uri, userName, password, null); for (Map.Entry> entry : resources.entrySet()) { resource = entry.getKey(); } @@ -290,4 +290,13 @@ public void notifyMonitorsOfHostAboutToBeRemoved(long hostId) { @Override public void notifyMonitorsOfRemovedHost(long hostId, long clusterId) { } + + @Override + public void disconnectWithInvestigation(long hostId, Event event) { + + } + + @Override + public void notifyMonitorsOfNewlyAddedHost(long hostId) { + } } diff --git a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTest.java index 1b5746ddfe26..0185c0d19342 100644 --- a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTest.java +++ b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTest.java @@ -26,14 +26,6 @@ import javax.inject.Inject; -import junit.framework.Assert; - -import org.mockito.Matchers; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.testng.AssertJUnit; -import org.testng.annotations.Test; - import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; @@ -67,6 +59,11 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.to.TemplateObjectTO; +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.testng.AssertJUnit; +import org.testng.annotations.Test; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Command; @@ -90,6 +87,7 @@ import com.cloud.storage.DataStoreRole; import com.cloud.storage.ScopeType; import com.cloud.storage.Snapshot; +import com.cloud.storage.Snapshot.LocationType; import com.cloud.storage.SnapshotVO; import com.cloud.storage.Storage; import com.cloud.storage.Storage.ImageFormat; @@ -104,6 +102,8 @@ import com.cloud.storage.dao.VolumeDao; import com.cloud.utils.component.ComponentContext; +import junit.framework.Assert; + @ContextConfiguration(locations = {"classpath:/storageContext.xml"}) public class SnapshotTest extends CloudStackTestNGBase { @Inject @@ -182,8 +182,8 @@ public void setUp() { } else { // create data center DataCenterVO dc = - new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, - true, null, null); + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); // create pod @@ -340,14 +340,13 @@ public DataStore createPrimaryDataStore() { private SnapshotVO createSnapshotInDb(VolumeInfo volume) { Snapshot.Type snapshotType = Snapshot.Type.MANUAL; SnapshotVO snapshotVO = - new SnapshotVO(volume.getDataCenterId(), 2, 1, volume.getId(), 1L, UUID.randomUUID().toString(), (short)snapshotType.ordinal(), snapshotType.name(), - volume.getSize(), HypervisorType.XenServer); + new SnapshotVO(volume.getDataCenterId(), 2, 1, volume.getId(), 1L, UUID.randomUUID().toString(), (short)snapshotType.ordinal(), snapshotType.name(), + volume.getSize(), 1L, 100L, HypervisorType.XenServer, LocationType.PRIMARY); return this.snapshotDao.persist(snapshotVO); } private VolumeVO createVolume(Long templateId, long dataStoreId) { - - VolumeVO volume = new VolumeVO(Volume.Type.DATADISK, UUID.randomUUID().toString(), this.dcId, 1L, 1L, 1L, 1000, 0L, 0L, ""); + VolumeVO volume = new VolumeVO(Volume.Type.DATADISK, UUID.randomUUID().toString(), this.dcId, 1L, 1L, 1L, Storage.ProvisioningType.THIN, 1000, 0L, 0L, ""); volume.setDataCenterId(this.dcId); volume.setPoolId(dataStoreId); volume = volumeDao.persist(volume); @@ -361,7 +360,7 @@ public VolumeInfo createCopyBaseImage() throws InterruptedException, ExecutionEx VolumeVO volume = createVolume(image.getId(), primaryStore.getId()); VolumeInfo volInfo = this.volFactory.getVolume(volume.getId()); AsyncCallFuture future = - this.volumeService.createVolumeFromTemplateAsync(volInfo, this.primaryStoreId, this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image)); + this.volumeService.createVolumeFromTemplateAsync(volInfo, this.primaryStoreId, this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image)); VolumeApiResult result; result = future.get(); diff --git a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java index 8c7b06d872ed..a3961ace64bb 100644 --- a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java +++ b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java @@ -36,16 +36,6 @@ import javax.inject.Inject; -import junit.framework.Assert; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Matchers; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; @@ -65,6 +55,13 @@ import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.volume.VolumeObject; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Matchers; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import com.cloud.dc.ClusterVO; import com.cloud.dc.DataCenter; @@ -81,6 +78,7 @@ import com.cloud.storage.DataStoreRole; import com.cloud.storage.ScopeType; import com.cloud.storage.Snapshot; +import com.cloud.storage.Snapshot.LocationType; import com.cloud.storage.SnapshotPolicyVO; import com.cloud.storage.SnapshotVO; import com.cloud.storage.Storage; @@ -97,6 +95,8 @@ import com.cloud.utils.component.ComponentContext; import com.cloud.utils.db.Merovingian2; +import junit.framework.Assert; + @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:/fakeDriverTestContext.xml"}) public class SnapshotTestWithFakeData { @@ -148,8 +148,8 @@ public void setUp() { // create data center DataCenterVO dc = - new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, DataCenter.NetworkType.Basic, null, - null, true, true, null, null); + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, DataCenter.NetworkType.Basic, null, + null, true, true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); // create pod @@ -206,21 +206,21 @@ public void tearDown() throws Exception { private SnapshotVO createSnapshotInDb() { Snapshot.Type snapshotType = Snapshot.Type.RECURRING; SnapshotVO snapshotVO = - new SnapshotVO(dcId, 2, 1, 1L, 1L, UUID.randomUUID().toString(), (short)snapshotType.ordinal(), snapshotType.name(), 100, Hypervisor.HypervisorType.XenServer); + new SnapshotVO(dcId, 2, 1, 1L, 1L, UUID.randomUUID().toString(), (short)snapshotType.ordinal(), snapshotType.name(), 100, 1L, 100L, Hypervisor.HypervisorType.XenServer, + LocationType.PRIMARY); return snapshotDao.persist(snapshotVO); } private SnapshotVO createSnapshotInDb(Long volumeId) { Snapshot.Type snapshotType = Snapshot.Type.DAILY; SnapshotVO snapshotVO = - new SnapshotVO(dcId, 2, 1, volumeId, 1L, UUID.randomUUID().toString(), (short)snapshotType.ordinal(), snapshotType.name(), 100, - Hypervisor.HypervisorType.XenServer); + new SnapshotVO(dcId, 2, 1, 1L, 1L, UUID.randomUUID().toString(), (short)snapshotType.ordinal(), snapshotType.name(), 100, 1L, 100L, Hypervisor.HypervisorType.XenServer, + LocationType.PRIMARY); return snapshotDao.persist(snapshotVO); } private VolumeInfo createVolume(Long templateId, DataStore store) { - VolumeVO volume = new VolumeVO(Volume.Type.DATADISK, UUID.randomUUID().toString(), dcId, 1L, 1L, 1L, 1000, 0L, 0L, ""); - ; + VolumeVO volume = new VolumeVO(Volume.Type.DATADISK, UUID.randomUUID().toString(), dcId, 1L, 1L, 1L, Storage.ProvisioningType.THIN, 1000, 0L, 0L, ""); volume.setPoolId(store.getId()); volume = volumeDao.persist(volume); @@ -261,7 +261,7 @@ public void testTakeSnapshot() throws URISyntaxException { SnapshotDataStoreVO storeRef = snapshotDataStoreDao.findByStoreSnapshot(store.getRole(), store.getId(), snapshotVO.getId()); Assert.assertTrue(storeRef != null); Assert.assertTrue(storeRef.getState() == ObjectInDataStoreStateMachine.State.Ready); - snapshotInfo = result.getSnashot(); + snapshotInfo = result.getSnapshot(); boolean deletResult = snapshotService.deleteSnapshot(snapshotInfo); Assert.assertTrue(deletResult); snapshotDataStoreDao.expunge(storeRef.getId()); @@ -305,55 +305,55 @@ public void testTakeSnapshotFromVolume() throws URISyntaxException { } protected SnapshotPolicyVO createSnapshotPolicy(Long volId) { - SnapshotPolicyVO policyVO = new SnapshotPolicyVO(volId, "jfkd", "fdfd", DateUtil.IntervalType.DAILY, 8); - policyVO = snapshotPolicyDao.persist(policyVO); - return policyVO; - } + SnapshotPolicyVO policyVO = new SnapshotPolicyVO(volId, "jfkd", "fdfd", DateUtil.IntervalType.DAILY, 8, true); + policyVO = snapshotPolicyDao.persist(policyVO); + return policyVO; + } - @Test - public void testConcurrentSnapshot() throws URISyntaxException, InterruptedException, ExecutionException { - DataStore store = createDataStore(); - final FakePrimaryDataStoreDriver dataStoreDriver = (FakePrimaryDataStoreDriver)store.getDriver(); - dataStoreDriver.makeTakeSnapshotSucceed(true); - final VolumeInfo volumeInfo = createVolume(1L, store); - Assert.assertTrue(volumeInfo.getState() == Volume.State.Ready); - vol = volumeInfo; - // final SnapshotPolicyVO policyVO = createSnapshotPolicy(vol.getId()); + @Test + public void testConcurrentSnapshot() throws URISyntaxException, InterruptedException, ExecutionException { + DataStore store = createDataStore(); + final FakePrimaryDataStoreDriver dataStoreDriver = (FakePrimaryDataStoreDriver)store.getDriver(); + dataStoreDriver.makeTakeSnapshotSucceed(true); + final VolumeInfo volumeInfo = createVolume(1L, store); + Assert.assertTrue(volumeInfo.getState() == Volume.State.Ready); + vol = volumeInfo; + // final SnapshotPolicyVO policyVO = createSnapshotPolicy(vol.getId()); - ExecutorService pool = Executors.newFixedThreadPool(2); - boolean result = false; - List> future = new ArrayList>(); - for (int i = 0; i < 12; i++) { - final int cnt = i; - Future task = pool.submit(new Callable() { - @Override - public Boolean call() throws Exception { - boolean r = true; - try { - SnapshotVO snapshotVO = createSnapshotInDb(vol.getId()); - VolumeObject volumeObject = (VolumeObject)vol; - Account account = mock(Account.class); - when(account.getId()).thenReturn(1L); - CreateSnapshotPayload createSnapshotPayload = mock(CreateSnapshotPayload.class); - when(createSnapshotPayload.getAccount()).thenReturn(account); - when(createSnapshotPayload.getSnapshotId()).thenReturn(snapshotVO.getId()); - when(createSnapshotPayload.getSnapshotPolicyId()).thenReturn(0L); - volumeObject.addPayload(createSnapshotPayload); - if (cnt > 8) { - mockStorageMotionStrategy.makeBackupSnapshotSucceed(false); - } - SnapshotInfo newSnapshot = volumeService.takeSnapshot(vol); - if (newSnapshot == null) { + ExecutorService pool = Executors.newFixedThreadPool(2); + boolean result = false; + List> future = new ArrayList>(); + for (int i = 0; i < 12; i++) { + final int cnt = i; + Future task = pool.submit(new Callable() { + @Override + public Boolean call() throws Exception { + boolean r = true; + try { + SnapshotVO snapshotVO = createSnapshotInDb(vol.getId()); + VolumeObject volumeObject = (VolumeObject)vol; + Account account = mock(Account.class); + when(account.getId()).thenReturn(1L); + CreateSnapshotPayload createSnapshotPayload = mock(CreateSnapshotPayload.class); + when(createSnapshotPayload.getAccount()).thenReturn(account); + when(createSnapshotPayload.getSnapshotId()).thenReturn(snapshotVO.getId()); + when(createSnapshotPayload.getSnapshotPolicyId()).thenReturn(0L); + volumeObject.addPayload(createSnapshotPayload); + if (cnt > 8) { + mockStorageMotionStrategy.makeBackupSnapshotSucceed(false); + } + SnapshotInfo newSnapshot = volumeService.takeSnapshot(vol); + if (newSnapshot == null) { + r = false; + } + } catch (Exception e) { r = false; } - } catch (Exception e) { - r = false; + return r; } - return r; - } - }); - Assert.assertTrue(task.get()); - } + }); + Assert.assertTrue(task.get()); + } + } } -} diff --git a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeServiceTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeServiceTest.java index 0fc6f593d8ce..9a680ed7fd38 100644 --- a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeServiceTest.java +++ b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeServiceTest.java @@ -29,12 +29,6 @@ import javax.inject.Inject; -import org.mockito.Matchers; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.testng.Assert; -import org.testng.annotations.Test; - import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; @@ -56,6 +50,11 @@ import org.apache.cloudstack.storage.datastore.db.ImageStoreVO; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.testng.Assert; +import org.testng.annotations.Test; import com.cloud.agent.AgentManager; import com.cloud.dc.ClusterVO; @@ -75,6 +74,7 @@ import com.cloud.storage.DataStoreRole; import com.cloud.storage.ScopeType; import com.cloud.storage.Storage; +import com.cloud.storage.Storage.ProvisioningType; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.Storage.TemplateType; import com.cloud.storage.VMTemplateVO; @@ -139,8 +139,8 @@ public void setUp() { } // create data center DataCenterVO dc = - new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, - true, null, null); + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); // create pod @@ -361,7 +361,7 @@ public DataStore createPrimaryDataStore() { } private VolumeVO createVolume(Long templateId, long dataStoreId) { - VolumeVO volume = new VolumeVO(Volume.Type.DATADISK, UUID.randomUUID().toString(), this.dcId, 1L, 1L, 1L, 1000, 0L, 0L, ""); + VolumeVO volume = new VolumeVO(Volume.Type.DATADISK, UUID.randomUUID().toString(), this.dcId, 1L, 1L, 1L, ProvisioningType.THIN, 1000, 0L, 0L, ""); volume.setPoolId(dataStoreId); volume = volumeDao.persist(volume); return volume; diff --git a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java index c274d76d9947..86421742f83d 100644 --- a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java +++ b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java @@ -26,14 +26,6 @@ import javax.inject.Inject; -import junit.framework.Assert; - -import org.mockito.Matchers; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.testng.AssertJUnit; -import org.testng.annotations.Test; - import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; @@ -58,6 +50,11 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.to.TemplateObjectTO; +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.testng.AssertJUnit; +import org.testng.annotations.Test; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Command; @@ -82,6 +79,7 @@ import com.cloud.storage.ScopeType; import com.cloud.storage.Storage; import com.cloud.storage.Storage.ImageFormat; +import com.cloud.storage.Storage.ProvisioningType; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.Storage.TemplateType; import com.cloud.storage.StoragePoolStatus; @@ -92,6 +90,8 @@ import com.cloud.storage.dao.VolumeDao; import com.cloud.utils.component.ComponentContext; +import junit.framework.Assert; + @ContextConfiguration(locations = {"classpath:/storageContext.xml"}) public class VolumeTest extends CloudStackTestNGBase { @Inject @@ -158,8 +158,8 @@ public void setUp() { } else { // create data center DataCenterVO dc = - new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, - true, null, null); + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); // create pod @@ -263,7 +263,6 @@ protected void injectMockito() { public DataStore createPrimaryDataStore() { try { - String uuid = UUID.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString(); List pools = primaryDataStoreDao.findPoolByName(this.primaryName); if (pools.size() > 0) { return this.dataStoreMgr.getPrimaryDataStore(pools.get(0).getId()); @@ -314,8 +313,7 @@ public DataStore createPrimaryDataStore() { } private VolumeVO createVolume(Long templateId, long dataStoreId) { - VolumeVO volume = new VolumeVO(Volume.Type.DATADISK, UUID.randomUUID().toString(), this.dcId, 1L, 1L, 1L, 1000, 0L, 0L, ""); - ; + VolumeVO volume = new VolumeVO(Volume.Type.DATADISK, UUID.randomUUID().toString(), this.dcId, 1L, 1L, 1L, ProvisioningType.THIN, 1000, 0L, 0L, ""); volume.setPoolId(dataStoreId); volume = volumeDao.persist(volume); return volume; @@ -329,7 +327,7 @@ public void testCopyBaseImage() { VolumeVO volume = createVolume(image.getId(), primaryStore.getId()); VolumeInfo volInfo = this.volFactory.getVolume(volume.getId()); AsyncCallFuture future = - this.volumeService.createVolumeFromTemplateAsync(volInfo, this.primaryStoreId, this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image)); + this.volumeService.createVolumeFromTemplateAsync(volInfo, this.primaryStoreId, this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image)); try { VolumeApiResult result = future.get(); diff --git a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTestVmware.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTestVmware.java index 1f3aff04f337..98af170356fb 100644 --- a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTestVmware.java +++ b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTestVmware.java @@ -26,12 +26,6 @@ import javax.inject.Inject; -import org.mockito.Matchers; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.testng.AssertJUnit; -import org.testng.annotations.Test; - import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; @@ -54,6 +48,11 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.to.TemplateObjectTO; +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.testng.AssertJUnit; +import org.testng.annotations.Test; import com.cloud.agent.AgentManager; import com.cloud.dc.ClusterDetailsDao; @@ -78,6 +77,7 @@ import com.cloud.storage.DataStoreRole; import com.cloud.storage.ScopeType; import com.cloud.storage.Storage; +import com.cloud.storage.Storage.ProvisioningType; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.Storage.TemplateType; import com.cloud.storage.StoragePoolStatus; @@ -154,8 +154,8 @@ public void setUp() { } else { // create data center DataCenterVO dc = - new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, - true, null, null); + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); // create pod @@ -315,8 +315,7 @@ public DataStore createPrimaryDataStore() { } private VolumeVO createVolume(Long templateId, long dataStoreId) { - VolumeVO volume = new VolumeVO(Volume.Type.DATADISK, UUID.randomUUID().toString(), this.dcId, 1L, 1L, 1L, 1000, 0L, 0L, ""); - ; + VolumeVO volume = new VolumeVO(Volume.Type.DATADISK, UUID.randomUUID().toString(), this.dcId, 1L, 1L, 1L, ProvisioningType.THIN, 1000, 0L, 0L, ""); volume.setPoolId(dataStoreId); volume = volumeDao.persist(volume); return volume; @@ -330,7 +329,7 @@ public void testCopyBaseImage() { VolumeVO volume = createVolume(image.getId(), primaryStore.getId()); VolumeInfo volInfo = this.volFactory.getVolume(volume.getId()); AsyncCallFuture future = - this.volumeService.createVolumeFromTemplateAsync(volInfo, this.primaryStoreId, this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image)); + this.volumeService.createVolumeFromTemplateAsync(volInfo, this.primaryStoreId, this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image)); try { VolumeApiResult result = future.get(); diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java similarity index 100% rename from plugins/hypervisors/kvm/src/main/java/com/cloud/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml index 20831570ef33..e642e3b06919 100644 --- a/plugins/hypervisors/ovm3/pom.xml +++ b/plugins/hypervisors/ovm3/pom.xml @@ -1,72 +1,81 @@ - + + 4.0.0 + cloud-plugin-hypervisor-ovm3 + Apache CloudStack Plugin - Hypervisor OracleVM3 - http://www.apache.org/licenses/LICENSE-2.0 + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + - 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. ---> - - 4.0.0 - cloud-plugin-hypervisor-ovm3 - Apache CloudStack Plugin - Hypervisor OracleVM3 - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.xmlrpc - xmlrpc-client - ${cs.xmlrpc.version} - - - org.apache.xmlrpc - xmlrpc-common - ${cs.xmlrpc.version} - - - org.apache.commons - commons-lang3 - ${cs.commons-lang3.version} - - - log4j - log4j - ${cs.log4j.version} - - - - - integration - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - + + + org.apache.xmlrpc + xmlrpc-client + ${cs.xmlrpc.version} + + + org.apache.xmlrpc + xmlrpc-common + ${cs.xmlrpc.version} + + + org.apache.commons + commons-lang3 + ${cs.commons-lang3.version} + + + log4j + log4j + ${cs.log4j.version} + + + + + + + + maven-surefire-plugin + + true + + + + + + + + + integration + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + + + + diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java index cfe249e34ed3..102478c22ff1 100644 --- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java +++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java @@ -172,7 +172,7 @@ public Map xmlToMap(String path, Document xmlDocument) if (nodeListFor2.getLength() > 1) { /* Do we need to figure out all the sub elements here and put them in a map? */ } else { - String element = nodeListFor.item(index).getTextContent(); + String element = nodeListFor.item(index).getNodeValue(); myMap.put(rnode, (E) element); } } @@ -193,8 +193,8 @@ public List xmlToList(String path, Document xmlDocument) NodeList nodeList = (NodeList) xPathExpression.evaluate(xmlDocument, XPathConstants.NODESET); for (int ind = 0; ind < nodeList.getLength(); ind++) { - if (!nodeList.item(ind).getTextContent().isEmpty()) { - list.add("" + nodeList.item(ind).getTextContent()); + if (!nodeList.item(ind).getNodeValue().isEmpty()) { + list.add("" + nodeList.item(ind).getNodeValue()); } else { list.add("" + nodeList.item(ind).getNodeValue()); } @@ -213,7 +213,7 @@ public String xmlToString(String path, Document xmlDocument) XPathExpression xPathExpression = xPath.compile(path); NodeList nodeList = (NodeList) xPathExpression.evaluate(xmlDocument, XPathConstants.NODESET); - return nodeList.item(0).getTextContent(); + return nodeList.item(0).getNodeValue(); } catch (NullPointerException e) { LOGGER.info("Got no items back from parsing, returning null: " + e); return null; diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/cloud/hypervisor/XenServerGuruTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/XenServerGuruTest.java similarity index 100% rename from plugins/hypervisors/xenserver/src/test/java/com/cloud/cloud/hypervisor/XenServerGuruTest.java rename to plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/XenServerGuruTest.java diff --git a/plugins/network-elements/nuage-vsp/src/main/java/com/com/cloud/network/vsp/resource/wrapper/NuageVspCheckHealthCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspCheckHealthCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/main/java/com/com/cloud/network/vsp/resource/wrapper/NuageVspCheckHealthCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspCheckHealthCommandWrapper.java diff --git a/plugins/network-elements/nuage-vsp/src/main/java/com/com/cloud/network/vsp/resource/wrapper/NuageVspExtraDhcpOptionsCommandWrapper.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspExtraDhcpOptionsCommandWrapper.java similarity index 100% rename from plugins/network-elements/nuage-vsp/src/main/java/com/com/cloud/network/vsp/resource/wrapper/NuageVspExtraDhcpOptionsCommandWrapper.java rename to plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/vsp/resource/wrapper/NuageVspExtraDhcpOptionsCommandWrapper.java diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/api/command/LinkAccountToLdapCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmd.java similarity index 100% rename from plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/api/command/LinkAccountToLdapCmd.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmd.java diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/api/response/LinkAccountToLdapResponse.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LinkAccountToLdapResponse.java similarity index 100% rename from plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/api/response/LinkAccountToLdapResponse.java rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LinkAccountToLdapResponse.java diff --git a/server/src/main/java/com/cloud/cloud/network/NetworkMigrationManager.java b/server/src/main/java/com/cloud/network/NetworkMigrationManager.java similarity index 100% rename from server/src/main/java/com/cloud/cloud/network/NetworkMigrationManager.java rename to server/src/main/java/com/cloud/network/NetworkMigrationManager.java diff --git a/server/src/main/java/com/cloud/cloud/network/NetworkMigrationManagerImpl.java b/server/src/main/java/com/cloud/network/NetworkMigrationManagerImpl.java similarity index 100% rename from server/src/main/java/com/cloud/cloud/network/NetworkMigrationManagerImpl.java rename to server/src/main/java/com/cloud/network/NetworkMigrationManagerImpl.java diff --git a/server/src/main/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManagerImpl.java b/server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java old mode 100755 new mode 100644 similarity index 100% rename from server/src/main/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManagerImpl.java rename to server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java diff --git a/server/src/test/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManagerImplTest.java b/server/src/test/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImplTest.java similarity index 100% rename from server/src/test/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManagerImplTest.java rename to server/src/test/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImplTest.java diff --git a/usage/src/main/java/com/cloud/cloud/usage/parser/VMSanpshotOnPrimaryParser.java b/usage/src/main/java/com/cloud/usage/parser/VMSanpshotOnPrimaryParser.java similarity index 100% rename from usage/src/main/java/com/cloud/cloud/usage/parser/VMSanpshotOnPrimaryParser.java rename to usage/src/main/java/com/cloud/usage/parser/VMSanpshotOnPrimaryParser.java From 1acc8690c49955588ec9d546736841f2e73f4833 Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Sun, 28 Jan 2018 22:34:11 +1300 Subject: [PATCH 004/145] Fix exception message typos --- server/src/main/java/com/cloud/network/NetworkModelImpl.java | 2 +- server/src/main/java/com/cloud/network/NetworkServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/com/cloud/network/NetworkModelImpl.java b/server/src/main/java/com/cloud/network/NetworkModelImpl.java index e583b717a16b..137711ea2b4e 100644 --- a/server/src/main/java/com/cloud/network/NetworkModelImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkModelImpl.java @@ -289,7 +289,7 @@ public Map> getIpToServices(List> getIpToServices(List publicIps, services.add(Service.SourceNat); networkSNAT.add(ip.getAssociatedWithNetworkId()); } else { - CloudRuntimeException ex = new CloudRuntimeException("Multiple generic soure NAT IPs provided for network"); + CloudRuntimeException ex = new CloudRuntimeException("Multiple generic source NAT IPs provided for network"); // see the IPAddressVO.java class. IPAddressVO ipAddr = ApiDBUtils.findIpAddressById(ip.getAssociatedWithNetworkId()); String ipAddrUuid = ip.getAssociatedWithNetworkId().toString(); From 73251bf8304ed7e337d98cd5595c17b472481ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Tue, 30 Jan 2018 19:52:02 -0200 Subject: [PATCH 005/145] [CLOUDSTACK-10259] Missing float part of secondary storage data in listAccounts --- api/src/main/java/com/cloud/configuration/Resource.java | 4 ++-- .../org/apache/cloudstack/api/response/AccountResponse.java | 5 ++--- .../org/apache/cloudstack/api/response/DomainResponse.java | 4 ++-- .../org/apache/cloudstack/api/response/ProjectResponse.java | 5 ++--- .../api/response/ResourceLimitAndCountResponse.java | 2 +- .../java/com/cloud/api/query/dao/AccountJoinDaoImpl.java | 2 +- .../main/java/com/cloud/api/query/dao/DomainJoinDaoImpl.java | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/api/src/main/java/com/cloud/configuration/Resource.java b/api/src/main/java/com/cloud/configuration/Resource.java index 0fd51dc2f173..76f2930e6150 100644 --- a/api/src/main/java/com/cloud/configuration/Resource.java +++ b/api/src/main/java/com/cloud/configuration/Resource.java @@ -38,8 +38,8 @@ public enum ResourceType { // Primary and Secondary storage are allocated_storag private ResourceOwnerType[] supportedOwners; private int ordinal; public static final long bytesToKiB = 1024; - public static final long bytesToMiB = 1024 * 1024; - public static final long bytesToGiB = 1024 * 1024 * 1024; + public static final long bytesToMiB = bytesToKiB * 1024; + public static final long bytesToGiB = bytesToMiB * 1024; ResourceType(String name, int ordinal, ResourceOwnerType... supportedOwners) { this.name = name; diff --git a/api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java index 7b48a1ea8a1c..18b11f10bd17 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java @@ -29,7 +29,6 @@ import com.cloud.serializer.Param; import com.cloud.user.Account; -@SuppressWarnings("unused") @EntityReference(value = Account.class) public class AccountResponse extends BaseResponse implements ResourceLimitAndCountResponse { @SerializedName(ApiConstants.ID) @@ -222,7 +221,7 @@ public class AccountResponse extends BaseResponse implements ResourceLimitAndCou @SerializedName("secondarystoragetotal") @Param(description = "the total secondary storage space (in GiB) owned by account", since = "4.2.0") - private Long secondaryStorageTotal; + private float secondaryStorageTotal; @SerializedName("secondarystorageavailable") @Param(description = "the total secondary storage space (in GiB) available to be used for this account", since = "4.2.0") @@ -501,7 +500,7 @@ public void setSecondaryStorageLimit(String secondaryStorageLimit) { } @Override - public void setSecondaryStorageTotal(Long secondaryStorageTotal) { + public void setSecondaryStorageTotal(float secondaryStorageTotal) { this.secondaryStorageTotal = secondaryStorageTotal; } diff --git a/api/src/main/java/org/apache/cloudstack/api/response/DomainResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/DomainResponse.java index e848759c9e4d..7e5bd970d295 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/DomainResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/DomainResponse.java @@ -165,7 +165,7 @@ public class DomainResponse extends BaseResponse implements ResourceLimitAndCoun private String secondaryStorageLimit; @SerializedName("secondarystoragetotal") @Param(description="the total secondary storage space (in GiB) owned by domain", since="4.2.0") - private Long secondaryStorageTotal; + private float secondaryStorageTotal; @SerializedName("secondarystorageavailable") @Param(description="the total secondary storage space (in GiB) available to be used for this domain", since="4.2.0") private String secondaryStorageAvailable; @@ -399,7 +399,7 @@ public void setSecondaryStorageLimit(String secondaryStorageLimit) { } @Override - public void setSecondaryStorageTotal(Long secondaryStorageTotal) { + public void setSecondaryStorageTotal(float secondaryStorageTotal) { this.secondaryStorageTotal = secondaryStorageTotal; } diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ProjectResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ProjectResponse.java index 0ae9e18612e3..8bfa6d94b63c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/ProjectResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/ProjectResponse.java @@ -29,7 +29,6 @@ import com.cloud.serializer.Param; @EntityReference(value = Project.class) -@SuppressWarnings("unused") public class ProjectResponse extends BaseResponse implements ResourceLimitAndCountResponse { @SerializedName(ApiConstants.ID) @@ -134,7 +133,7 @@ public class ProjectResponse extends BaseResponse implements ResourceLimitAndCou @SerializedName("secondarystoragetotal") @Param(description = "the total secondary storage space (in GiB) owned by project", since = "4.2.0") - private Long secondaryStorageTotal; + private float secondaryStorageTotal; @SerializedName("secondarystorageavailable") @Param(description = "the total secondary storage space (in GiB) available to be used for this project", since = "4.2.0") @@ -414,7 +413,7 @@ public void setSecondaryStorageLimit(String secondaryStorageLimit) { } @Override - public void setSecondaryStorageTotal(Long secondaryStorageTotal) { + public void setSecondaryStorageTotal(float secondaryStorageTotal) { this.secondaryStorageTotal = secondaryStorageTotal; } diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java index ba97c2c83cea..f247be834cb1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java @@ -54,7 +54,7 @@ public interface ResourceLimitAndCountResponse { public void setSecondaryStorageLimit(String secondaryStorageLimit); - public void setSecondaryStorageTotal(Long secondaryStorageTotal); + public void setSecondaryStorageTotal(float secondaryStorageTotal); public void setSecondaryStorageAvailable(String secondaryStorageAvailable); diff --git a/server/src/main/java/com/cloud/api/query/dao/AccountJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/AccountJoinDaoImpl.java index a8d3b68833de..fdc3cfa40a59 100644 --- a/server/src/main/java/com/cloud/api/query/dao/AccountJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/AccountJoinDaoImpl.java @@ -214,7 +214,7 @@ public void setResourceLimits(AccountJoinVO account, boolean fullView, ResourceL //get resource limits for secondary storage space and convert it from Bytes to GiB long secondaryStorageLimit = ApiDBUtils.findCorrectResourceLimit(account.getSecondaryStorageLimit(), account.getId(), ResourceType.secondary_storage); String secondaryStorageLimitDisplay = (fullView || secondaryStorageLimit == -1) ? "Unlimited" : String.valueOf(secondaryStorageLimit / ResourceType.bytesToGiB); - long secondaryStorageTotal = (account.getSecondaryStorageTotal() == null) ? 0 : (account.getSecondaryStorageTotal() / ResourceType.bytesToGiB); + float secondaryStorageTotal = (account.getSecondaryStorageTotal() == null) ? 0 : (account.getSecondaryStorageTotal() / (ResourceType.bytesToGiB * 1f)); String secondaryStorageAvail = (fullView || secondaryStorageLimit == -1) ? "Unlimited" : String.valueOf((secondaryStorageLimit / ResourceType.bytesToGiB) - secondaryStorageTotal); diff --git a/server/src/main/java/com/cloud/api/query/dao/DomainJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/DomainJoinDaoImpl.java index 497fc2c13a3f..a613fcbfe463 100644 --- a/server/src/main/java/com/cloud/api/query/dao/DomainJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/DomainJoinDaoImpl.java @@ -183,7 +183,7 @@ public void setResourceLimits(DomainJoinVO domain, boolean fullView, ResourceLim //get resource limits for secondary storage space and convert it from Bytes to GiB long secondaryStorageLimit = ApiDBUtils.findCorrectResourceLimitForDomain(domain.getSecondaryStorageLimit(), ResourceType.secondary_storage, domain.getId()); String secondaryStorageLimitDisplay = (fullView || secondaryStorageLimit == -1) ? "Unlimited" : String.valueOf(secondaryStorageLimit / ResourceType.bytesToGiB); - long secondaryStorageTotal = (domain.getSecondaryStorageTotal() == null) ? 0 : (domain.getSecondaryStorageTotal() / ResourceType.bytesToGiB); + float secondaryStorageTotal = (domain.getSecondaryStorageTotal() == null) ? 0 : (domain.getSecondaryStorageTotal() / (ResourceType.bytesToGiB * 1f)); String secondaryStorageAvail = (fullView || secondaryStorageLimit == -1) ? "Unlimited" : String.valueOf((secondaryStorageLimit / ResourceType.bytesToGiB) - secondaryStorageTotal); response.setSecondaryStorageLimit(secondaryStorageLimitDisplay); response.setSecondaryStorageTotal(secondaryStorageTotal); From cbb4b7939005113c092504c431cef10211c209ff Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Wed, 31 Jan 2018 09:48:32 +0100 Subject: [PATCH 006/145] CLOUDSTACK-10225: Deprecate StringUtils in favor of Apache Commons (#2431) * CLOUDSTACK-10225: Remove unused methods from StringUtils Signed-off-by: Wido den Hollander * CLOUDSTACK-10225: Deprecate StringUtils.isNotBlank Signed-off-by: Wido den Hollander * CLOUDSTACK-10225: Make isNotBlank a wrapper around Apache Commons Signed-off-by: Wido den Hollander --- .../java/com/cloud/utils/StringUtils.java | 31 ++++--------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/utils/src/main/java/com/cloud/utils/StringUtils.java b/utils/src/main/java/com/cloud/utils/StringUtils.java index 6ada2ad60bd1..aed6cef6217c 100644 --- a/utils/src/main/java/com/cloud/utils/StringUtils.java +++ b/utils/src/main/java/com/cloud/utils/StringUtils.java @@ -30,8 +30,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.owasp.esapi.StringUtilities; - public class StringUtils { private static final char[] hexChar = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; @@ -78,12 +76,13 @@ public static String join(final String delimiter, final Object... components) { return org.apache.commons.lang.StringUtils.join(components, delimiter); } + /** + * @deprecated + * Please use org.apache.commons.lang.StringUtils.isNotBlank() as a replacement + */ + @Deprecated public static boolean isNotBlank(final String str) { - if (str != null && str.trim().length() > 0) { - return true; - } - - return false; + return org.apache.commons.lang.StringUtils.isNotBlank(str); } public static String cleanupTags(String tags) { @@ -256,24 +255,6 @@ public static boolean areTagsEqual(final String tags1, final String tags2) { return lstTags1.containsAll(lstTags2) && lstTags2.containsAll(lstTags1); } - public static String stripControlCharacters(final String s) { - return StringUtilities.stripControls(s); - } - - public static int formatForOutput(final String text, final int start, final int columns, final char separator) { - if (start >= text.length()) { - return -1; - } - - int end = start + columns; - if (end > text.length()) { - end = text.length(); - } - final String searchable = text.substring(start, end); - final int found = searchable.lastIndexOf(separator); - return found > 0 ? found : end - start; - } - public static Map stringToMap(final String s) { final Map map = new HashMap(); final String[] elements = s.split(";"); From 5d545023fcc4ea525012232182a250669975f24d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Thu, 1 Feb 2018 10:59:16 -0200 Subject: [PATCH 007/145] [CLOUDSTACK-9338] ACS not accounting resources of VMs with custom service offering MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ACS is accounting the resources properly when deploying VMs with custom service offerings. However, there are other methods (such as updateResourceCount) that do not execute the resource accounting properly, and these methods update the resource count for an account in the database. Therefore, if a user deploys VMs with custom service offerings, and later this user calls the “updateResourceCount” method, it (the method) will only account for VMs with normal service offerings, and update this as the number of resources used by the account. This will result in a smaller number of resources to be accounted for the given account than the real used value. The problem becomes worse because if the user starts to delete these VMs, it is possible to reach negative values of resources allocated (breaking all of the resource limiting for accounts). This is a very serious attack vector for public cloud providers! --- .../configuration/dao/ResourceCountDao.java | 14 ++++++ .../dao/ResourceCountDaoImpl.java | 42 ++++++++++++++++++ .../ResourceLimitManagerImpl.java | 44 +------------------ 3 files changed, 58 insertions(+), 42 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java index d4695c3ff751..f5b76e3e7fcb 100644 --- a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java +++ b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java @@ -57,4 +57,18 @@ public interface ResourceCountDao extends GenericDao { Set listRowsToUpdateForDomain(long domainId, ResourceType type); long removeEntriesByOwner(long ownerId, ResourceOwnerType ownerType); + + /** + * Counts the number of CPU cores allocated for the given account. + * + * Side note: This method is not using the "resource_count" table. It is executing the actual count instead. + */ + long countCpuNumberAllocatedToAccount(long accountId); + + /** + * Counts the amount of memory allocated for the given account. + * + * Side note: This method is not using the "resource_count" table. It is executing the actual count instead. + */ + long countMemoryAllocatedToAccount(long accountId); } diff --git a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java index f7cd3cbf86f6..3705418f98dd 100644 --- a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java @@ -16,6 +16,9 @@ // under the License. package com.cloud.configuration.dao; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -42,6 +45,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; +import com.cloud.utils.exception.CloudRuntimeException; @Component public class ResourceCountDaoImpl extends GenericDaoBase implements ResourceCountDao { @@ -248,4 +252,42 @@ public long removeEntriesByOwner(long ownerId, ResourceOwnerType ownerType) { return 0; } + private String baseSqlCountComputingResourceAllocatedToAccount = "Select " + + " SUM((CASE " + + " WHEN so.%s is not null THEN so.%s " + + " ELSE CONVERT(vmd.value, UNSIGNED INTEGER) " + + " END)) as total " + + " from vm_instance vm " + + " join service_offering_view so on so.id = vm.service_offering_id " + + " left join user_vm_details vmd on vmd.vm_id = vm.id and vmd.name = '%s' " + + " where vm.type = 'User' and state not in ('Destroyed', 'Error', 'Expunging') and display_vm = true and account_id = ? "; + + @Override + public long countCpuNumberAllocatedToAccount(long accountId) { + String sqlCountCpuNumberAllocatedToAccount = String.format(baseSqlCountComputingResourceAllocatedToAccount, ResourceType.cpu, ResourceType.cpu, "cpuNumber"); + return executeSqlCountComputingResourcesForAccount(accountId, sqlCountCpuNumberAllocatedToAccount); + } + + @Override + public long countMemoryAllocatedToAccount(long accountId) { + String serviceOfferingRamSizeField = "ram_size"; + String sqlCountCpuNumberAllocatedToAccount = String.format(baseSqlCountComputingResourceAllocatedToAccount, serviceOfferingRamSizeField, serviceOfferingRamSizeField, "memory"); + return executeSqlCountComputingResourcesForAccount(accountId, sqlCountCpuNumberAllocatedToAccount); + } + + private long executeSqlCountComputingResourcesForAccount(long accountId, String sqlCountComputingResourcesAllocatedToAccount) { + try (TransactionLegacy tx = TransactionLegacy.currentTxn()) { + PreparedStatement pstmt = tx.prepareAutoCloseStatement(sqlCountComputingResourcesAllocatedToAccount); + pstmt.setLong(1, accountId); + + ResultSet rs = pstmt.executeQuery(); + if (!rs.next()) { + throw new CloudRuntimeException(String.format("An unexpected case happened while counting allocated computing resources for account: " + accountId)); + } + return rs.getLong("total"); + } catch (SQLException e) { + throw new CloudRuntimeException(e); + } + } + } \ No newline at end of file diff --git a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java index 86fa46b6c265..df7276dcbe37 100644 --- a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java +++ b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java @@ -947,51 +947,11 @@ public Long doInTransaction(TransactionStatus status) { } public long countCpusForAccount(long accountId) { - GenericSearchBuilder cpuSearch = _serviceOfferingDao.createSearchBuilder(SumCount.class); - cpuSearch.select("sum", Func.SUM, cpuSearch.entity().getCpu()); - SearchBuilder join1 = _userVmDao.createSearchBuilder(); - join1.and("accountId", join1.entity().getAccountId(), Op.EQ); - join1.and("type", join1.entity().getType(), Op.EQ); - join1.and("state", join1.entity().getState(), SearchCriteria.Op.NIN); - join1.and("displayVm", join1.entity().isDisplayVm(), Op.EQ); - cpuSearch.join("offerings", join1, cpuSearch.entity().getId(), join1.entity().getServiceOfferingId(), JoinBuilder.JoinType.INNER); - cpuSearch.done(); - - SearchCriteria sc = cpuSearch.create(); - sc.setJoinParameters("offerings", "accountId", accountId); - sc.setJoinParameters("offerings", "type", VirtualMachine.Type.User); - sc.setJoinParameters("offerings", "state", new Object[] {State.Destroyed, State.Error, State.Expunging}); - sc.setJoinParameters("offerings", "displayVm", 1); - List cpus = _serviceOfferingDao.customSearch(sc, null); - if (cpus != null) { - return cpus.get(0).sum; - } else { - return 0; - } + return _resourceCountDao.countCpuNumberAllocatedToAccount(accountId); } public long calculateMemoryForAccount(long accountId) { - GenericSearchBuilder memorySearch = _serviceOfferingDao.createSearchBuilder(SumCount.class); - memorySearch.select("sum", Func.SUM, memorySearch.entity().getRamSize()); - SearchBuilder join1 = _userVmDao.createSearchBuilder(); - join1.and("accountId", join1.entity().getAccountId(), Op.EQ); - join1.and("type", join1.entity().getType(), Op.EQ); - join1.and("state", join1.entity().getState(), SearchCriteria.Op.NIN); - join1.and("displayVm", join1.entity().isDisplayVm(), Op.EQ); - memorySearch.join("offerings", join1, memorySearch.entity().getId(), join1.entity().getServiceOfferingId(), JoinBuilder.JoinType.INNER); - memorySearch.done(); - - SearchCriteria sc = memorySearch.create(); - sc.setJoinParameters("offerings", "accountId", accountId); - sc.setJoinParameters("offerings", "type", VirtualMachine.Type.User); - sc.setJoinParameters("offerings", "state", new Object[] {State.Destroyed, State.Error, State.Expunging}); - sc.setJoinParameters("offerings", "displayVm", 1); - List memory = _serviceOfferingDao.customSearch(sc, null); - if (memory != null) { - return memory.get(0).sum; - } else { - return 0; - } + return _resourceCountDao.countMemoryAllocatedToAccount(accountId); } public long calculateSecondaryStorageForAccount(long accountId) { From 7f934c0e866c8f4aedad99a8a5ffe4c03118a656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Thu, 1 Feb 2018 11:00:30 -0200 Subject: [PATCH 008/145] Formatting to make checkstyle happy --- .../configuration/dao/ResourceCountDao.java | 8 +- .../dao/ResourceCountDaoImpl.java | 23 +- .../ResourceLimitManagerImpl.java | 253 ++++++++---------- 3 files changed, 131 insertions(+), 153 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java index f5b76e3e7fcb..b5a75d196fa5 100644 --- a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java +++ b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java @@ -57,17 +57,17 @@ public interface ResourceCountDao extends GenericDao { Set listRowsToUpdateForDomain(long domainId, ResourceType type); long removeEntriesByOwner(long ownerId, ResourceOwnerType ownerType); - + /** * Counts the number of CPU cores allocated for the given account. - * + * * Side note: This method is not using the "resource_count" table. It is executing the actual count instead. */ long countCpuNumberAllocatedToAccount(long accountId); - + /** * Counts the amount of memory allocated for the given account. - * + * * Side note: This method is not using the "resource_count" table. It is executing the actual count instead. */ long countMemoryAllocatedToAccount(long accountId); diff --git a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java index 3705418f98dd..56261337faf1 100644 --- a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java @@ -27,9 +27,6 @@ import javax.annotation.PostConstruct; import javax.inject.Inject; -import com.cloud.domain.DomainVO; -import com.cloud.user.AccountVO; -import com.cloud.utils.db.JoinBuilder; import org.springframework.stereotype.Component; import com.cloud.configuration.Resource; @@ -37,11 +34,14 @@ import com.cloud.configuration.Resource.ResourceType; import com.cloud.configuration.ResourceCountVO; import com.cloud.configuration.ResourceLimit; +import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; import com.cloud.exception.UnsupportedServiceException; +import com.cloud.user.AccountVO; import com.cloud.user.dao.AccountDao; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @@ -55,9 +55,9 @@ public class ResourceCountDaoImpl extends GenericDaoBase private final SearchBuilder DomainSearch; @Inject - protected DomainDao _domainDao; + private DomainDao _domainDao; @Inject - protected AccountDao _accountDao; + private AccountDao _accountDao; public ResourceCountDaoImpl() { TypeSearch = createSearchBuilder(); @@ -252,16 +252,15 @@ public long removeEntriesByOwner(long ownerId, ResourceOwnerType ownerType) { return 0; } - private String baseSqlCountComputingResourceAllocatedToAccount = "Select " - + " SUM((CASE " + private String baseSqlCountComputingResourceAllocatedToAccount = "Select " + + " SUM((CASE " + " WHEN so.%s is not null THEN so.%s " - + " ELSE CONVERT(vmd.value, UNSIGNED INTEGER) " + + " ELSE CONVERT(vmd.value, UNSIGNED INTEGER) " + " END)) as total " - + " from vm_instance vm " + + " from vm_instance vm " + " join service_offering_view so on so.id = vm.service_offering_id " + " left join user_vm_details vmd on vmd.vm_id = vm.id and vmd.name = '%s' " + " where vm.type = 'User' and state not in ('Destroyed', 'Error', 'Expunging') and display_vm = true and account_id = ? "; - @Override public long countCpuNumberAllocatedToAccount(long accountId) { String sqlCountCpuNumberAllocatedToAccount = String.format(baseSqlCountComputingResourceAllocatedToAccount, ResourceType.cpu, ResourceType.cpu, "cpuNumber"); @@ -279,10 +278,10 @@ private long executeSqlCountComputingResourcesForAccount(long accountId, String try (TransactionLegacy tx = TransactionLegacy.currentTxn()) { PreparedStatement pstmt = tx.prepareAutoCloseStatement(sqlCountComputingResourcesAllocatedToAccount); pstmt.setLong(1, accountId); - + ResultSet rs = pstmt.executeQuery(); if (!rs.next()) { - throw new CloudRuntimeException(String.format("An unexpected case happened while counting allocated computing resources for account: " + accountId)); + throw new CloudRuntimeException(String.format("An unexpected case happened while counting allocated computing resources for account: " + accountId)); } return rs.getLong("total"); } catch (SQLException e) { diff --git a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java index df7276dcbe37..ca9c7ec26fdc 100644 --- a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java +++ b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java @@ -69,7 +69,6 @@ import com.cloud.projects.ProjectAccount.Role; import com.cloud.projects.dao.ProjectAccountDao; import com.cloud.projects.dao.ProjectDao; -import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.DataStoreRole; import com.cloud.storage.SnapshotVO; @@ -100,9 +99,6 @@ import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn; import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.vm.UserVmVO; -import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; @@ -280,10 +276,8 @@ public void decrementResourceCount(long accountId, ResourceType type, Long... de long numToDecrement = (delta.length == 0) ? 1 : delta[0].longValue(); if (!updateResourceCountForAccount(accountId, type, false, numToDecrement)) { - _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_UPDATE_RESOURCE_COUNT, 0L, 0L, "Failed to decrement resource count of type " + type + - " for account id=" + - accountId, "Failed to decrement resource count of type " + type + " for account id=" + accountId + - "; use updateResourceCount API to recalculate/fix the problem"); + _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_UPDATE_RESOURCE_COUNT, 0L, 0L, "Failed to decrement resource count of type " + type + " for account id=" + accountId, + "Failed to decrement resource count of type " + type + " for account id=" + accountId + "; use updateResourceCount API to recalculate/fix the problem"); } } @@ -426,13 +420,10 @@ private void checkDomainResourceLimit(final Account account, final Project proje long domainResourceLimit = findCorrectResourceLimitForDomain(domain, type); long currentDomainResourceCount = _resourceCountDao.getResourceCount(domainId, ResourceOwnerType.Domain, type); long requestedDomainResourceCount = currentDomainResourceCount + numResources; - String messageSuffix = " domain resource limits of Type '" + type + "'" + - " for Domain Id = " + domainId + - " is exceeded: Domain Resource Limit = " + domainResourceLimit + - ", Current Domain Resource Amount = " + currentDomainResourceCount + - ", Requested Resource Amount = " + numResources + "."; + String messageSuffix = " domain resource limits of Type '" + type + "'" + " for Domain Id = " + domainId + " is exceeded: Domain Resource Limit = " + domainResourceLimit + + ", Current Domain Resource Amount = " + currentDomainResourceCount + ", Requested Resource Amount = " + numResources + "."; - if(s_logger.isDebugEnabled()) { + if (s_logger.isDebugEnabled()) { s_logger.debug("Checking if" + messageSuffix); } @@ -452,14 +443,11 @@ private void checkAccountResourceLimit(final Account account, final Project proj long accountResourceLimit = findCorrectResourceLimitForAccount(account, type); long currentResourceCount = _resourceCountDao.getResourceCount(account.getId(), ResourceOwnerType.Account, type); long requestedResourceCount = currentResourceCount + numResources; - String messageSuffix = " amount of resources of Type = '" + type + "' for " + - (project == null ? "Account Name = " + account.getAccountName() : "Project Name = " + project.getName()) + - " in Domain Id = " + account.getDomainId() + - " is exceeded: Account Resource Limit = " + accountResourceLimit + - ", Current Account Resource Amount = " + currentResourceCount + - ", Requested Resource Amount = " + numResources + "."; - - if(s_logger.isDebugEnabled()) { + String messageSuffix = " amount of resources of Type = '" + type + "' for " + (project == null ? "Account Name = " + account.getAccountName() : "Project Name = " + project.getName()) + + " in Domain Id = " + account.getDomainId() + " is exceeded: Account Resource Limit = " + accountResourceLimit + ", Current Account Resource Amount = " + currentResourceCount + + ", Requested Resource Amount = " + numResources + "."; + + if (s_logger.isDebugEnabled()) { s_logger.debug("Checking if" + messageSuffix); } @@ -485,6 +473,7 @@ private List lockDomainRows(long domainId, final ResourceType t return _resourceCountDao.lockRows(sc, null, true); } + @Override public long findDefaultResourceLimitForDomain(ResourceType resourceType) { Long resourceLimit = null; resourceLimit = domainResourceLimitMap.get(resourceType); @@ -522,7 +511,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) throws Resour // check all domains in the account's domain hierarchy checkDomainResourceLimit(account, projectFinal, type, numResources); } - }); + }); } @Override @@ -611,11 +600,9 @@ public List searchForLimits(Long id, Long accountId, Long domai if (resourceType != null) { if (foundLimits.isEmpty()) { if (isAccount) { - limits.add(new ResourceLimitVO(resourceType, findCorrectResourceLimitForAccount(_accountMgr.getAccount(accountId), resourceType), accountId, - ResourceOwnerType.Account)); + limits.add(new ResourceLimitVO(resourceType, findCorrectResourceLimitForAccount(_accountMgr.getAccount(accountId), resourceType), accountId, ResourceOwnerType.Account)); } else { - limits.add(new ResourceLimitVO(resourceType, findCorrectResourceLimitForDomain(_domainDao.findById(domainId), resourceType), domainId, - ResourceOwnerType.Domain)); + limits.add(new ResourceLimitVO(resourceType, findCorrectResourceLimitForDomain(_domainDao.findById(domainId), resourceType), domainId, ResourceOwnerType.Domain)); } } else { limits.addAll(foundLimits); @@ -641,8 +628,7 @@ public List searchForLimits(Long id, Long accountId, Long domai if (accountLimitStr.size() < resourceTypes.length) { for (ResourceType rt : resourceTypes) { if (!accountLimitStr.contains(rt.toString()) && rt.supportsOwner(ResourceOwnerType.Account)) { - limits.add(new ResourceLimitVO(rt, findCorrectResourceLimitForAccount(_accountMgr.getAccount(accountId), rt), accountId, - ResourceOwnerType.Account)); + limits.add(new ResourceLimitVO(rt, findCorrectResourceLimitForAccount(_accountMgr.getAccount(accountId), rt), accountId, ResourceOwnerType.Account)); } } } @@ -651,8 +637,7 @@ public List searchForLimits(Long id, Long accountId, Long domai if (domainLimitStr.size() < resourceTypes.length) { for (ResourceType rt : resourceTypes) { if (!domainLimitStr.contains(rt.toString()) && rt.supportsOwner(ResourceOwnerType.Domain)) { - limits.add(new ResourceLimitVO(rt, findCorrectResourceLimitForDomain(_domainDao.findById(domainId), rt), domainId, - ResourceOwnerType.Domain)); + limits.add(new ResourceLimitVO(rt, findCorrectResourceLimitForDomain(_domainDao.findById(domainId), rt), domainId, ResourceOwnerType.Domain)); } } } @@ -708,9 +693,7 @@ public ResourceLimitVO updateResourceLimit(Long accountId, Long domainId, Intege throw new InvalidParameterValueException("Only " + Resource.RESOURCE_UNLIMITED + " limit is supported for Root Admin accounts"); } - if ((caller.getAccountId() == accountId.longValue()) && - (_accountMgr.isDomainAdmin(caller.getId()) || - caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN)) { + if ((caller.getAccountId() == accountId.longValue()) && (_accountMgr.isDomainAdmin(caller.getId()) || caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN)) { // If the admin is trying to update his own account, disallow. throw new PermissionDeniedException("Unable to update resource limit for his own account " + accountId + ", permission denied"); } @@ -733,8 +716,7 @@ public ResourceLimitVO updateResourceLimit(Long accountId, Long domainId, Intege throw new PermissionDeniedException("Cannot update resource limit for ROOT domain " + domainId + ", permission denied"); } - if ((caller.getDomainId() == domainId.longValue()) && caller.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN || - caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) { + if ((caller.getDomainId() == domainId.longValue()) && caller.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN || caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) { // if the admin is trying to update their own domain, disallow... throw new PermissionDeniedException("Unable to update resource limit for domain " + domainId + ", permission denied"); } @@ -743,8 +725,8 @@ public ResourceLimitVO updateResourceLimit(Long accountId, Long domainId, Intege DomainVO parentDomain = _domainDao.findById(parentDomainId); long parentMaximum = findCorrectResourceLimitForDomain(parentDomain, resourceType); if ((parentMaximum >= 0) && (max.longValue() > parentMaximum)) { - throw new InvalidParameterValueException("Domain " + domain.getName() + "(id: " + parentDomain.getId() + ") has maximum allowed resource limit " + - parentMaximum + " for " + resourceType + ", please specify a value less that or equal to " + parentMaximum); + throw new InvalidParameterValueException("Domain " + domain.getName() + "(id: " + parentDomain.getId() + ") has maximum allowed resource limit " + parentMaximum + " for " + + resourceType + ", please specify a value less that or equal to " + parentMaximum); } } ownerType = ResourceOwnerType.Domain; @@ -766,8 +748,7 @@ public ResourceLimitVO updateResourceLimit(Long accountId, Long domainId, Intege } @Override - public List recalculateResourceCount(Long accountId, Long domainId, Integer typeId) throws InvalidParameterValueException, CloudRuntimeException, - PermissionDeniedException { + public List recalculateResourceCount(Long accountId, Long domainId, Integer typeId) throws InvalidParameterValueException, CloudRuntimeException, PermissionDeniedException { Account callerAccount = CallContext.current().getCallingAccount(); long count = 0; List counts = new ArrayList(); @@ -818,25 +799,24 @@ public List recalculateResourceCount(Long accountId, Long domai @DB protected boolean updateResourceCountForAccount(final long accountId, final ResourceType type, final boolean increment, final long delta) { - if(s_logger.isDebugEnabled()) { - s_logger.debug("Updating resource Type = " + type + " count for Account = " + accountId + - " Operation = " + (increment ? "increasing" : "decreasing") + " Amount = " + delta); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Updating resource Type = " + type + " count for Account = " + accountId + " Operation = " + (increment ? "increasing" : "decreasing") + " Amount = " + delta); } try { return Transaction.execute(new TransactionCallback() { - @Override - public Boolean doInTransaction(TransactionStatus status) { - boolean result = true; - List rowsToUpdate = lockAccountAndOwnerDomainRows(accountId, type); - for (ResourceCountVO rowToUpdate : rowsToUpdate) { - if (!_resourceCountDao.updateById(rowToUpdate.getId(), increment, delta)) { - s_logger.trace("Unable to update resource count for the row " + rowToUpdate); - result = false; - } + @Override + public Boolean doInTransaction(TransactionStatus status) { + boolean result = true; + List rowsToUpdate = lockAccountAndOwnerDomainRows(accountId, type); + for (ResourceCountVO rowToUpdate : rowsToUpdate) { + if (!_resourceCountDao.updateById(rowToUpdate.getId(), increment, delta)) { + s_logger.trace("Unable to update resource count for the row " + rowToUpdate); + result = false; } - return result; } - }); + return result; + } + }); } catch (Exception ex) { s_logger.error("Failed to update resource count for account id=" + accountId); return false; @@ -846,102 +826,101 @@ public Boolean doInTransaction(TransactionStatus status) { @DB protected long recalculateDomainResourceCount(final long domainId, final ResourceType type) { return Transaction.execute(new TransactionCallback() { - @Override - public Long doInTransaction(TransactionStatus status) { - long newResourceCount = 0; - lockDomainRows(domainId, type); - ResourceCountVO domainRC = _resourceCountDao.findByOwnerAndType(domainId, ResourceOwnerType.Domain, type); - long oldResourceCount = domainRC.getCount(); - - List domainChildren = _domainDao.findImmediateChildrenForParent(domainId); - // for each child domain update the resource count - if (type.supportsOwner(ResourceOwnerType.Domain)) { - - // calculate project count here - if (type == ResourceType.project) { - newResourceCount += _projectDao.countProjectsForDomain(domainId); - } + @Override + public Long doInTransaction(TransactionStatus status) { + long newResourceCount = 0; + lockDomainRows(domainId, type); + ResourceCountVO domainRC = _resourceCountDao.findByOwnerAndType(domainId, ResourceOwnerType.Domain, type); + long oldResourceCount = domainRC.getCount(); + + List domainChildren = _domainDao.findImmediateChildrenForParent(domainId); + // for each child domain update the resource count + if (type.supportsOwner(ResourceOwnerType.Domain)) { - for (DomainVO childDomain : domainChildren) { - long childDomainResourceCount = recalculateDomainResourceCount(childDomain.getId(), type); - newResourceCount += childDomainResourceCount; // add the child domain count to parent domain count - } + // calculate project count here + if (type == ResourceType.project) { + newResourceCount += _projectDao.countProjectsForDomain(domainId); } - if (type.supportsOwner(ResourceOwnerType.Account)) { - List accounts = _accountDao.findActiveAccountsForDomain(domainId); - for (AccountVO account : accounts) { - long accountResourceCount = recalculateAccountResourceCount(account.getId(), type); - newResourceCount += accountResourceCount; // add account's resource count to parent domain count - } + for (DomainVO childDomain : domainChildren) { + long childDomainResourceCount = recalculateDomainResourceCount(childDomain.getId(), type); + newResourceCount += childDomainResourceCount; // add the child domain count to parent domain count } - _resourceCountDao.setResourceCount(domainId, ResourceOwnerType.Domain, type, newResourceCount); + } - if (oldResourceCount != newResourceCount) { - s_logger.warn("Discrepency in the resource count has been detected " + "(original count = " + oldResourceCount + - " correct count = " + newResourceCount + ") for Type = " + type + - " for Domain ID = " + domainId + " is fixed during resource count recalculation."); + if (type.supportsOwner(ResourceOwnerType.Account)) { + List accounts = _accountDao.findActiveAccountsForDomain(domainId); + for (AccountVO account : accounts) { + long accountResourceCount = recalculateAccountResourceCount(account.getId(), type); + newResourceCount += accountResourceCount; // add account's resource count to parent domain count } + } + _resourceCountDao.setResourceCount(domainId, ResourceOwnerType.Domain, type, newResourceCount); - return newResourceCount; + if (oldResourceCount != newResourceCount) { + s_logger.warn("Discrepency in the resource count has been detected " + "(original count = " + oldResourceCount + " correct count = " + newResourceCount + ") for Type = " + type + + " for Domain ID = " + domainId + " is fixed during resource count recalculation."); } - }); + + return newResourceCount; + } + }); } @DB protected long recalculateAccountResourceCount(final long accountId, final ResourceType type) { Long newCount = Transaction.execute(new TransactionCallback() { - @Override - public Long doInTransaction(TransactionStatus status) { - Long newCount = null; - lockAccountAndOwnerDomainRows(accountId, type); - ResourceCountVO accountRC = _resourceCountDao.findByOwnerAndType(accountId, ResourceOwnerType.Account, type); - long oldCount = 0; - if (accountRC != null) - oldCount = accountRC.getCount(); - - if (type == Resource.ResourceType.user_vm) { - newCount = _userVmDao.countAllocatedVMsForAccount(accountId); - } else if (type == Resource.ResourceType.volume) { - newCount = _volumeDao.countAllocatedVolumesForAccount(accountId); - long virtualRouterCount = _vmDao.findIdsOfAllocatedVirtualRoutersForAccount(accountId).size(); - newCount = newCount - virtualRouterCount; // don't count the volumes of virtual router - } else if (type == Resource.ResourceType.snapshot) { - newCount = _snapshotDao.countSnapshotsForAccount(accountId); - } else if (type == Resource.ResourceType.public_ip) { - newCount = calculatePublicIpForAccount(accountId); - } else if (type == Resource.ResourceType.template) { - newCount = _vmTemplateDao.countTemplatesForAccount(accountId); - } else if (type == Resource.ResourceType.project) { - newCount = _projectAccountDao.countByAccountIdAndRole(accountId, Role.Admin); - } else if (type == Resource.ResourceType.network) { - newCount = _networkDao.countNetworksUserCanCreate(accountId); - } else if (type == Resource.ResourceType.vpc) { - newCount = _vpcDao.countByAccountId(accountId); - } else if (type == Resource.ResourceType.cpu) { - newCount = countCpusForAccount(accountId); - } else if (type == Resource.ResourceType.memory) { - newCount = calculateMemoryForAccount(accountId); - } else if (type == Resource.ResourceType.primary_storage) { - List virtualRouters = _vmDao.findIdsOfAllocatedVirtualRoutersForAccount(accountId); - newCount = _volumeDao.primaryStorageUsedForAccount(accountId, virtualRouters); - } else if (type == Resource.ResourceType.secondary_storage) { - newCount = calculateSecondaryStorageForAccount(accountId); - } else { - throw new InvalidParameterValueException("Unsupported resource type " + type); - } - _resourceCountDao.setResourceCount(accountId, ResourceOwnerType.Account, type, (newCount == null) ? 0 : newCount.longValue()); - - // No need to log message for primary and secondary storage because both are recalculating the - // resource count which will not lead to any discrepancy. - if (!Long.valueOf(oldCount).equals(newCount) && - (type != Resource.ResourceType.primary_storage && type != Resource.ResourceType.secondary_storage)) { - s_logger.warn("Discrepency in the resource count " + "(original count=" + oldCount + " correct count = " + newCount + ") for type " + type + - " for account ID " + accountId + " is fixed during resource count recalculation."); - } - return newCount; + @Override + public Long doInTransaction(TransactionStatus status) { + Long newCount = null; + lockAccountAndOwnerDomainRows(accountId, type); + ResourceCountVO accountRC = _resourceCountDao.findByOwnerAndType(accountId, ResourceOwnerType.Account, type); + long oldCount = 0; + if (accountRC != null) { + oldCount = accountRC.getCount(); } - }); + + if (type == Resource.ResourceType.user_vm) { + newCount = _userVmDao.countAllocatedVMsForAccount(accountId); + } else if (type == Resource.ResourceType.volume) { + newCount = _volumeDao.countAllocatedVolumesForAccount(accountId); + long virtualRouterCount = _vmDao.findIdsOfAllocatedVirtualRoutersForAccount(accountId).size(); + newCount = newCount - virtualRouterCount; // don't count the volumes of virtual router + } else if (type == Resource.ResourceType.snapshot) { + newCount = _snapshotDao.countSnapshotsForAccount(accountId); + } else if (type == Resource.ResourceType.public_ip) { + newCount = calculatePublicIpForAccount(accountId); + } else if (type == Resource.ResourceType.template) { + newCount = _vmTemplateDao.countTemplatesForAccount(accountId); + } else if (type == Resource.ResourceType.project) { + newCount = _projectAccountDao.countByAccountIdAndRole(accountId, Role.Admin); + } else if (type == Resource.ResourceType.network) { + newCount = _networkDao.countNetworksUserCanCreate(accountId); + } else if (type == Resource.ResourceType.vpc) { + newCount = _vpcDao.countByAccountId(accountId); + } else if (type == Resource.ResourceType.cpu) { + newCount = countCpusForAccount(accountId); + } else if (type == Resource.ResourceType.memory) { + newCount = calculateMemoryForAccount(accountId); + } else if (type == Resource.ResourceType.primary_storage) { + List virtualRouters = _vmDao.findIdsOfAllocatedVirtualRoutersForAccount(accountId); + newCount = _volumeDao.primaryStorageUsedForAccount(accountId, virtualRouters); + } else if (type == Resource.ResourceType.secondary_storage) { + newCount = calculateSecondaryStorageForAccount(accountId); + } else { + throw new InvalidParameterValueException("Unsupported resource type " + type); + } + _resourceCountDao.setResourceCount(accountId, ResourceOwnerType.Account, type, (newCount == null) ? 0 : newCount.longValue()); + + // No need to log message for primary and secondary storage because both are recalculating the + // resource count which will not lead to any discrepancy. + if (!Long.valueOf(oldCount).equals(newCount) && (type != Resource.ResourceType.primary_storage && type != Resource.ResourceType.secondary_storage)) { + s_logger.warn("Discrepency in the resource count " + "(original count=" + oldCount + " correct count = " + newCount + ") for type " + type + " for account ID " + accountId + + " is fixed during resource count recalculation."); + } + return newCount; + } + }); return (newCount == null) ? 0 : newCount.longValue(); } @@ -1001,7 +980,7 @@ public long getResourceCount(Account account, ResourceType type) { return _resourceCountDao.getResourceCount(account.getId(), ResourceOwnerType.Account, type); } - private boolean isDisplayFlagOn(Boolean displayResource){ + private boolean isDisplayFlagOn(Boolean displayResource) { // 1. If its null assume displayResource = 1 // 2. If its not null then send true if displayResource = 1 From 601d095d71423ea7a22aa7e19f2f646b61f61478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Tue, 6 Feb 2018 21:08:07 -0200 Subject: [PATCH 009/145] Python automated test case for updateResourceCount API method --- .../component/test_updateResourceCount.py | 235 ++++++++++++++++++ 1 file changed, 235 insertions(+) create mode 100644 test/integration/component/test_updateResourceCount.py diff --git a/test/integration/component/test_updateResourceCount.py b/test/integration/component/test_updateResourceCount.py new file mode 100644 index 000000000000..c9bd6e6f183a --- /dev/null +++ b/test/integration/component/test_updateResourceCount.py @@ -0,0 +1,235 @@ +# 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. +""" Test update resource count API method +""" +# Import Local Modules +from marvin.cloudstackTestCase import cloudstackTestCase +from marvin.lib.utils import (random_gen, + cleanup_resources) +from marvin.lib.base import (Domain, + Account, + ServiceOffering, + VirtualMachine, + Network, + User, + NATRule, + Template, + PublicIPAddress, + Resources) +from marvin.lib.common import (get_domain, + get_zone, + get_template, + list_accounts, + list_virtual_machines, + list_service_offering, + list_templates, + list_users, + get_builtin_template_info, + wait_for_cleanup) +from nose.plugins.attrib import attr +from marvin.cloudstackException import CloudstackAPIException +import time + + +class Services: + + """These are some configurations that will get implemented in ACS. They are put here to follow some sort of standard that seems to be in place. + """ + + def __init__(self): + self.services = { + "account": { + "email": "test@test.com", + "firstname": "Test", + "lastname": "Tester", + "username": "test", + "password": "acountFirstUserPass", + }, + "service_offering_custom": { + "name": "Custom service offering test", + "displaytext": "Custom service offering test", + "cpunumber": None, + "cpuspeed": None, + # in MHz + "memory": None, + # In MBs + }, + "service_offering_normal": { + "name": "Normal service offering", + "displaytext": "Normal service offering", + "cpunumber": 2, + "cpuspeed": 1000, + # in MHz + "memory": 512, + # In MBs + }, + "virtual_machine": { + "displayname": "Test VM", + "username": "root", + "password": "password", + "ssh_port": 22, + "hypervisor": 'XenServer', + # Hypervisor type should be same as + # hypervisor type of cluster + "privateport": 22, + "publicport": 22, + "protocol": 'TCP', + }, + "ostype": 'CentOS 5.3 (64-bit)', + "sleep": 60, + "timeout": 10 + } + + +class TestUpdateResourceCount(cloudstackTestCase): + + @classmethod + def setUpClass(cls): + cls.testClient = super(TestUpdateResourceCount, cls).getClsTestClient() + cls.api_client = cls.testClient.getApiClient() + + cls.services = Services().services + cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests()) + cls.services['mode'] = cls.zone.networktype + cls.template = get_template( + cls.api_client, + cls.zone.id, + cls.services["ostype"] + ) + cls.services["virtual_machine"]["zoneid"] = cls.zone.id + cls.services["virtual_machine"]["template"] = cls.template.id + + cls.service_offering_custom = ServiceOffering.create( + cls.api_client, + cls.services["service_offering_custom"] + ) + cls.service_offering_normal = ServiceOffering.create( + cls.api_client, + cls.services["service_offering_normal"] + ) + cls._cleanup = [cls.service_offering_custom, cls.service_offering_normal] + return + + @classmethod + def tearDownClass(cls): + try: + # Cleanup resources used + cleanup_resources(cls.api_client, cls._cleanup) + except Exception as e: + raise Exception("Warning: Exception during cleanup : %s" % e) + return + + def setUp(self): + self.apiclient = self.testClient.getApiClient() + self.dbclient = self.testClient.getDbConnection() + self.cleanup = [] + self.account = Account.create( + self.apiclient, + self.services["account"] + ) + self.debug("Created account: %s" % self.account.name) + self.cleanup.append(self.account) + + return + + def tearDown(self): + try: + # Clean up, terminate the created accounts, domains etc + cleanup_resources(self.apiclient, self.cleanup) + except Exception as e: + raise Exception("Warning: Exception during cleanup : %s" % e) + return + + @attr( + tags=[ + "advanced", + "basic", + "eip", + "advancedns", + "sg"], + required_hardware="false") + def test_01_updateResourceCount(self): + """Test update resource count for an account using a custom service offering to deploy a VM. + """ + + # This test will execute the following steps to assure resource count update is working properly + # 1. Create an account. + # 2. Start 2 VMs; one with normal service offering and other with a custom service offering + # 3. Call the update resource count method and check the CPU and memory values. + # The two VMs will add up to 3 CPUs and 1024Mb of RAM. + # 4. If the return of updateResourceCount method matches with the expected one, the test passes; otherwise, it fails. + # 5. Remove everything created by deleting the account + + vm_1 = VirtualMachine.create( + self.apiclient, + self.services["virtual_machine"], + accountid=self.account.name, + domainid=self.account.domainid, + serviceofferingid=self.service_offering_custom.id, + customcpunumber = 1, + customcpuspeed = 1000, + custommemory = 512 + ) + + self.debug("Deployed VM 1 in account: %s, ID: %s" % ( + self.account.name, + vm_1.id + )) + + vm_2 = VirtualMachine.create( + self.apiclient, + self.services["virtual_machine"], + accountid=self.account.name, + domainid=self.account.domainid, + serviceofferingid=self.service_offering_normal.id + ) + self.debug("Deployed VM 2 in account: %s, ID: %s" % ( + self.account.name, + vm_2.id + )) + + resourceCountCpu = Resources.updateCount( + self.apiclient, + resourcetype=8, + account=self.account.name, + domainid=self.account.domainid + ) + + self.debug("ResourceCount for CPU: %s" % ( + resourceCountCpu[0].resourcecount + )) + self.assertEqual( + resourceCountCpu[0].resourcecount, + 3, + "The number of CPU cores does not seem to be right." + ) + resourceCountMemory = Resources.updateCount( + self.apiclient, + resourcetype=9, + account=self.account.name, + domainid=self.account.domainid + ) + + self.debug("ResourceCount for memory: %s" % ( + resourceCountMemory[0].resourcecount + )) + self.assertEqual( + resourceCountMemory[0].resourcecount, + 1024, + "The memory amount does not seem to be right." + ) + return \ No newline at end of file From 37e5d3631640428263311991b2c29a219d39cc43 Mon Sep 17 00:00:00 2001 From: Nitesh Sarda Date: Mon, 12 Feb 2018 16:40:27 +0530 Subject: [PATCH 010/145] CLOUDSTACK-10284:Creating a snapshot from VM Snapshot generates error if hypervisor is not KVM. --- ui/scripts/storage.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 1cba75054918..e9b6138d0b64 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -2859,7 +2859,10 @@ if (jsonObj.state == "Ready") { allowedActions.push("remove"); allowedActions.push("revertToVMSnapshot"); - allowedActions.push("takeSnapshot"); + + if (args && args.context && args.context.instances && args.context.instances[0].hypervisor && args.context.instances[0].hypervisor === "KVM") { + allowedActions.push("takeSnapshot"); + } } return allowedActions; From 6233a77d15adde86302a11b2bcda604313833e91 Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Thu, 15 Feb 2018 14:28:27 +0100 Subject: [PATCH 011/145] CLOUDSTACK-10294: PEP-8 fixes and enhancements to security_group.py (#2432) - We should return a boolean and not a String 'true' or 'false'. Although this output is never checked by the calling function(s). - Do not use == False or == None as that is not according to the Python specs. - Calling just print 'hello' is deprecated and won't work in newer Python versions. We should use the print() function. - Remove unused and commented function. - Use logging.warning() instead of logging.warn() - Use subprocess.check_output() for execution. This is the Python way of executing commands. Signed-off-by: Wido den Hollander --- scripts/vm/network/security_group.py | 174 ++++++++++++++------------- 1 file changed, 92 insertions(+), 82 deletions(-) diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py index 6a11057b237a..c09444467353 100755 --- a/scripts/vm/network/security_group.py +++ b/scripts/vm/network/security_group.py @@ -17,7 +17,7 @@ # under the License. import cloud_utils -from cloud_utils import Command +from subprocess import check_output, CalledProcessError from cloudutils.configFileOps import configFileOps import logging import sys @@ -34,9 +34,6 @@ logpath = "/var/run/cloud/" # FIXME: Logs should reside in /var/log/cloud lock_file = "/var/lock/cloudstack_security_group.lock" -iptables = Command("iptables") -bash = Command("/bin/bash") -ebtables = Command("ebtables") driver = "qemu:///system" cfo = configFileOps("/etc/cloudstack/agent/agent.properties") hyper = cfo.getEntry("hypervisor.type") @@ -45,6 +42,7 @@ lock_handle = None + def obtain_file_lock(path): global lock_handle @@ -57,21 +55,26 @@ def obtain_file_lock(path): return False + def execute(cmd): logging.debug(cmd) - return bash("-c", cmd).stdout + try: + return check_output(cmd, shell=True) + except CalledProcessError as e: + logging.exception('Failed to execute: %s', e.cmd) + def can_bridge_firewall(privnic): try: execute("which iptables") except: - print "no iptables on your host machine" + print("no iptables on your host machine") sys.exit(1) try: execute("which ebtables") except: - print "no ebtables on your host machine" + print("no ebtables on your host machine") sys.exit(2) @@ -82,34 +85,9 @@ def can_bridge_firewall(privnic): cleanup_rules() return True -''' -def ipset(ipsetname, proto, start, end, ips): - try: - check_call(['ipset', '-N', ipsetname, 'iptreemap']) - except: - logging.debug("ipset chain already exists" + ipsetname) - result = True - ipsettmp = ''.join(''.join(ipsetname.split('-')).split('_')) + str(int(time.time()) % 1000) - try: - check_call(['ipset', '-N', ipsettmp, 'iptreemap']) - for ip in ips: - try: - check_call(['ipset', '-A', ipsettmp, ip]) - except CommandException, cex: - if cex.reason.rfind('already in set') == -1: - raise - check_call(['ipset', '-W', ipsettmp, ipsetname]) - check_call(['ipset', '-X', ipsettmp]) - except: - logging.debug("Failed to program ipset " + ipsetname) - result = False - - return result -''' def virshlist(states): - libvirt_states={ 'running' : libvirt.VIR_DOMAIN_RUNNING, 'shutoff' : libvirt.VIR_DOMAIN_SHUTOFF, 'shutdown' : libvirt.VIR_DOMAIN_SHUTDOWN, @@ -122,8 +100,8 @@ def virshlist(states): searchstates = list(libvirt_states[state] for state in states) conn = libvirt.openReadOnly(driver) - if conn == None: - print 'Failed to open connection to the hypervisor' + if not conn: + print('Failed to open connection to the hypervisor') sys.exit(3) alldomains = map(conn.lookupByID, conn.listDomainsID()) @@ -138,8 +116,8 @@ def virshlist(states): return domains -def virshdomstate(domain): +def virshdomstate(domain): libvirt_states={ libvirt.VIR_DOMAIN_RUNNING : 'running', libvirt.VIR_DOMAIN_SHUTOFF : 'shut off', libvirt.VIR_DOMAIN_SHUTDOWN : 'shut down', @@ -150,8 +128,8 @@ def virshdomstate(domain): } conn = libvirt.openReadOnly(driver) - if conn == None: - print 'Failed to open connection to the hypervisor' + if not conn: + print('Failed to open connection to the hypervisor') sys.exit(3) try: @@ -164,11 +142,11 @@ def virshdomstate(domain): return state -def virshdumpxml(domain): +def virshdumpxml(domain): conn = libvirt.openReadOnly(driver) - if conn == None: - print 'Failed to open connection to the hypervisor' + if not conn: + print('Failed to open connection to the hypervisor') sys.exit(3) try: @@ -223,7 +201,7 @@ def destroy_network_rules_for_vm(vm_name, vif=None): except: logging.debug("Ignoring failure to delete ipset " + vmchain) - if vif is not None: + if vif: try: dnats = execute("""iptables -t nat -S | awk '/%s/ { sub(/-A/, "-D", $1) ; print }'""" % vif ).split("\n") for dnat in filter(None, dnats): @@ -237,9 +215,10 @@ def destroy_network_rules_for_vm(vm_name, vif=None): remove_secip_log_for_vm(vm_name) if 1 in [ vm_name.startswith(c) for c in ['r-', 's-', 'v-'] ]: - return 'true' + return True + + return True - return 'true' def destroy_ebtables_rules(vm_name, vif): eb_vm_chain=ebtables_chain_name(vm_name) @@ -273,6 +252,7 @@ def destroy_ebtables_rules(vm_name, vif): except: logging.debug("Ignoring failure to delete ebtables chain for vm " + vm_name) + def default_ebtables_rules(vm_name, vm_ip, vm_mac, vif): eb_vm_chain=ebtables_chain_name(vm_name) vmchain_in = eb_vm_chain + "-in" @@ -294,13 +274,13 @@ def default_ebtables_rules(vm_name, vm_ip, vm_mac, vif): execute("ebtables -t nat -A " + vmchain_out_ips + " -j DROP") except: logging.debug("Failed to program default rules") - return 'false' + return False try: execute("ebtables -t nat -A " + vmchain_in + " -s ! " + vm_mac + " -j DROP") execute("ebtables -t nat -A " + vmchain_in + " -p ARP -s ! " + vm_mac + " -j DROP") execute("ebtables -t nat -A " + vmchain_in + " -p ARP --arp-mac-src ! " + vm_mac + " -j DROP") - if vm_ip is not None: + if vm_ip: execute("ebtables -t nat -A " + vmchain_in + " -p ARP -j " + vmchain_in_ips) execute("ebtables -t nat -I " + vmchain_in_ips + " -p ARP --arp-ip-src " + vm_ip + " -j RETURN") execute("ebtables -t nat -A " + vmchain_in + " -p ARP --arp-op Request -j ACCEPT") @@ -308,11 +288,11 @@ def default_ebtables_rules(vm_name, vm_ip, vm_mac, vif): execute("ebtables -t nat -A " + vmchain_in + " -p ARP -j DROP") except: logging.exception("Failed to program default ebtables IN rules") - return 'false' + return False try: execute("ebtables -t nat -A " + vmchain_out + " -p ARP --arp-op Reply --arp-mac-dst ! " + vm_mac + " -j DROP") - if vm_ip is not None: + if vm_ip: execute("ebtables -t nat -A " + vmchain_out + " -p ARP -j " + vmchain_out_ips ) execute("ebtables -t nat -I " + vmchain_out_ips + " -p ARP --arp-ip-dst " + vm_ip + " -j RETURN") execute("ebtables -t nat -A " + vmchain_out + " -p ARP --arp-op Request -j ACCEPT") @@ -320,7 +300,7 @@ def default_ebtables_rules(vm_name, vm_ip, vm_mac, vif): execute("ebtables -t nat -A " + vmchain_out + " -p ARP -j DROP") except: logging.debug("Failed to program default ebtables OUT rules") - return 'false' + return False def default_network_rules_systemvm(vm_name, localbrname): @@ -348,13 +328,14 @@ def default_network_rules_systemvm(vm_name, localbrname): execute("iptables -A " + vmchain + " -m physdev --physdev-is-bridged --physdev-in " + vif + " -j RETURN") except: logging.debug("Failed to program default rules") - return 'false' + return False execute("iptables -A " + vmchain + " -j ACCEPT") - if write_rule_log_for_vm(vm_name, '-1', '_ignore_', domid, '_initial_', '-1') == False: + if not write_rule_log_for_vm(vm_name, '-1', '_ignore_', domid, '_initial_', '-1'): logging.debug("Failed to log default network rules for systemvm, ignoring") - return 'true' + return True + def remove_secip_log_for_vm(vmName): vm_name = vmName @@ -369,6 +350,7 @@ def remove_secip_log_for_vm(vmName): return result + def write_secip_log_for_vm (vmName, secIps, vmId): vm_name = vmName logfilename = logpath + vm_name + ".ip" @@ -388,6 +370,7 @@ def write_secip_log_for_vm (vmName, secIps, vmId): return result + def create_ipset_forvm(ipsetname, type='iphash', family='inet'): result = True try: @@ -401,6 +384,7 @@ def create_ipset_forvm(ipsetname, type='iphash', family='inet'): return result + def add_to_ipset(ipsetname, ips, action): result = True for ip in ips: @@ -413,6 +397,7 @@ def add_to_ipset(ipsetname, ips, action): return result + def network_rules_vmSecondaryIp(vm_name, ip_secondary, action): logging.debug("vmName = "+ vm_name) logging.debug("action = "+ action) @@ -425,7 +410,8 @@ def network_rules_vmSecondaryIp(vm_name, ip_secondary, action): #add ebtables rules for the secondary ip ebtables_rules_vmip(vm_name, [ip_secondary], action) - return 'true' + return True + def ebtables_rules_vmip (vmname, ips, action): eb_vm_chain=ebtables_chain_name(vmname) @@ -445,6 +431,7 @@ def ebtables_rules_vmip (vmname, ips, action): except: logging.debug("Failed to program ebtables rules for secondary ip %s for vm %s with action %s" % (ip, vmname, action)) + def default_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vm_mac, vif, brname, sec_ips): if not addFWFramework(brname): return False @@ -474,26 +461,26 @@ def default_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vm_mac, vif, brname, se action = "-A" vmipsetName = ipset_chain_name(vm_name) #create ipset and add vm ips to that ip set - if create_ipset_forvm(vmipsetName) == False: + if not create_ipset_forvm(vmipsetName): logging.debug(" failed to create ipset for rule " + str(tokens)) - return 'false' + return False #add primary nic ip to ipset - if add_to_ipset(vmipsetName, [vm_ip], action ) == False: + if not add_to_ipset(vmipsetName, [vm_ip], action ): logging.debug(" failed to add vm " + vm_ip + " ip to set ") - return 'false' + return False #add secodnary nic ips to ipset secIpSet = "1" ips = sec_ips.split(';') ips.pop() if ips[0] == "0": - secIpSet = "0"; + secIpSet = "0" if secIpSet == "1": logging.debug("Adding ipset for secondary ips") add_to_ipset(vmipsetName, ips, action) - if write_secip_log_for_vm(vm_name, sec_ips, vm_id) == False: + if not write_secip_log_for_vm(vm_name, sec_ips, vm_id): logging.debug("Failed to log default network rules, ignoring") try: @@ -505,7 +492,7 @@ def default_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vm_mac, vif, brname, se execute("iptables -A " + vmchain_default + " -m physdev --physdev-is-bridged --physdev-out " + vif + " -p udp --dport 68 --sport 67 -j ACCEPT") #don't let vm spoof its ip address - if vm_ip is not None: + if vm_ip: execute("iptables -A " + vmchain_default + " -m physdev --physdev-is-bridged --physdev-in " + vif + " -m set ! --set " + vmipsetName + " src -j DROP") execute("iptables -A " + vmchain_default + " -m physdev --physdev-is-bridged --physdev-in " + vif + " -m set --set " + vmipsetName + " src -p udp --dport 53 -j RETURN ") execute("iptables -A " + vmchain_default + " -m physdev --physdev-is-bridged --physdev-in " + vif + " -m set --set " + vmipsetName + " src -p tcp --dport 53 -j RETURN ") @@ -514,21 +501,21 @@ def default_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vm_mac, vif, brname, se execute("iptables -A " + vmchain + " -j DROP") except: logging.debug("Failed to program default rules for vm " + vm_name) - return 'false' + return False default_ebtables_rules(vm_name, vm_ip, vm_mac, vif) #default ebtables rules for vm secondary ips ebtables_rules_vmip(vm_name, ips, "-I") - if vm_ip is not None: - if write_rule_log_for_vm(vmName, vm_id, vm_ip, domID, '_initial_', '-1') == False: + if vm_ip: + if not write_rule_log_for_vm(vmName, vm_id, vm_ip, domID, '_initial_', '-1'): logging.debug("Failed to log default network rules, ignoring") vm_ip6_set_name = vm_name + '-6' if not create_ipset_forvm(vm_ip6_set_name, family='inet6', type='hash:net'): logging.debug(" failed to create ivp6 ipset for rule " + str(tokens)) - return 'false' + return False vm_ip6_addr = [ipv6_link_local] try: @@ -593,10 +580,11 @@ def default_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vm_mac, vif, brname, se execute('ip6tables -A ' + vmchain + ' -j DROP') except: logging.debug('Failed to program default rules for vm ' + vm_name) - return 'false' + return False logging.debug("Programmed default rules for vm " + vm_name) - return 'true' + return True + def post_default_network_rules(vm_name, vm_id, vm_ip, vm_mac, vif, brname, dhcpSvr, hostIp, hostMacAddr): vmchain_default = '-'.join(vm_name.split('-')[:-1]) + "-def" @@ -626,9 +614,10 @@ def post_default_network_rules(vm_name, vm_id, vm_ip, vm_mac, vif, brname, dhcpS execute("ebtables -t nat -I " + vmchain_out + " 2 -p ARP --arp-ip-dst ! " + vm_ip + " -j DROP") except: pass - if write_rule_log_for_vm(vm_name, vm_id, vm_ip, domID, '_initial_', '-1') == False: + if not write_rule_log_for_vm(vm_name, vm_id, vm_ip, domID, '_initial_', '-1'): logging.debug("Failed to log default network rules, ignoring") + def delete_rules_for_vm_in_bridge_firewall_chain(vmName): vm_name = vmName if vm_name.startswith('i-'): @@ -653,6 +642,7 @@ def delete_rules_for_vm_in_bridge_firewall_chain(vmName): except: logging.exception("Ignoring failure to delete rules for vm " + vmName) + def rewrite_rule_log_for_vm(vm_name, new_domid): logfilename = logpath + vm_name + ".log" if not os.path.exists(logfilename): @@ -666,8 +656,9 @@ def rewrite_rule_log_for_vm(vm_name, new_domid): write_rule_log_for_vm(_vmName, _vmID, '0.0.0.0', new_domid, _signature, '-1') + def get_rule_log_for_vm(vmName): - vm_name = vmName; + vm_name = vmName logfilename = logpath + vm_name + ".log" if not os.path.exists(logfilename): return '' @@ -681,12 +672,13 @@ def get_rule_log_for_vm(vmName): return ','.join([_vmName, _vmID, _vmIP, _domID, _signature, _seqno]) + def check_domid_changed(vmName): curr_domid = getvmId(vmName) if (curr_domid is None) or (not curr_domid.isdigit()): curr_domid = '-1' - vm_name = vmName; + vm_name = vmName logfilename = logpath + vm_name + ".log" if not os.path.exists(logfilename): return ['-1', curr_domid] @@ -700,6 +692,7 @@ def check_domid_changed(vmName): return [curr_domid, old_domid] + def network_rules_for_rebooted_vm(vmName): vm_name = vmName [curr_domid, old_domid] = check_domid_changed(vm_name) @@ -761,6 +754,7 @@ def network_rules_for_rebooted_vm(vmName): rewrite_rule_log_for_vm(vm_name, curr_domid) return True + def get_rule_logs_for_vms(): state=['running'] vms = virshlist(state) @@ -778,11 +772,13 @@ def get_rule_logs_for_vms(): except: logging.exception("Failed to get rule logs, better luck next time!") - print ";".join(result) + print(";".join(result)) + def cleanup_rules_for_dead_vms(): return True + def cleanup_bridge(bridge): bridge_name = getBrfw(bridge) logging.debug("Cleaning old bridge chains: " + bridge_name) @@ -810,6 +806,7 @@ def cleanup_bridge(bridge): except: pass return True + def cleanup_rules(): try: states=['running','paused'] @@ -865,8 +862,9 @@ def cleanup_rules(): except: logging.debug("Failed to cleanup rules !") + def check_rule_log_for_vm(vmName, vmId, vmIP, domID, signature, seqno): - vm_name = vmName; + vm_name = vmName logfilename = logpath + vm_name + ".log" if not os.path.exists(logfilename): return [True, True, True, True, True, True] @@ -889,6 +887,7 @@ def check_rule_log_for_vm(vmName, vmId, vmIP, domID, signature, seqno): return [(vm_name != _vmName), (vmId != _vmID), (vmIP != _vmIP), (domID != _domID), (signature != _signature),(seqno != _seqno)] + def write_rule_log_for_vm(vmName, vmID, vmIP, domID, signature, seqno): vm_name = vmName logfilename = logpath + vm_name + ".log" @@ -907,6 +906,7 @@ def write_rule_log_for_vm(vmName, vmID, vmIP, domID, signature, seqno): return result + def remove_rule_log_for_vm(vmName): vm_name = vmName logfilename = logpath + vm_name + ".log" @@ -920,6 +920,7 @@ def remove_rule_log_for_vm(vmName): return result + #ebtables chain max len 31 char def ebtables_chain_name(vm_name): # 23 because there are appends to the chains @@ -927,6 +928,7 @@ def ebtables_chain_name(vm_name): vm_name = vm_name[0:22] return vm_name + #ipset chain max len 31 char def ipset_chain_name(vm_name): if len(vm_name) > 30: @@ -940,6 +942,7 @@ def iptables_chain_name(vm_name): vm_name = vm_name[0:24] return vm_name + def egress_chain_name(vm_name): chain_name = iptables_chain_name(vm_name) return chain_name + "-eg" @@ -960,7 +963,7 @@ def parse_network_rules(rules): ruletype, protocol = tokens[0].split(':') start = int(tokens[1]) end = int(tokens[2]) - cidrs = tokens.pop(); + cidrs = tokens.pop() ipv4 = [] ipv6 = [] @@ -979,17 +982,17 @@ def parse_network_rules(rules): return ret + def add_network_rules(vm_name, vm_id, vm_ip, vm_ip6, signature, seqno, vmMac, rules, vif, brname, sec_ips): try: vmName = vm_name domId = getvmId(vmName) - changes = [] changes = check_rule_log_for_vm(vmName, vm_id, vm_ip, domId, signature, seqno) if not 1 in changes: logging.debug("Rules already programmed for vm " + vm_name) - return 'true' + return True if changes[0] or changes[1] or changes[2] or changes[3]: default_network_rules(vmName, vm_id, vm_ip, vm_ip6, vmMac, vif, brname, sec_ips) @@ -1073,17 +1076,18 @@ def add_network_rules(vm_name, vm_id, vm_ip, vm_ip6, signature, seqno, vmMac, ru execute('iptables -A ' + vmchain + ' -j DROP') execute('ip6tables -A ' + vmchain + ' -j DROP') - if write_rule_log_for_vm(vmName, vm_id, vm_ip, domId, signature, seqno) == False: - return 'false' + if not write_rule_log_for_vm(vmName, vm_id, vm_ip, domId, signature, seqno): + return False - return 'true' + return True except: logging.exception("Failed to network rule !") + def getVifs(vmName): vifs = [] xmlfile = virshdumpxml(vmName) - if xmlfile == None: + if not xmlfile: return vifs dom = xml.dom.minidom.parseString(xmlfile) @@ -1093,10 +1097,11 @@ def getVifs(vmName): vifs.append(nicdev) return vifs + def getVifsForBridge(vmName, brname): vifs = [] xmlfile = virshdumpxml(vmName) - if xmlfile == None: + if not xmlfile: return vifs dom = xml.dom.minidom.parseString(xmlfile) @@ -1109,10 +1114,11 @@ def getVifsForBridge(vmName, brname): vifs.append(nicdev) return list(set(vifs)) + def getBridges(vmName): bridges = [] xmlfile = virshdumpxml(vmName) - if xmlfile == None: + if not xmlfile: return bridges dom = xml.dom.minidom.parseString(xmlfile) @@ -1122,11 +1128,12 @@ def getBridges(vmName): bridges.append(bridge) return list(set(bridges)) + def getvmId(vmName): conn = libvirt.openReadOnly(driver) - if conn == None: - print 'Failed to open connection to the hypervisor' + if not conn: + print('Failed to open connection to the hypervisor') sys.exit(3) try: @@ -1141,6 +1148,7 @@ def getvmId(vmName): res = str(res) return res + def getBrfw(brname): cmd = "iptables-save |grep physdev-is-bridged |grep FORWARD |grep BF |grep '\-o' | grep -w " + brname + "|awk '{print $9}' | head -1" brfwname = bash("-c", cmd).stdout.strip() @@ -1148,6 +1156,7 @@ def getBrfw(brname): brfwname = "BF-" + brname return brfwname + def addFWFramework(brname): try: execute("sysctl -w net.bridge.bridge-nf-call-arptables=1") @@ -1227,6 +1236,7 @@ def addFWFramework(brname): return False return False + if __name__ == '__main__': logging.basicConfig(filename="/var/log/cloudstack/agent/security_group.log", format="%(asctime)s - %(message)s", level=logging.DEBUG) parser = OptionParser() @@ -1255,7 +1265,7 @@ def addFWFramework(brname): for i in range(0, 30): if obtain_file_lock(lock_file) is False: - logging.warn("Lock on %s is being held by other process. Waiting for release." % lock_file) + logging.warning("Lock on %s is being held by other process. Waiting for release." % lock_file) time.sleep(0.5) else: break From eeba3e4853cfefeddb98da515a685a0713de9b68 Mon Sep 17 00:00:00 2001 From: Dmytro Shevchenko Date: Thu, 15 Feb 2018 21:06:17 +0200 Subject: [PATCH 012/145] CLOUDSTACK-10295 Marvin: add support for password-enabled templates --- tools/marvin/marvin/lib/base.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index 23621991cc20..e0253896271c 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -593,6 +593,10 @@ def create(cls, apiclient, services, templateid=None, accountid=None, virtual_machine = apiclient.deployVirtualMachine(cmd, method=method) + if 'password' in virtual_machine.__dict__.keys(): + if virtual_machine.password: + services['password'] = virtual_machine.password + virtual_machine.ssh_ip = virtual_machine.nic[0].ipaddress if startvm is False: virtual_machine.public_ip = virtual_machine.nic[0].ipaddress From 689715504c84dce65e3f9d5f834cd01e5284bad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Wed, 14 Feb 2018 14:39:28 -0200 Subject: [PATCH 013/145] [CLOUDSTACK-10293] Single view network ACL rules listing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ACL rules editing/addition page is not user-friendly. Users are not able to see in a single view all of the detail of the ACL rule (they need to use a scroll bar on the horizontal). The problem becomes worse when there are a considerable number of rules. Therefore, we are proposing the following changes: 1- Instead of using the table to create new ACL, we can create a button like the one presented in attached pictures, where users can click, and then a modal popup would appear and users would be able to create the new ACL there. This is similar to the workings of the ACL edit button. 2 - Remove the ability to add new ACL via table where they are presented. All ACLs should be entered via the “New ACL” button. Therefore, the section “Add ACL” would be removed as well; 3 - Move the action section of the list ACL table to the most left position; These changes would reduce the information in the table and facilitate users to add new rules and easily edit them as well. --- ui/css/cloudstack3.css | 61 ++++-- ui/l10n/ar.js | 2 + ui/l10n/ca.js | 2 + ui/l10n/de_DE.js | 2 + ui/l10n/en.js | 2 + ui/l10n/es.js | 2 + ui/l10n/fr_FR.js | 2 + ui/l10n/hu.js | 2 + ui/l10n/it_IT.js | 2 + ui/l10n/ja_JP.js | 2 + ui/l10n/ko_KR.js | 2 + ui/l10n/nb_NO.js | 2 + ui/l10n/nl_NL.js | 2 + ui/l10n/pl.js | 2 + ui/l10n/pt_BR.js | 2 + ui/l10n/ru_RU.js | 2 + ui/l10n/zh_CN.js | 2 + ui/scripts/ui/widgets/multiEdit.js | 300 ++++++++++++++++------------- ui/scripts/vpc.js | 294 +++++++++++++++------------- 19 files changed, 398 insertions(+), 289 deletions(-) diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index 519778ba59ba..9b4e76380015 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -8391,7 +8391,6 @@ div.container div.panel div#details-tab-addloadBalancer.detail-group div.loadBal border-right: 1px solid #CFC9C9; height: 15px; overflow: auto; - padding-right: 0; } .multi-edit .data .data-body .data-item > table tbody tr td span { @@ -8426,8 +8425,44 @@ div.container div.panel div#details-tab-addloadBalancer.detail-group div.loadBal color: #0000FF; } -.multi-edit .data .data-body .data-item table tbody tr td.multi-actions { - border-right: none; +div#details-tab-aclRules table.multi-edit tr th.number, +div#details-tab-aclRules div.data-item table tr td.number { + width: 45px !important; + min-width: 45px !important; + max-width: 45px !important; +} + +div#details-tab-aclRules div.multi-edit table tr th.action, +div#details-tab-aclRules div.multi-edit table tr td.action { + width: 40px !important; + min-width: 40px !important; + max-width: 40px !important; +} + +div#details-tab-aclRules div.multi-edit table tr th.protocol, +div#details-tab-aclRules div.multi-edit table tr td.protocol { + width: 50px !important; + min-width: 50px !important; + max-width: 50px !important; +} + +div#details-tab-aclRules div.multi-edit table tr th.protocolnumber, +div#details-tab-aclRules div.multi-edit table tr td.protocolnumber { + width: 60px !important; + min-width: 60px !important; + max-width: 60px !important; +} + +div#details-tab-aclRules div.multi-edit table tr th.startport, div#details-tab-aclRules div.multi-edit table tr td.startport, +div#details-tab-aclRules div.multi-edit table tr th.endport, div#details-tab-aclRules div.multi-edit table tr td.endport { + width: 70px !important; + min-width: 70px !important; + max-width: 70px !important; +} + +div#details-tab-aclRules td.cidrlist span { + text-align: center; + width: 100%; } .multi-edit .data .data-body .data-item table tbody tr td.multi-actions .action { @@ -8548,17 +8583,18 @@ div.container div.panel div#details-tab-addloadBalancer.detail-group div.loadBal .detail-view .multi-edit table tr th, .detail-view .multi-edit table tr td { - width: 87px !important; - min-width: 87px !important; - max-width: 87px !important; + width: 84px !important; + min-width: 84px !important; + max-width: 84px !important; font-size: 10px; } /* special case for 'Source CIDR' column - make it wide enough to fit a CIDR without ellipsizing*/ .detail-view .multi-edit table tr th.cidrlist, .detail-view .multi-edit table tr td.cidrlist { - min-width: 112px !important; - max-width: 112px !important; + min-width: 118px !important; + max-width: 118px !important; + padding: 0 0 0 0; } .detail-view .multi-edit td.cidrlist input { width: 85%; @@ -8615,9 +8651,9 @@ div.container div.panel div#details-tab-addloadBalancer.detail-group div.loadBal /*Sortable*/ .multi-edit table tbody tr td.reorder, .multi-edit table thead tr th.reorder { - width: 30px !important; - min-width: 30px !important; - max-width: 30px !important; + width: 16px !important; + min-width: 16px !important; + max-width: 16px !important; } /*Security Rules*/ @@ -13037,7 +13073,7 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it -khtml-border-radius: 10px; border-radius: 10px; border-radius: 10px 10px 10px 10px; - background-position: -74px -162px; + background-position: -82px -162px; } .moveDrag:hover .icon { @@ -13357,4 +13393,3 @@ div.panel.copy-template-destination-list div.list-view div.fixed-header{ .multi-edit-add-list .ui-button.copytemplatecancel { left: 310px; } - diff --git a/ui/l10n/ar.js b/ui/l10n/ar.js index 3b560a86e728..8bd2d031215f 100644 --- a/ui/l10n/ar.js +++ b/ui/l10n/ar.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "المشاريع", "label.protocol": "Protocol", "label.protocol.number": "Protocol Number", + "label.protocol.number.short" : "#Protocol", "label.provider": "Provider", "label.providers": "Providers", "label.public": "Public", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "Routing", "label.routing.host": "Routing Host", "label.rule": "Rule", + "label.rule.number.short": "#Rule", "label.rule.number": "Rule Number", "label.rules": "Rules", "label.running.vms": "Running VMs", diff --git a/ui/l10n/ca.js b/ui/l10n/ca.js index f6ae80f81f3c..3ee21729151b 100644 --- a/ui/l10n/ca.js +++ b/ui/l10n/ca.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "Projectes", "label.protocol": "Protocol", "label.protocol.number": "Protocol Number", + "label.protocol.number.short" : "#Protocol", "label.provider": "Provider", "label.providers": "Proveïdors", "label.public": "Public", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "Routing", "label.routing.host": "Routing Host", "label.rule": "Rule", + "label.rule.number.short": "#Rule", "label.rule.number": "Rule Number", "label.rules": "Rules", "label.running.vms": "Running VMs", diff --git a/ui/l10n/de_DE.js b/ui/l10n/de_DE.js index 934f8f98c09d..7ae796fe499d 100644 --- a/ui/l10n/de_DE.js +++ b/ui/l10n/de_DE.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "Projekte", "label.protocol": "Protokoll", "label.protocol.number": "Protokollnummer", + "label.protocol.number.short" : "#Protokoll", "label.provider": "Anbieter", "label.providers": "Anbieter", "label.public": "Öffentlich", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "Routing", "label.routing.host": "Routing Host", "label.rule": "Regel", + "label.rule.number.short": "#Regel", "label.rule.number": "Regelnummer", "label.rules": "Regeln", "label.running.vms": "Laufende VMs", diff --git a/ui/l10n/en.js b/ui/l10n/en.js index 7b19946b1ed6..02b8c79acbf5 100644 --- a/ui/l10n/en.js +++ b/ui/l10n/en.js @@ -1316,6 +1316,7 @@ var dictionary = {"ICMP.code":"ICMP Code", "label.promiscuous.mode":"Promiscuous Mode", "label.protocol":"Protocol", "label.protocol.number":"Protocol Number", +"label.protocol.number.short" : "#Protocol", "label.provider":"Provider", "label.providers":"Providers", "label.public":"Public", @@ -1467,6 +1468,7 @@ var dictionary = {"ICMP.code":"ICMP Code", "label.routing.host":"Routing Host", "label.rule":"Rule", "label.rule.number":"Rule Number", +"label.rule.number.short": "#Rule", "label.rules":"Rules", "label.running.vms":"Running VMs", "label.s3.access_key":"Access Key", diff --git a/ui/l10n/es.js b/ui/l10n/es.js index 35257d479898..d125ad2af484 100644 --- a/ui/l10n/es.js +++ b/ui/l10n/es.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "Proyectos", "label.protocol": "Protocolo", "label.protocol.number": "Número de Protocolo", + "label.protocol.number.short" : "#Protocolo", "label.provider": "Proveedor", "label.providers": "Proveedores", "label.public": "Pública", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "Enrutamiento", "label.routing.host": "Servidor de Routeo", "label.rule": "Regla", + "label.rule.number.short": "#Regla", "label.rule.number": "Número de Regla", "label.rules": "Reglas", "label.running.vms": "MVs corriendo", diff --git a/ui/l10n/fr_FR.js b/ui/l10n/fr_FR.js index 9935a818021e..99ec18bd7955 100644 --- a/ui/l10n/fr_FR.js +++ b/ui/l10n/fr_FR.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "Projets", "label.protocol": "Protocole", "label.protocol.number": "Numéro Protocole", + "label.protocol.number.short" : "#Protocole", "label.provider": "Fournisseur", "label.providers": "Fournisseurs", "label.public": "Publique", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "Routage", "label.routing.host": "Hôte de routage", "label.rule": "Règle", + "label.rule.number.short": "#Règle", "label.rule.number": "Numéro règle", "label.rules": "Règles", "label.running.vms": "VMs actives", diff --git a/ui/l10n/hu.js b/ui/l10n/hu.js index 912ecf9a49da..e84800da55cc 100644 --- a/ui/l10n/hu.js +++ b/ui/l10n/hu.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "Projektek", "label.protocol": "Protokol", "label.protocol.number": "Protokoll szám", + "label.protocol.number.short" : "#Protocol", "label.provider": "Szolgáltató", "label.providers": "Szolgáltatók", "label.public": "Publikus", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "Útvonalválasztás", "label.routing.host": "Routing kiszolgáló", "label.rule": "Rule", + "label.rule.number.short": "#Rule", "label.rule.number": "Szabály szám", "label.rules": "Szabályok", "label.running.vms": "Futó VM-ek", diff --git a/ui/l10n/it_IT.js b/ui/l10n/it_IT.js index f725584e08bb..3dd7f35a5f5d 100644 --- a/ui/l10n/it_IT.js +++ b/ui/l10n/it_IT.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "Progetti", "label.protocol": "Protocol", "label.protocol.number": "Protocol Number", + "label.protocol.number.short" : "#Protocol", "label.provider": "Provider", "label.providers": "Fornitori", "label.public": "Public", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "Routing", "label.routing.host": "Routing Host", "label.rule": "Rule", + "label.rule.number.short": "#Rule", "label.rule.number": "Rule Number", "label.rules": "Regole", "label.running.vms": "Running VMs", diff --git a/ui/l10n/ja_JP.js b/ui/l10n/ja_JP.js index 40cf38fd8570..ce8967298b66 100644 --- a/ui/l10n/ja_JP.js +++ b/ui/l10n/ja_JP.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "プロジェクト", "label.protocol": "プロトコル", "label.protocol.number": "プロトコル番号", + "label.protocol.number.short" : "#Protocol", "label.provider": "プロバイダー", "label.providers": "プロバイダー", "label.public": "パブリック", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "ルーティング", "label.routing.host": "ルーティング ホスト", "label.rule": "Rule", + "label.rule.number.short": "#Rule", "label.rule.number": "規則番号", "label.rules": "規則", "label.running.vms": "実行中の VM", diff --git a/ui/l10n/ko_KR.js b/ui/l10n/ko_KR.js index f6980bc067e1..e60e0a95b7fb 100644 --- a/ui/l10n/ko_KR.js +++ b/ui/l10n/ko_KR.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "프로젝트", "label.protocol": "프로토콜", "label.protocol.number": "Protocol Number", + "label.protocol.number.short" : "#Protocol", "label.provider": "Provider", "label.providers": "제공자", "label.public": "공개", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "라우팅", "label.routing.host": "Routing Host", "label.rule": "Rule", + "label.rule.number.short": "#Rule", "label.rule.number": "Rule Number", "label.rules": "규칙", "label.running.vms": "실행중 VM", diff --git a/ui/l10n/nb_NO.js b/ui/l10n/nb_NO.js index 28cd09c3b9ab..08a077c8e998 100644 --- a/ui/l10n/nb_NO.js +++ b/ui/l10n/nb_NO.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "Prosjekter", "label.protocol": "Protokoll", "label.protocol.number": "Protokollnummer", + "label.protocol.number.short" : "#Protocol", "label.provider": "Tilbyder", "label.providers": "Tilbydere", "label.public": "Offentlig", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "Ruting", "label.routing.host": "Ruter Vert", "label.rule": "Rule", + "label.rule.number.short": "#Regel", "label.rule.number": "Regelnummer", "label.rules": "Regler", "label.running.vms": "Kjørende VMer", diff --git a/ui/l10n/nl_NL.js b/ui/l10n/nl_NL.js index 4508241ad307..0481297711d2 100644 --- a/ui/l10n/nl_NL.js +++ b/ui/l10n/nl_NL.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "Projecten", "label.protocol": "Protocol", "label.protocol.number": "protocol nummer", + "label.protocol.number.short" : "#Protocol", "label.provider": "Provider", "label.providers": "Providers", "label.public": "Publiek", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "Routing", "label.routing.host": "routeer machine", "label.rule": "Rule", + "label.rule.number.short": "#Rule", "label.rule.number": "Regel Nummer", "label.rules": "Regels", "label.running.vms": "Draaiende VMs", diff --git a/ui/l10n/pl.js b/ui/l10n/pl.js index 30c04b9ff75b..55b1b72b33d2 100644 --- a/ui/l10n/pl.js +++ b/ui/l10n/pl.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "Projekty", "label.protocol": "Protokół", "label.protocol.number": "Protocol Number", + "label.protocol.number.short" : "#Protocol", "label.provider": "Provider", "label.providers": "Dostawcy", "label.public": "Pobliczny", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "Routing", "label.routing.host": "Routing Host", "label.rule": "Rule", + "label.rule.number.short": "#Rule", "label.rule.number": "Rule Number", "label.rules": "Zasady", "label.running.vms": "Running VMs", diff --git a/ui/l10n/pt_BR.js b/ui/l10n/pt_BR.js index ccfa59ae7d35..42051e20755d 100644 --- a/ui/l10n/pt_BR.js +++ b/ui/l10n/pt_BR.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "Projetos", "label.protocol": "Protocolo", "label.protocol.number": "Número do Protocolo", + "label.protocol.number.short" : "#Protocolo", "label.provider": "Provedor", "label.providers": "Providers", "label.public": "Público", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "Roteamento", "label.routing.host": "Host de Roteamento", "label.rule": "Regra", + "label.rule.number.short": "#Regra", "label.rule.number": "Regra Número", "label.rules": "Regras", "label.running.vms": "VMs Rodando", diff --git a/ui/l10n/ru_RU.js b/ui/l10n/ru_RU.js index 6a11b38a0f70..8ced34c3e060 100644 --- a/ui/l10n/ru_RU.js +++ b/ui/l10n/ru_RU.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "Проекты", "label.protocol": "Протокол", "label.protocol.number": "Protocol Number", + "label.protocol.number.short" : "#Protocol", "label.provider": "Поставщики", "label.providers": "Поставщики", "label.public": "Публичный", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "Маршрутизация", "label.routing.host": "Routing Host", "label.rule": "Rule", + "label.rule.number.short": "#Rule", "label.rule.number": "Номер правила", "label.rules": "Правила", "label.running.vms": "Запущенные ВМ", diff --git a/ui/l10n/zh_CN.js b/ui/l10n/zh_CN.js index dc44fdb9a96a..b755356115e6 100644 --- a/ui/l10n/zh_CN.js +++ b/ui/l10n/zh_CN.js @@ -1278,6 +1278,7 @@ var dictionary = { "label.projects": "项目", "label.protocol": "协议", "label.protocol.number": "协议编号", + "label.protocol.number.short" : "#Protocol", "label.provider": "提供程序", "label.providers": "提供程序", "label.public": "公用", @@ -1427,6 +1428,7 @@ var dictionary = { "label.routing": "正在路由", "label.routing.host": "正在路由主机", "label.rule": "规则", + "label.rule.number.short": "#Rule", "label.rule.number": "规则编号", "label.rules": "规则", "label.running.vms": "正在运行的 VM", diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js index c3fa97c8fc11..36e3ffb4c909 100755 --- a/ui/scripts/ui/widgets/multiEdit.js +++ b/ui/scripts/ui/widgets/multiEdit.js @@ -79,7 +79,10 @@ }); } - + var $actions = undefined; + if(options.editOptionsFirst){ + $actions = $('').addClass('multi-actions').appendTo($item.find('tr')); + } // Setup columns $.each(fields, function(fieldName, field) { if (!field || (options.ignoreEmptyFields && !data[fieldName])) { @@ -160,8 +163,9 @@ } if (!field.isPassword) { + $td.attr('title', data[fieldName]); if (field.edit) { - // Edit fields append value of data + // Edit fields append value of data if (field.range) { var start = _s(data[field.range[0]]); var end = _s(data[field.range[1]]); @@ -177,7 +181,6 @@ } else { $td.append($('').html(_s(data[fieldName]))); } - $td.attr('title', data[fieldName]); } } else if (field.isBoolean) { var $checkbox = $(''); @@ -324,9 +327,9 @@ return true; }); - // Actions column - var $actions = $('').addClass('multi-actions').appendTo($item.find('tr')); - + if(!options.editOptionsFirst){ + var $actions = $('').addClass('multi-actions').appendTo($item.find('tr')); + } // Align action column width $actions.width($multi.find('th.multi-actions').width() + 4); @@ -905,16 +908,20 @@ var $thead = $('').appendTo( $('').appendTo($inputTable) ); - var $inputForm = $('').appendTo( - $('').appendTo($inputTable) - ); + if (!args.doNotShowInputTable){ + var $inputForm = $('').appendTo( + $('').appendTo($inputTable) + ); + } var $dataBody = $('
').addClass('data-body').appendTo($dataTable); // Setup input table headers if (reorder) { $('').addClass('reorder').appendTo($thead); - $('').addClass('reorder').appendTo($inputForm); + if (!args.doNotShowInputTable){ + $('').addClass('reorder').appendTo($inputForm); + } $multi.find('.data-body').sortable({ handle: '.action.moveDrag', @@ -946,6 +953,13 @@ }); } + if (args.editOptionsFirst && args.actions && !args.noHeaderActionsColumn) { + $thead.append($('').html(_l('label.actions')).addClass('multi-actions')); + if (!args.doNotShowInputTable){ + $inputForm.append($('').addClass('multi-actions')); + } + } + $.each(args.fields, function(fieldName, field) { if (!field) return true; @@ -954,7 +968,10 @@ $th.appendTo($thead); var $td = $('').addClass(fieldName); $td.attr('rel', fieldName); - $td.appendTo($inputForm); + + if (!args.doNotShowInputTable){ + $td.appendTo($inputForm); + } var isHidden = $.isFunction(field.isHidden) ? field.isHidden({ context: context }) : field.isHidden; @@ -1071,7 +1088,10 @@ ).appendTo($td); } - if (field.desc) $input.attr('title', field.desc); + if (field.desc){ + $input.attr('title', field.desc); + $th.attr('title', _l(field.desc)); + } }); // Setup header fields @@ -1093,134 +1113,137 @@ .prependTo($multi); } - if (args.actions && !args.noHeaderActionsColumn) { + if (!args.editOptionsFirst && args.actions && !args.noHeaderActionsColumn) { $thead.append($('').html(_l('label.actions')).addClass('multi-actions')); - $inputForm.append($('').addClass('multi-actions')); - } - - $addVM.bind('click', function() { - // Validate form first - if (!$multiForm.valid()) { - if ($multiForm.find('input.error:visible').size()) { - return false; - } + if (!args.doNotShowInputTable){ + $inputForm.append($('').addClass('multi-actions')); } - - var $dataList; - var addItem = function(itemData) { - var data = {}; - - $.each(getMultiData($multi), function(key, value) { - if (value != '') { - data[key] = value; - } - }); - - // Append custom data - var $customFields = $multi.find('tbody td').filter(function() { - return $(this).data('multi-custom-data'); - }); - - $customFields.each(function() { - var $field = $(this); - var fieldID = $field.attr('rel'); - var fieldData = $field.data('multi-custom-data'); - - data[fieldID] = fieldData; - }); - - // Loading appearance - var $loading = _medit.loadingItem($multi, _l('label.adding') + '...'); - $dataBody.prepend($loading); - - // Clear out fields - $multi.find('input').each(function() { - var $input = $(this); - - if ($input.is(":checkbox")) { - $input.attr({ - checked: false - }); - } else if ($input.data('multi-default-value')) { - $input.val($input.data('multi-default-value')); - } else { - $input.val(''); - } - }); - $multi.find('tbody td').each(function() { - var $item = $(this); - - if ($item.data('multi-custom-data')) { - $item.data('multi-custom-data', null); - } - }); - - // Apply action - args.add.action({ - context: context, - data: data, - itemData: itemData, - $multi: $multi, - response: { - success: function(successArgs) { - var notification = successArgs ? successArgs.notification : null; - if (notification) { - $('.notifications').notifications('add', { - section: 'network', - desc: notification.label, - interval: 3000, - _custom: successArgs._custom, - poll: function(pollArgs) { - var complete = pollArgs.complete; - var error = pollArgs.error; - - notification.poll({ - _custom: pollArgs._custom, - complete: function(completeArgs) { - complete(args); - $loading.remove(); - getData(); - }, - - error: function(args) { - error(args); - $loading.remove(); - - return cloudStack.dialog.error(args); - } - }); - } - }); - } else { - $loading.remove(); - getData(); - } - }, - - error: cloudStack.dialog.error(function() { - $loading.remove(); - }) - } - }); - }; - - if (args.noSelect) { - // Don't append instance data - addItem([]); - - return true; - } - - _medit.vmList($multi, - args.listView, - args.context, - multipleAdd, _l('label.add.vms'), - addItem); - - return true; - }); - + } + if($addVM){ + $addVM.bind('click', function() { + // Validate form first + if (!$multiForm.valid()) { + if ($multiForm.find('input.error:visible').size()) { + return false; + } + } + + var $dataList; + var addItem = function(itemData) { + var data = {}; + + $.each(getMultiData($multi), function(key, value) { + if (value != '') { + data[key] = value; + } + }); + + // Append custom data + var $customFields = $multi.find('tbody td').filter(function() { + return $(this).data('multi-custom-data'); + }); + + $customFields.each(function() { + var $field = $(this); + var fieldID = $field.attr('rel'); + var fieldData = $field.data('multi-custom-data'); + + data[fieldID] = fieldData; + }); + + // Loading appearance + var $loading = _medit.loadingItem($multi, _l('label.adding') + '...'); + $dataBody.prepend($loading); + + // Clear out fields + $multi.find('input').each(function() { + var $input = $(this); + + if ($input.is(":checkbox")) { + $input.attr({ + checked: false + }); + } else if ($input.data('multi-default-value')) { + $input.val($input.data('multi-default-value')); + } else { + $input.val(''); + } + }); + $multi.find('tbody td').each(function() { + var $item = $(this); + + if ($item.data('multi-custom-data')) { + $item.data('multi-custom-data', null); + } + }); + + // Apply action + args.add.action({ + context: context, + data: data, + itemData: itemData, + $multi: $multi, + response: { + success: function(successArgs) { + var notification = successArgs ? successArgs.notification : null; + if (notification) { + $('.notifications').notifications('add', { + section: 'network', + desc: notification.label, + interval: 3000, + _custom: successArgs._custom, + poll: function(pollArgs) { + var complete = pollArgs.complete; + var error = pollArgs.error; + + notification.poll({ + _custom: pollArgs._custom, + complete: function(completeArgs) { + complete(args); + $loading.remove(); + getData(); + }, + + error: function(args) { + error(args); + $loading.remove(); + + return cloudStack.dialog.error(args); + } + }); + } + }); + } else { + $loading.remove(); + getData(); + } + }, + + error: cloudStack.dialog.error(function() { + $loading.remove(); + }) + } + }); + }; + + if (args.noSelect) { + // Don't append instance data + addItem([]); + + return true; + } + + _medit.vmList($multi, + args.listView, + args.context, + multipleAdd, _l('label.add.vms'), + addItem); + + return true; + }); + } var listView = args.listView; + var editOptionsFirst = args.editOptionsFirst; var getData = function() { dataProvider({ context: context, @@ -1247,7 +1270,8 @@ listView: listView, tags: tags, reorder: reorder, - selectPermission: selectPermission + selectPermission: selectPermission, + editOptionsFirst: editOptionsFirst } ).appendTo($dataBody); }); diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 14e41af2b235..40c954f5d00a 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -190,63 +190,14 @@ }; }; - var aclMultiEdit = { - noSelect: true, - - reorder: { - moveDrag: { - action: function(args) { - var rule = args.context.multiRule[0]; - var number = 0; - var prevItem = args.prevItem ? args.prevItem.number : null; - var nextItem = args.nextItem ? args.nextItem.number : null; - - if (!nextItem) { // Last item - number = prevItem + 100; - } else { - if (nextItem - prevItem <= 10) { - number = nextItem - parseInt(((nextItem - prevItem) / 2)); - } else { - number = nextItem > 1 ? nextItem - 10 : 1; - } - } - - $.ajax({ - url: createURL('updateNetworkACLItem'), - data: { - id: rule.id, - number: number - }, - success: function(json) { - var pollTimer = setInterval(function() { - pollAsyncJobResult({ - _custom: { - jobId: json.createnetworkaclresponse.jobid - }, - complete: function() { - clearInterval(pollTimer); - args.response.success(); - }, - error: function(errorMsg) { - clearInterval(pollTimer); - args.response.error(errorMsg); - } - }); - }, 1000); - } - }); - } - } - }, - fields: { - + var aclRuleFields = { 'number': { - label: 'label.rule.number', + label: 'label.rule.number.short', + desc: 'label.rule.number', edit: true, isEditable: true }, - 'cidrlist': { edit: true, label: 'label.cidr', @@ -322,6 +273,13 @@ $portFields.hide(); } else if ($(this).val() == 'all') { $portFields.hide(); + $portFields.attr('disabled', 'disabled'); + + $icmpFields.hide(); + $icmpFields.attr('disabled', 'disabled'); + + $protocolFields.attr('disabled', 'disabled'); + $protocolFields.hide(); } else { $otherFields.show(); $icmpFields.hide(); @@ -378,8 +336,14 @@ $otherFields.hide(); $otherFields.parent().find('label.error').hide(); } else if ($(this).val() == 'all') { - $portFields.attr('disabled', 'disabled'); $portFields.hide(); + $portFields.attr('disabled', 'disabled'); + + $icmpFields.hide(); + $icmpFields.attr('disabled', 'disabled'); + + $protocolFields.hide(); + $protocolFields.attr('disabled', 'disabled'); } else { $otherFields.show(); $otherFields.parent().find('label.error').hide(); @@ -420,7 +384,8 @@ }, 'protocolnumber': { - label: 'label.protocol.number', + label: 'label.protocol.number.short', + desc: 'label.protocol.number', edit: true, isEditable: true }, @@ -436,6 +401,38 @@ isOptional: true, isEditable: true }, + 'icmptype': { + edit: true, + label: 'ICMP.type', + desc: 'Please specify -1 if you want to allow all ICMP types', + defaultValue: '-1', + isEditable: true + }, + 'icmpcode': { + edit: true, + label: 'ICMP.code', + desc: 'Please specify -1 if you want to allow all ICMP codes', + defaultValue: '-1', + isEditable: true + }, + 'traffictype': { + label: 'label.traffic.type', + isEditable: true, + select: function(args) { + args.response.success({ + data: [{ + name: 'Ingress', + description: 'Ingress' + }, { + name: 'Egress', + description: 'Egress' + }] + }); + } + } + }; + + var aclRuleFieldsForMultiEdit = { 'networkid': { label: 'label.select.tier', select: function(args) { @@ -472,43 +469,60 @@ }); } }, - 'icmptype': { - edit: true, - label: 'ICMP.type', - isDisabled: true, - desc: 'Please specify -1 if you want to allow all ICMP types', - defaultValue: '-1', - isEditable: true - }, - 'icmpcode': { - edit: true, - label: 'ICMP.code', - isDisabled: true, - desc: 'Please specify -1 if you want to allow all ICMP codes', - defaultValue: '-1', - isEditable: true - }, - 'traffictype': { - label: 'label.traffic.type', - isEditable: true, - select: function(args) { - args.response.success({ - data: [{ - name: 'Ingress', - description: 'Ingress' - }, { - name: 'Egress', - description: 'Egress' - }] + }; + + jQuery.extend(aclRuleFieldsForMultiEdit, aclRuleFields); + + var aclMultiEdit = { + doNotShowInputTable: true, + editOptionsFirst: true, + noSelect: true, + reorder: { + moveDrag: { + action: function(args) { + var rule = args.context.multiRule[0]; + var number = 0; + var prevItem = args.prevItem ? args.prevItem.number : null; + var nextItem = args.nextItem ? args.nextItem.number : null; + + if (!nextItem) { // Last item + number = prevItem + 100; + } else { + if (nextItem - prevItem <= 10) { + number = nextItem - parseInt(((nextItem - prevItem) / 2)); + } else { + number = nextItem > 1 ? nextItem - 10 : 1; + } + } + + $.ajax({ + url: createURL('updateNetworkACLItem'), + data: { + id: rule.id, + number: number + }, + success: function(json) { + var pollTimer = setInterval(function() { + pollAsyncJobResult({ + _custom: { + jobId: json.createnetworkaclresponse.jobid + }, + complete: function() { + clearInterval(pollTimer); + args.response.success(); + }, + error: function(errorMsg) { + clearInterval(pollTimer); + args.response.error(errorMsg); + } + }); + }, 1000); + } }); } - }, - 'add-rule': { - label: 'label.add.rule', - addButton: true } }, - + fields: aclRuleFieldsForMultiEdit, tags: cloudStack.api.tags({ resourceType: 'NetworkACL', contextId: 'multiRule' @@ -983,32 +997,6 @@ }); } }, - - /* - rules: { - title: 'label.rules', - multiple: true, - fields: [ - { - sourceport: { label: 'Source Port' }, - instanceport: { label: 'Instance Port' } - } - ], - dataProvider: function(args) { - $.ajax({ - url: createURL('listLoadBalancers'), - data: { - id: args.context.internalLoadBalancers[0].id - }, - success: function(json) { - var item = json.listloadbalancersresponse.loadbalancer[0]; - args.response.success({ data: item.loadbalancerrule }); - } - }); - } - }, - */ - assignedVms: { title: 'label.assigned.vms', listView: { @@ -1333,35 +1321,65 @@ $.ajax({ url: createURL('listNetworkACLs&aclid=' + args.context.aclLists[0].id), success: function(json) { - var items = json.listnetworkaclsresponse.networkacl.sort(function(a, b) { - return a.number >= b.number; - }).map(function(acl) { - if (parseInt(acl.protocol)) { // protocol number - acl.protocolnumber = acl.protocol; - acl.protocol = "protocolnumber"; - } - - return acl; - }); + var items = json.listnetworkaclsresponse.networkacl; + + if(items){ + items.sort(function(a, b) { + return a.number >= b.number; + }).map(function(acl) { + if (parseInt(acl.protocol)) { // protocol number + acl.protocolnumber = acl.protocol; + acl.protocol = "protocolnumber"; + } + + return acl; + }); + } args.response.success({ data: items - /* { - cidrlist: '10.1.1.0/24', - protocol: 'TCP', - startport: 22, endport: 22, - networkid: 0, - traffictype: 'Egress' - }, - { - cidrlist: '10.2.1.0/24', - protocol: 'UDP', - startport: 56, endport: 72, - networkid: 0, - trafficType: 'Ingress' - } - ]*/ }); + if(jQuery('#details-tab-aclRules').siblings('div.toolbar').children('div.add').size() === 0){ + var $addAclRuleDivButton = jQuery('
').addClass('button add'); + var $spanAddAclRuleButtonMessage = jQuery('').html(_l('label.add.ACL')); + + $addAclRuleDivButton.html($spanAddAclRuleButtonMessage); + $addAclRuleDivButton.click(function(){ + cloudStack.dialog.createForm({ + form: { + title: 'label.add.rule', + desc: 'Create a new ACL rule', + fields: aclRuleFields + }, + after: function(argsLocal) { + var data = argsLocal.data; + data.aclid = argsLocal.context.aclLists[0].id; + if(data.protocol != 'icmp'){ + data.icmpcode = undefined; + data.icmptype = undefined; + } + if(data.protocol != 'protocolnumber'){ + data.protocolnumber = undefined; + } + if(data.protocol === 'all'){ + data.startport = undefined; + data.endport = undefined; + } + $.ajax({ + url: createURL('createNetworkACL'), + data: argsLocal.data, + type: "POST", + success: function(json) { + jQuery('button.cancel:visible').click(); + jQuery('div.toolbar:visible div.refresh').click(); + } + }); + }, + context: args.context + }); + }); + jQuery('#details-tab-aclRules').siblings('div.toolbar').append($addAclRuleDivButton); + } } }); } From 0081dca8259bc2fc45deae42d13de86672b6a70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Tue, 20 Feb 2018 08:04:35 -0300 Subject: [PATCH 014/145] Create database path upgrade from 4.11.0.0 to 4.12.0.0 --- .../cloud/upgrade/DatabaseUpgradeChecker.java | 119 +++++++++--------- .../upgrade/dao/Upgrade41100to41200.java | 68 ++++++++++ .../db/schema-41100to41200-cleanup.sql | 20 +++ .../META-INF/db/schema-41100to41200.sql | 20 +++ 4 files changed, 168 insertions(+), 59 deletions(-) create mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41100to41200.java create mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41100to41200-cleanup.sql create mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql diff --git a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java index 75c01c7442c0..23486188b978 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java @@ -43,6 +43,7 @@ import com.cloud.upgrade.dao.Upgrade30to301; import com.cloud.upgrade.dao.Upgrade40to41; import com.cloud.upgrade.dao.Upgrade410to420; +import com.cloud.upgrade.dao.Upgrade41100to41200; import com.cloud.upgrade.dao.Upgrade420to421; import com.cloud.upgrade.dao.Upgrade421to430; import com.cloud.upgrade.dao.Upgrade430to440; @@ -120,7 +121,7 @@ public DatabaseUpgradeChecker() { new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), - new Upgrade41000to41100()}); + new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.1.8"), new DbUpgrade[] {new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), @@ -129,7 +130,7 @@ public DatabaseUpgradeChecker() { new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), - new Upgrade4930to41000()}); + new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.1.9"), new DbUpgrade[] {new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), @@ -138,7 +139,7 @@ public DatabaseUpgradeChecker() { new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), - new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.1"), new DbUpgrade[] {new Upgrade221to222(), new UpgradeSnapshot223to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), @@ -146,7 +147,7 @@ public DatabaseUpgradeChecker() { new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), - new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.2"), new DbUpgrade[] {new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), @@ -154,7 +155,7 @@ public DatabaseUpgradeChecker() { new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), - new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.3"), new DbUpgrade[] {new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), @@ -162,7 +163,7 @@ public DatabaseUpgradeChecker() { new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), - new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.4"), new DbUpgrade[] {new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), @@ -170,7 +171,7 @@ public DatabaseUpgradeChecker() { new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), - new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.5"), new DbUpgrade[] {new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), @@ -178,273 +179,273 @@ public DatabaseUpgradeChecker() { new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), - new Upgrade41000to41100()}); + new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.6"), new DbUpgrade[] {new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), - new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.7"), new DbUpgrade[] {new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), - new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.8"), new DbUpgrade[] {new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), - new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.9"), new DbUpgrade[] {new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), - new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.10"), new DbUpgrade[] {new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.12"), new DbUpgrade[] {new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), - new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.13"), new DbUpgrade[] {new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), - new Upgrade41000to41100()}); + new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.14"), new DbUpgrade[] {new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), - new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("3.0.0"), new DbUpgrade[] {new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), - new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("3.0.1"), new DbUpgrade[] {new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), - new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("3.0.2"), new DbUpgrade[] {new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.0.0"), new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.0.1"), new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.0.2"), new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.1.0"), new DbUpgrade[] {new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), - new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.1.1"), new DbUpgrade[] {new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), - new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.2.0"), new DbUpgrade[] {new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), - new Upgrade41000to41100()}); + new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.2.1"), new DbUpgrade[] {new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), - new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.3.0"), new DbUpgrade[] {new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), - new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.3.1"), new DbUpgrade[] {new Upgrade431to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), - new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.3.2"), new DbUpgrade[] {new Upgrade432to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), - new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.4.0"), new DbUpgrade[] {new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), - new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.4.1"), new DbUpgrade[] {new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.4.2"), new DbUpgrade[] {new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.4.3"), new DbUpgrade[] {new Upgrade443to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.4.4"), new DbUpgrade[] {new Upgrade444to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.5.0"), new DbUpgrade[] {new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), - new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.5.1"), new DbUpgrade[] {new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), - new Upgrade41000to41100()}); + new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.5.2"), new DbUpgrade[] {new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), - new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.5.3"), new DbUpgrade[] {new Upgrade453to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), - new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.6.0"), new DbUpgrade[] {new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), - new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.6.1"), new DbUpgrade[] {new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), - new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.6.2"), new DbUpgrade[] {new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), - new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.7.0"), new DbUpgrade[] {new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.7.1"), new DbUpgrade[] {new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), - new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.7.2"), new DbUpgrade[] {new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), - new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.8.0"), new DbUpgrade[] {new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), - new Upgrade41000to41100()}); + new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.8.1"), - new DbUpgrade[] {new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new DbUpgrade[] {new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.8.2.0"), - new DbUpgrade[] {new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new DbUpgrade[] {new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.9.0"), - new DbUpgrade[] {new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new DbUpgrade[] {new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.9.1.0"), - new DbUpgrade[] {new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new DbUpgrade[] {new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.9.2.0"), - new DbUpgrade[] {new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new DbUpgrade[] {new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.9.3.0"), - new DbUpgrade[] {new Upgrade4930to41000(), new Upgrade41000to41100()}); + new DbUpgrade[] {new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("4.10.0.0"), - new DbUpgrade[] {new Upgrade41000to41100()}); + new DbUpgrade[] {new Upgrade41000to41100(), new Upgrade41100to41200()}); //CP Upgrades _upgradeMap.put(CloudStackVersion.parse("3.0.3"), new DbUpgrade[] {new Upgrade303to304(), new Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), - new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("3.0.4"), new DbUpgrade[] {new Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), - new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("3.0.5"), new DbUpgrade[] {new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), - new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("3.0.6"), new DbUpgrade[] {new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("3.0.7"), new DbUpgrade[] {new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.15"), new DbUpgrade[] {new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to303(), new Upgrade303to304(), new Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); _upgradeMap.put(CloudStackVersion.parse("2.2.16"), new DbUpgrade[] {new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to303(), new Upgrade303to304(), new Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), - new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100()}); + new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41200()}); final List sortedVersions = newArrayList(_upgradeMap.keySet()); sort(sortedVersions); diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41100to41200.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41100to41200.java new file mode 100644 index 000000000000..f44c2a0e5d66 --- /dev/null +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41100to41200.java @@ -0,0 +1,68 @@ +// 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.upgrade.dao; + +import java.io.InputStream; +import java.sql.Connection; + +import com.cloud.utils.exception.CloudRuntimeException; + +public class Upgrade41100to41200 implements DbUpgrade { + + @Override + public String[] getUpgradableVersionRange() { + return new String[] {"4.11.0.0", "4.12.0.0"}; + } + + @Override + public String getUpgradedVersion() { + return "4.12.0.0"; + } + + @Override + public boolean supportsRollingUpgrade() { + return false; + } + + @Override + public InputStream[] getPrepareScripts() { + final String scriptFile = "META-INF/db/schema-41100to41200.sql"; + final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile); + if (script == null) { + throw new CloudRuntimeException("Unable to find " + scriptFile); + } + + return new InputStream[] {script}; + } + + @Override + public void performDataMigration(Connection conn) { + + } + + @Override + public InputStream[] getCleanupScripts() { + final String scriptFile = "META-INF/db/schema-41100to41200-cleanup.sql"; + final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile); + if (script == null) { + throw new CloudRuntimeException("Unable to find " + scriptFile); + } + + return new InputStream[] {script}; + } +} diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41100to41200-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41100to41200-cleanup.sql new file mode 100644 index 000000000000..dcd9b8361308 --- /dev/null +++ b/engine/schema/src/main/resources/META-INF/db/schema-41100to41200-cleanup.sql @@ -0,0 +1,20 @@ +-- 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. + +--; +-- Schema upgrade cleanup from 4.11.0.0 to 4.12.0.0 +--; \ No newline at end of file diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql b/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql new file mode 100644 index 000000000000..b6fd45f94a49 --- /dev/null +++ b/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql @@ -0,0 +1,20 @@ +-- 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. + +--; +-- Schema upgrade from 4.11.0.0 to 4.12.0.0 +--; \ No newline at end of file From c8d9754b432a5532304c04906df206b11e6dfa48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Tue, 20 Feb 2018 08:07:14 -0300 Subject: [PATCH 015/145] Remove dead code in DatabaseUpgradeChecker --- .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java index 23486188b978..5115694c9ae2 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java @@ -522,21 +522,6 @@ protected void upgrade(CloudStackVersion dbVersion, CloudStackVersion currentVer final DbUpgrade[] upgrades = calculateUpgradePath(dbVersion, currentVersion); - boolean supportsRollingUpgrade = true; - for (DbUpgrade upgrade : upgrades) { - if (!upgrade.supportsRollingUpgrade()) { - supportsRollingUpgrade = false; - break; - } - } - - if (!supportsRollingUpgrade && false) { // FIXME: Needs to detect if there are management servers running - // ClusterManagerImpl.arePeersRunning(null)) { - String errorMessage = "Unable to run upgrade because the upgrade sequence does not support rolling update and there are other management server nodes running"; - s_logger.error(errorMessage); - throw new CloudRuntimeException(errorMessage); - } - for (DbUpgrade upgrade : upgrades) { VersionVO version; s_logger.debug("Running upgrade " + upgrade.getClass().getSimpleName() + " to upgrade from " + upgrade.getUpgradableVersionRange()[0] + "-" + upgrade From a4364267e7d549401817ed9a714581181f071cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Mon, 19 Feb 2018 08:11:46 -0300 Subject: [PATCH 016/145] Externalize ICMP type/code and add new ACL rule descriptions in property files --- ui/l10n/ar.js | 3 +++ ui/l10n/ca.js | 3 +++ ui/l10n/de_DE.js | 3 +++ ui/l10n/en.js | 6 +++++- ui/l10n/es.js | 3 +++ ui/l10n/fr_FR.js | 3 +++ ui/l10n/hu.js | 3 +++ ui/l10n/it_IT.js | 3 +++ ui/l10n/ja_JP.js | 3 +++ ui/l10n/ko_KR.js | 3 +++ ui/l10n/nb_NO.js | 3 +++ ui/l10n/nl_NL.js | 3 +++ ui/l10n/pl.js | 3 +++ ui/l10n/pt_BR.js | 3 +++ ui/l10n/ru_RU.js | 3 +++ ui/l10n/zh_CN.js | 3 +++ ui/scripts/vpc.js | 7 +++---- 17 files changed, 53 insertions(+), 5 deletions(-) diff --git a/ui/l10n/ar.js b/ui/l10n/ar.js index 8bd2d031215f..9c10afcea007 100644 --- a/ui/l10n/ar.js +++ b/ui/l10n/ar.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "ICMP Code", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "ICMP Type", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "تغير خصائص العنصر", "confirm.enable.s3": "فضلا قم بتعبئة البيانات القادمة لتمكين التخزين S3 للذاكرة الثانوية.", "confirm.enable.swift": "Please fill in the following information to enable support for Swift", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Add Role", "label.add.route": "إضافة مسار", "label.add.rule": "إضافة قاعدة", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "Add Secondary Storage", "label.add.security.group": "Add Security Group", "label.add.service.offering": "Add Service Offering", diff --git a/ui/l10n/ca.js b/ui/l10n/ca.js index 3ee21729151b..fe85a1938be0 100644 --- a/ui/l10n/ca.js +++ b/ui/l10n/ca.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "ICMP Code", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "ICMP Type", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "Changed item properties", "confirm.enable.s3": "Please fill in the following information to enable support for S3-backed Secondary Storage", "confirm.enable.swift": "Si us plau ompliu la següent informació per habilitar el suport per a Swift", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Add Role", "label.add.route": "Add route", "label.add.rule": "Afegir regla", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "Add Secondary Storage", "label.add.security.group": "Add Security Group", "label.add.service.offering": "Add Service Offering", diff --git a/ui/l10n/de_DE.js b/ui/l10n/de_DE.js index 7ae796fe499d..62e00560a695 100644 --- a/ui/l10n/de_DE.js +++ b/ui/l10n/de_DE.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "ICMP-Code", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "ICMP-Typ", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "Geänderte Eintragseigenschaften", "confirm.enable.s3": "Bitte fügen Sie die folgenden Informationen hinzu, um die Unterstützung für \"S3-backed Secondary Storage\" hinzuzufügen", "confirm.enable.swift": "Bitte fügen Sie die folgenden Informationen hinzu, um die Unterstützung für Swift zu ermöglichen.", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Rolle hinzufügen", "label.add.route": "Route hinzufügen", "label.add.rule": "Regel hinzufügen", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "Sekundärspeicher hinzufügen", "label.add.security.group": "Sicherheitsgruppe hinzufügen", "label.add.service.offering": "Dienstangebot hinzufügen", diff --git a/ui/l10n/en.js b/ui/l10n/en.js index 02b8c79acbf5..ef7c91e290a7 100644 --- a/ui/l10n/en.js +++ b/ui/l10n/en.js @@ -14,8 +14,11 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -var dictionary = {"ICMP.code":"ICMP Code", +var dictionary = { +"ICMP.code":"ICMP Code", +"ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type":"ICMP Type", +"ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties":"Changed item properties", "confirm.enable.s3":"Please fill in the following information to enable support for S3-backed Secondary Storage", "confirm.enable.swift":"Please fill in the following information to enable support for Swift", @@ -370,6 +373,7 @@ var dictionary = {"ICMP.code":"ICMP Code", "label.add.role":"Add Role", "label.add.route":"Add route", "label.add.rule":"Add rule", +"label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage":"Add Secondary Storage", "label.add.security.group":"Add Security Group", "label.add.service.offering":"Add Service Offering", diff --git a/ui/l10n/es.js b/ui/l10n/es.js index d125ad2af484..5a0982bee27e 100644 --- a/ui/l10n/es.js +++ b/ui/l10n/es.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "Código ICMP", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "Tipo ICMP", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "Cambiadas las propiedades del elemento", "confirm.enable.s3": "Por favor, complete la siguiente información para habilitar el soporte del Almacenamiento Secundario sobre S3", "confirm.enable.swift": "Por favor, complete la siguiente información para habilitar el soporte para Swift", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Agregar Rol", "label.add.route": "Agregar ruta", "label.add.rule": "Agregar regla", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "Añadir almacenamiento secundario", "label.add.security.group": "Agregar grupo de seguridad", "label.add.service.offering": "Añadir Oferta de Servicio", diff --git a/ui/l10n/fr_FR.js b/ui/l10n/fr_FR.js index 99ec18bd7955..0f81e9ccbee5 100644 --- a/ui/l10n/fr_FR.js +++ b/ui/l10n/fr_FR.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "Code ICMP", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "Type ICMP", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "Propriétés de l'élément modifiées", "confirm.enable.s3": "Remplir les informations suivantes pour activer le support de stockage secondaire S3", "confirm.enable.swift": "Remplir les informations suivantes pour activer Swift", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Ajouter Rôle", "label.add.route": "Ajouter route", "label.add.rule": "Ajouter règle", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "Ajouter un stockage secondaire", "label.add.security.group": "Ajouter un groupe de sécurité", "label.add.service.offering": "Ajouter Offre Service", diff --git a/ui/l10n/hu.js b/ui/l10n/hu.js index e84800da55cc..105b3ce845b7 100644 --- a/ui/l10n/hu.js +++ b/ui/l10n/hu.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "ICMP kód", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "ICMP típus", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "Az elem tulajdonságai megváltoztak", "confirm.enable.s3": "Töltsd ki a következő információkat az S3 másodlagos tár bekapcsolásához!", "confirm.enable.swift": "Töltsd ki a következő információkat a Swift támogatás bekapcsolásához!", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Add Role", "label.add.route": "Útvonal felvétele", "label.add.rule": "Szabály felvétele", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "Másodlagos tár felvétele", "label.add.security.group": "Biztonsági csoport felvétele", "label.add.service.offering": "Szolgáltatás ajánlat felvétele", diff --git a/ui/l10n/it_IT.js b/ui/l10n/it_IT.js index 3dd7f35a5f5d..0e7e17a4db9b 100644 --- a/ui/l10n/it_IT.js +++ b/ui/l10n/it_IT.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "Codice ICMP", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "Tipo ICMP", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "Elementi delle proprietà modificati", "confirm.enable.s3": "Si prega di inserire i valori richiesti per abilitare il supporto per il Secondary Storage di tipo S3", "confirm.enable.swift": "Si prega di inserire i valori richiesti per abilitare il supporto per Swift", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Add Role", "label.add.route": "Aggiungere una rotta", "label.add.rule": "Aggiungere regola", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "Aggiungere uno Storage Secondario", "label.add.security.group": "Aggiungere un Gruppo di Sicurezza", "label.add.service.offering": "Aggiungere un'Offerta di Servizio", diff --git a/ui/l10n/ja_JP.js b/ui/l10n/ja_JP.js index ce8967298b66..c0e8abdcc0a9 100644 --- a/ui/l10n/ja_JP.js +++ b/ui/l10n/ja_JP.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "ICMP コード", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "ICMP の種類", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "項目のプロパティの変更", "confirm.enable.s3": "S3 ベースのセカンダリ ストレージのサポートを有効にするには、次の情報を入力してください。", "confirm.enable.swift": "Swift のサポートを有効にするには、次の情報を入力してください。", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Add Role", "label.add.route": "ルートの追加", "label.add.rule": "規則の追加", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "セカンダリ ストレージの追加", "label.add.security.group": "セキュリティ グループの追加", "label.add.service.offering": "サービス オファリングの追加", diff --git a/ui/l10n/ko_KR.js b/ui/l10n/ko_KR.js index e60e0a95b7fb..d8ffb72ef24f 100644 --- a/ui/l10n/ko_KR.js +++ b/ui/l10n/ko_KR.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "ICMP 코드", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "ICMP 종류", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "항목 속성 변경", "confirm.enable.s3": "S3 기반 2차 저장소 지원을 하려면 아래 정보를 입력해 주십시오.", "confirm.enable.swift": "Swift 기술 지원를 사용 하려면 다음 정보를 입력해 주십시오.", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Add Role", "label.add.route": "라우트 추가", "label.add.rule": "규칙 추가", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "2차 스토리지 추가", "label.add.security.group": "보안 그룹 추가", "label.add.service.offering": "서비스제공 추가", diff --git a/ui/l10n/nb_NO.js b/ui/l10n/nb_NO.js index 08a077c8e998..0725037de7e0 100644 --- a/ui/l10n/nb_NO.js +++ b/ui/l10n/nb_NO.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "ICMP-kode", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "ICMP-type", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "Endrede egenskaper", "confirm.enable.s3": "Vennligst fyll inn følgende informasjon for å aktivere støtte for S3-støttet sekundærlagring", "confirm.enable.swift": "Vennligst fyll inn følgende informasjon for å aktivere støtte for Swift", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Add Role", "label.add.route": "Legg til rute", "label.add.rule": "Legg til regel", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "Legg til sekundærlagring", "label.add.security.group": "Legg til sikkerhetsgruppe", "label.add.service.offering": "Legg til tjenestetilbud", diff --git a/ui/l10n/nl_NL.js b/ui/l10n/nl_NL.js index 0481297711d2..9bba48c3bf06 100644 --- a/ui/l10n/nl_NL.js +++ b/ui/l10n/nl_NL.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "ICMP Code", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "ICMP Type", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "Item eigenschappen gewijzigd", "confirm.enable.s3": "Vul de volgende informatie in om ondersteuning voor S3-aangestuurde Secundaire Opslag te activeren", "confirm.enable.swift": "Vul de volgende informatie in om ondersteuning voor Swift te activeren", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Add Role", "label.add.route": "Route toevoegen", "label.add.rule": "Regel toevoegen", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "Secundaire Opslag toevoegen", "label.add.security.group": "Security Group toevoegen", "label.add.service.offering": "Service Aanbieding toevoegen", diff --git a/ui/l10n/pl.js b/ui/l10n/pl.js index 55b1b72b33d2..b829dc3a9b56 100644 --- a/ui/l10n/pl.js +++ b/ui/l10n/pl.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "ICMP Code", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "ICMP Type", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "Changed item properties", "confirm.enable.s3": "Please fill in the following information to enable support for S3-backed Secondary Storage", "confirm.enable.swift": "Please fill in the following information to enable support for Swift", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Add Role", "label.add.route": "Add route", "label.add.rule": "Dodaj regułę", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "Add Secondary Storage", "label.add.security.group": "Add Security Group", "label.add.service.offering": "Add Service Offering", diff --git a/ui/l10n/pt_BR.js b/ui/l10n/pt_BR.js index 42051e20755d..590dd794b767 100644 --- a/ui/l10n/pt_BR.js +++ b/ui/l10n/pt_BR.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "Código ICMP", + "ICMP.code.desc": "Informe -1, se vocês quiser permitir todos os códigos ICMP.", "ICMP.type": "Tipo ICMP", + "ICMP.type.desc": "Informe -1, se vocês quiser permitir todos os tipos ICMP.", "changed.item.properties": "Propriedades do item alteradas", "confirm.enable.s3": "Por favor, preencha as informações abaixo para habilitar suporte o Storage Secundário fornecido por S3", "confirm.enable.swift": "Por favor, preencha as informações abaixo para habilitar suporte ao Swift", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Add Role", "label.add.route": "Adicionar rota", "label.add.rule": "Adicionar regra", + "label.add.rule.desc": "Criar nova regra ACL", "label.add.secondary.storage": "Adicionar Storage Secundário", "label.add.security.group": "Adicionar Security Group", "label.add.service.offering": "Adicionar Plano", diff --git a/ui/l10n/ru_RU.js b/ui/l10n/ru_RU.js index 8ced34c3e060..d676df59d4ae 100644 --- a/ui/l10n/ru_RU.js +++ b/ui/l10n/ru_RU.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "Код ICMP", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "Тип ICMP", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "Параметры элемента изменены", "confirm.enable.s3": "Заполните информацию для включения S3-совместимого дополнительного хранилища", "confirm.enable.swift": "Заполните нижеследующую информацию для включения поддержи Swift", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Add Role", "label.add.route": "Добавить маршрут", "label.add.rule": "Добавить правило", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "Добавить дополнительное хранилище", "label.add.security.group": "Добавить группу безопасности", "label.add.service.offering": "Добавить службу", diff --git a/ui/l10n/zh_CN.js b/ui/l10n/zh_CN.js index b755356115e6..4d0762d9d961 100644 --- a/ui/l10n/zh_CN.js +++ b/ui/l10n/zh_CN.js @@ -16,7 +16,9 @@ // under the License. var dictionary = { "ICMP.code": "ICMP 代码", + "ICMP.code.desc": "Please specify -1 if you want to allow all ICMP codes", "ICMP.type": "ICMP 类型", + "ICMP.type.desc": "Please specify -1 if you want to allow all ICMP types.", "changed.item.properties": "更改项目属性", "confirm.enable.s3": "请填写以下信息以启用对 S3 支持的二级存储的支持", "confirm.enable.swift": "请填写以下信息以启用对 SWIFT 的支持", @@ -367,6 +369,7 @@ var dictionary = { "label.add.role": "Add Role", "label.add.route": "添加路由", "label.add.rule": "添加规则", + "label.add.rule.desc": "Create a new ACL rule", "label.add.secondary.storage": "添加二级存储", "label.add.security.group": "添加安全组", "label.add.service.offering": "添加服务方案", diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 40c954f5d00a..9dc8323e7cdf 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -404,14 +404,14 @@ 'icmptype': { edit: true, label: 'ICMP.type', - desc: 'Please specify -1 if you want to allow all ICMP types', + desc: 'ICMP.type.desc', defaultValue: '-1', isEditable: true }, 'icmpcode': { edit: true, label: 'ICMP.code', - desc: 'Please specify -1 if you want to allow all ICMP codes', + desc: 'ICMP.code.desc', defaultValue: '-1', isEditable: true }, @@ -1348,7 +1348,7 @@ cloudStack.dialog.createForm({ form: { title: 'label.add.rule', - desc: 'Create a new ACL rule', + desc: 'label.add.rule.desc', fields: aclRuleFields }, after: function(argsLocal) { @@ -4406,7 +4406,6 @@ }); }) }); - if (error) { cloudStack.dialog.notice({ message: 'Error loading dashboard data.' From bb607d07a97476dc4fb934b3d75df6affba47086 Mon Sep 17 00:00:00 2001 From: mrunalinikankariya Date: Tue, 27 Feb 2018 18:03:00 +0530 Subject: [PATCH 017/145] CLOUDSTACK-10054:Volume download times out in 3600 seconds (#2244) --- .../cloud/storage/template/IsoProcessor.java | 5 ++ .../cloud/storage/template/OVAProcessor.java | 9 ++- .../com/cloud/storage/template/Processor.java | 2 + .../storage/template/QCOW2Processor.java | 7 ++- .../storage/template/RawImageProcessor.java | 7 ++- .../cloud/storage/template/TARProcessor.java | 5 ++ .../cloud/storage/template/VhdProcessor.java | 5 ++ .../cloud/storage/template/VmdkProcessor.java | 5 ++ .../TemplateOrVolumePostUploadCommand.java | 10 ++++ .../com/cloud/hypervisor/guru/VMwareGuru.java | 8 ++- .../vmware/manager/VmwareManager.java | 3 + .../vmware/manager/VmwareManagerImpl.java | 5 +- .../vmware/manager/VmwareStorageManager.java | 4 +- .../manager/VmwareStorageManagerImpl.java | 34 +++++++----- ...VmwareSecondaryStorageResourceHandler.java | 7 ++- .../VmwareStorageSubsystemCommandHandler.java | 12 ++-- .../cloud/storage/VolumeApiServiceImpl.java | 1 + .../resource/HttpUploadServerHandler.java | 6 +- .../resource/NfsSecondaryStorageResource.java | 7 ++- .../storage/template/DownloadManagerImpl.java | 6 +- .../storage/template/UploadEntity.java | 9 +++ .../java/com/cloud/utils/script/Script.java | 55 ++++++++++--------- 22 files changed, 148 insertions(+), 64 deletions(-) diff --git a/core/src/main/java/com/cloud/storage/template/IsoProcessor.java b/core/src/main/java/com/cloud/storage/template/IsoProcessor.java index 271818ccd918..4cd2f1a2a020 100644 --- a/core/src/main/java/com/cloud/storage/template/IsoProcessor.java +++ b/core/src/main/java/com/cloud/storage/template/IsoProcessor.java @@ -37,6 +37,11 @@ public class IsoProcessor extends AdapterBase implements Processor { @Override public FormatInfo process(String templatePath, ImageFormat format, String templateName) { + return process(templatePath, format, templateName, 0); + } + + @Override + public FormatInfo process(String templatePath, ImageFormat format, String templateName, long processTimeout) { if (format != null) { s_logger.debug("We don't handle conversion from " + format + " to ISO."); return null; diff --git a/core/src/main/java/com/cloud/storage/template/OVAProcessor.java b/core/src/main/java/com/cloud/storage/template/OVAProcessor.java index 08087bfb9c8f..f29efb46b52b 100644 --- a/core/src/main/java/com/cloud/storage/template/OVAProcessor.java +++ b/core/src/main/java/com/cloud/storage/template/OVAProcessor.java @@ -42,11 +42,15 @@ public class OVAProcessor extends AdapterBase implements Processor { private static final Logger s_logger = Logger.getLogger(OVAProcessor.class); - StorageLayer _storage; @Override public FormatInfo process(String templatePath, ImageFormat format, String templateName) throws InternalErrorException { + return process(templatePath, format, templateName, 0); + } + + @Override + public FormatInfo process(String templatePath, ImageFormat format, String templateName, long processTimeout) throws InternalErrorException { if (format != null) { if (s_logger.isInfoEnabled()) { s_logger.info("We currently don't handle conversion from " + format + " to OVA."); @@ -66,8 +70,7 @@ public FormatInfo process(String templatePath, ImageFormat format, String templa s_logger.info("Template processing - untar OVA package. templatePath: " + templatePath + ", templateName: " + templateName); String templateFileFullPath = templatePath + File.separator + templateName + "." + ImageFormat.OVA.getFileExtension(); File templateFile = new File(templateFileFullPath); - - Script command = new Script("tar", 0, s_logger); + Script command = new Script("tar", processTimeout, s_logger); command.add("--no-same-owner"); command.add("--no-same-permissions"); command.add("-xf", templateFileFullPath); diff --git a/core/src/main/java/com/cloud/storage/template/Processor.java b/core/src/main/java/com/cloud/storage/template/Processor.java index ba57563e1b65..c8ee18109a14 100644 --- a/core/src/main/java/com/cloud/storage/template/Processor.java +++ b/core/src/main/java/com/cloud/storage/template/Processor.java @@ -44,6 +44,8 @@ public interface Processor extends Adapter { */ FormatInfo process(String templatePath, ImageFormat format, String templateName) throws InternalErrorException; + FormatInfo process(String templatePath, ImageFormat format, String templateName, long processTimeout) throws InternalErrorException; + public static class FormatInfo { public ImageFormat format; public long size; diff --git a/core/src/main/java/com/cloud/storage/template/QCOW2Processor.java b/core/src/main/java/com/cloud/storage/template/QCOW2Processor.java index 642d8d3cb7b3..56ae078dc519 100644 --- a/core/src/main/java/com/cloud/storage/template/QCOW2Processor.java +++ b/core/src/main/java/com/cloud/storage/template/QCOW2Processor.java @@ -40,8 +40,13 @@ public class QCOW2Processor extends AdapterBase implements Processor { private StorageLayer _storage; + @Override + public FormatInfo process(String templatePath, ImageFormat format, String templateName) throws InternalErrorException { + return process(templatePath, format, templateName, 0); + } + @Override - public FormatInfo process(String templatePath, ImageFormat format, String templateName) throws InternalErrorException { + public FormatInfo process(String templatePath, ImageFormat format, String templateName, long processTimeout) throws InternalErrorException { if (format != null) { s_logger.debug("We currently don't handle conversion from " + format + " to QCOW2."); return null; diff --git a/core/src/main/java/com/cloud/storage/template/RawImageProcessor.java b/core/src/main/java/com/cloud/storage/template/RawImageProcessor.java index 5645a3199a73..5fbc626f271e 100644 --- a/core/src/main/java/com/cloud/storage/template/RawImageProcessor.java +++ b/core/src/main/java/com/cloud/storage/template/RawImageProcessor.java @@ -45,8 +45,13 @@ public boolean configure(String name, Map params) throws Configu return true; } + @Override + public FormatInfo process(String templatePath, ImageFormat format, String templateName) throws InternalErrorException { + return process(templatePath, format, templateName, 0); + } + @Override - public FormatInfo process(String templatePath, ImageFormat format, String templateName) throws InternalErrorException { + public FormatInfo process(String templatePath, ImageFormat format, String templateName, long processTimeout) throws InternalErrorException { if (format != null) { s_logger.debug("We currently don't handle conversion from " + format + " to raw image."); return null; diff --git a/core/src/main/java/com/cloud/storage/template/TARProcessor.java b/core/src/main/java/com/cloud/storage/template/TARProcessor.java index dfd9a0adf25c..51aeb234c50d 100644 --- a/core/src/main/java/com/cloud/storage/template/TARProcessor.java +++ b/core/src/main/java/com/cloud/storage/template/TARProcessor.java @@ -35,6 +35,11 @@ public class TARProcessor extends AdapterBase implements Processor { @Override public FormatInfo process(String templatePath, ImageFormat format, String templateName) { + return process(templatePath, format, templateName, 0); + } + + @Override + public FormatInfo process(String templatePath, ImageFormat format, String templateName, long processTimeout) { if (format != null) { s_logger.debug("We currently don't handle conversion from " + format + " to TAR."); return null; diff --git a/core/src/main/java/com/cloud/storage/template/VhdProcessor.java b/core/src/main/java/com/cloud/storage/template/VhdProcessor.java index cb13d06687b8..baea7bf0db51 100644 --- a/core/src/main/java/com/cloud/storage/template/VhdProcessor.java +++ b/core/src/main/java/com/cloud/storage/template/VhdProcessor.java @@ -58,6 +58,11 @@ public class VhdProcessor extends AdapterBase implements Processor { @Override public FormatInfo process(String templatePath, ImageFormat format, String templateName) throws InternalErrorException { + return process(templatePath, format, templateName, 0); + } + + @Override + public FormatInfo process(String templatePath, ImageFormat format, String templateName, long processTimeout) throws InternalErrorException { if (format != null) { s_logger.debug("We currently don't handle conversion from " + format + " to VHD."); return null; diff --git a/core/src/main/java/com/cloud/storage/template/VmdkProcessor.java b/core/src/main/java/com/cloud/storage/template/VmdkProcessor.java index eacabb939682..ee50b2718b7d 100644 --- a/core/src/main/java/com/cloud/storage/template/VmdkProcessor.java +++ b/core/src/main/java/com/cloud/storage/template/VmdkProcessor.java @@ -44,6 +44,11 @@ public class VmdkProcessor extends AdapterBase implements Processor { @Override public FormatInfo process(String templatePath, ImageFormat format, String templateName) throws InternalErrorException { + return process(templatePath, format, templateName, 0); + } + + @Override + public FormatInfo process(String templatePath, ImageFormat format, String templateName, long processTimeout) throws InternalErrorException { if (format != null) { if (s_logger.isInfoEnabled()) { s_logger.info("We currently don't handle conversion from " + format + " to VMDK."); diff --git a/core/src/main/java/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java index 29fdd1911642..965d30320a8e 100644 --- a/core/src/main/java/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java +++ b/core/src/main/java/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java @@ -51,6 +51,8 @@ public class TemplateOrVolumePostUploadCommand { private String defaultMaxAccountSecondaryStorage; + private long processTimeout; + private long accountId; private Integer nfsVersion; @@ -206,4 +208,12 @@ public Integer getNfsVersion() { public void setNfsVersion(Integer nfsVersion) { this.nfsVersion = nfsVersion; } + + public void setProcessTimeout(long processTimeout) { + this.processTimeout = processTimeout; + } + + public long getProcessTimeout() { + return processTimeout; + } } diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java index d8076fd5d68d..81dfc33bb883 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java @@ -32,6 +32,7 @@ import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.Configurable; import org.apache.cloudstack.storage.command.CopyCommand; +import org.apache.cloudstack.storage.command.DownloadCommand; import org.apache.cloudstack.storage.command.DeleteCommand; import org.apache.cloudstack.storage.command.StorageSubSystemCommand; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; @@ -434,13 +435,14 @@ public int compare(NicTO arg0, NicTO arg1) { @DB public Pair getCommandHostDelegation(long hostId, Command cmd) { boolean needDelegation = false; - if (cmd instanceof StorageSubSystemCommand) { Boolean fullCloneEnabled = VmwareFullClone.value(); StorageSubSystemCommand c = (StorageSubSystemCommand)cmd; c.setExecuteInSequence(fullCloneEnabled); } - + if (cmd instanceof DownloadCommand) { + cmd.setContextParam(VmwareManager.s_vmwareOVAPackageTimeout.key(), String.valueOf(VmwareManager.s_vmwareOVAPackageTimeout.value())); + } //NOTE: the hostid can be a hypervisor host, or a ssvm agent. For copycommand, if it's for volume upload, the hypervisor //type is empty, so we need to check the format of volume at first. if (cmd instanceof CopyCommand) { @@ -514,11 +516,11 @@ public Pair getCommandHostDelegation(long hostId, Command cmd) { cmd.setContextParam("execid", String.valueOf(execLog.getId())); cmd.setContextParam("noderuninfo", String.format("%d-%d", _clusterMgr.getManagementNodeId(), _clusterMgr.getCurrentRunId())); cmd.setContextParam("vCenterSessionTimeout", String.valueOf(_vmwareMgr.getVcenterSessionTimeout())); + cmd.setContextParam(VmwareManager.s_vmwareOVAPackageTimeout.key(), String.valueOf(VmwareManager.s_vmwareOVAPackageTimeout.value())); if (cmd instanceof BackupSnapshotCommand || cmd instanceof CreatePrivateTemplateFromVolumeCommand || cmd instanceof CreatePrivateTemplateFromSnapshotCommand || cmd instanceof CopyVolumeCommand || cmd instanceof CopyCommand || cmd instanceof CreateVolumeOVACommand || cmd instanceof PrepareOVAPackingCommand || cmd instanceof CreateVolumeFromSnapshotCommand) { - String workerName = _vmwareMgr.composeWorkerName(); long checkPointId = 1; // FIXME: Fix long checkPointId = _checkPointMgr.pushCheckPoint(new VmwareCleanupMaid(hostDetails.get("guid"), workerName)); diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManager.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManager.java index 4a4d2ea7a532..efdbc724fbde 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManager.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManager.java @@ -42,6 +42,9 @@ public interface VmwareManager { static final ConfigKey s_vmwareSearchExcludeFolder = new ConfigKey("Advanced", String.class, "vmware.search.exclude.folders", null, "Comma seperated list of Datastore Folders to exclude from VMWare search", true, ConfigKey.Scope.Global); + static final ConfigKey s_vmwareOVAPackageTimeout = new ConfigKey(Integer.class, "vmware.package.ova.timeout", "Advanced", "3600", + "Vmware script timeout for ova packaging process", true, ConfigKey.Scope.Global, 1000); + String composeWorkerName(); String getSystemVMIsoFileNameOnDatastore(); diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index b7149ab2bf9e..3cf0c0000d99 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -136,6 +136,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw private static final Logger s_logger = Logger.getLogger(VmwareManagerImpl.class); private static final long SECONDS_PER_MINUTE = 60; + private int _timeout; private String _instance; @@ -204,7 +205,6 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw private int _additionalPortRangeSize; private int _routerExtraPublicNics = 2; private int _vCenterSessionTimeout = 1200000; // Timeout in milliseconds - private String _rootDiskController = DiskControllerType.ide.toString(); private final String _dataDiskController = DiskControllerType.osdefault.toString(); @@ -229,9 +229,8 @@ public String getConfigComponentName() { @Override public ConfigKey[] getConfigKeys() { - return new ConfigKey[] {s_vmwareNicHotplugWaitTimeout, s_vmwareCleanOldWorderVMs, templateCleanupInterval, s_vmwareSearchExcludeFolder}; + return new ConfigKey[] {s_vmwareNicHotplugWaitTimeout, s_vmwareCleanOldWorderVMs, templateCleanupInterval, s_vmwareSearchExcludeFolder, s_vmwareOVAPackageTimeout}; } - @Override public boolean configure(String name, Map params) throws ConfigurationException { s_logger.info("Configure VmwareManagerImpl, manager name: " + name); diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java index f78f370da318..e7cd91946db3 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java @@ -51,7 +51,7 @@ public interface VmwareStorageManager { boolean execute(VmwareHostService hostService, CreateEntityDownloadURLCommand cmd); - public void createOva(String path, String name); + public void createOva(String path, String name, int archiveTimeout); - public String createOvaForTemplate(TemplateObjectTO template); + public String createOvaForTemplate(TemplateObjectTO template, int archiveTimeout); } diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java index a22410f4afeb..b6f207acf103 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java @@ -98,28 +98,32 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { @Override public boolean execute(VmwareHostService hostService, CreateEntityDownloadURLCommand cmd) { DataTO data = cmd.getData(); + int timeout = NumbersUtil.parseInt(cmd.getContextParam(VmwareManager.s_vmwareOVAPackageTimeout.key()), + Integer.valueOf(VmwareManager.s_vmwareOVAPackageTimeout.defaultValue()) * VmwareManager.s_vmwareOVAPackageTimeout.multiplier()); if (data == null) { return false; } String newPath = null; if (data.getObjectType() == DataObjectType.VOLUME) { - newPath = createOvaForVolume((VolumeObjectTO)data); + newPath = createOvaForVolume((VolumeObjectTO)data, timeout); } else if (data.getObjectType() == DataObjectType.TEMPLATE) { - newPath = createOvaForTemplate((TemplateObjectTO)data); + newPath = createOvaForTemplate((TemplateObjectTO)data, timeout); } if (newPath != null) { cmd.setInstallPath(newPath); + return true; } - return true; + return false; + } @Override - public void createOva(String path, String name) { + public void createOva(String path, String name, int archiveTimeout) { Script commandSync = new Script(true, "sync", 0, s_logger); commandSync.execute(); - Script command = new Script(false, "tar", 0, s_logger); + Script command = new Script(false, "tar", archiveTimeout, s_logger); command.setWorkDir(path); command.add("-cf", name + ".ova"); command.add(name + ".ovf"); // OVF file should be the first file in OVA archive @@ -155,7 +159,7 @@ public void configure(Map params) { } @Override - public String createOvaForTemplate(TemplateObjectTO template) { + public String createOvaForTemplate(TemplateObjectTO template, int archiveTimeout) { DataStoreTO storeTO = template.getDataStore(); if (!(storeTO instanceof NfsTO)) { s_logger.debug("Can only handle NFS storage, while creating OVA from template"); @@ -173,7 +177,7 @@ public String createOvaForTemplate(TemplateObjectTO template) { s_logger.debug("OVA file found at: " + installFullPath); } else { if (new File(installFullPath + ".meta").exists()) { - createOVAFromMetafile(installFullPath + ".meta"); + createOVAFromMetafile(installFullPath + ".meta", archiveTimeout); } else { String msg = "Unable to find OVA or OVA MetaFile to prepare template."; s_logger.error(msg); @@ -190,7 +194,7 @@ public String createOvaForTemplate(TemplateObjectTO template) { //Fang: new command added; // Important! we need to sync file system before we can safely use tar to work around a linux kernal bug(or feature) - public String createOvaForVolume(VolumeObjectTO volume) { + public String createOvaForVolume(VolumeObjectTO volume, int archiveTimeout) { DataStoreTO storeTO = volume.getDataStore(); if (!(storeTO instanceof NfsTO)) { s_logger.debug("can only handle nfs storage, when create ova from volume"); @@ -215,15 +219,17 @@ public String createOvaForVolume(VolumeObjectTO volume) { } else { Script commandSync = new Script(true, "sync", 0, s_logger); commandSync.execute(); - - Script command = new Script(false, "tar", 0, s_logger); + Script command = new Script(false, "tar", archiveTimeout, s_logger); command.setWorkDir(installFullPath); command.add("-cf", volumeUuid + ".ova"); command.add(volumeUuid + ".ovf"); // OVF file should be the first file in OVA archive command.add(volumeUuid + "-disk0.vmdk"); - command.execute(); - return volumePath; + String result = command.execute(); + if (result != Script.ERR_TIMEOUT) { + return volumePath; + } + } } catch (Throwable e) { s_logger.info("Exception for createVolumeOVA"); @@ -1046,7 +1052,7 @@ private Pair copyVolumeFromSecStorage(VmwareHypervisorHost hyper // here we use a method to return the ovf and vmdk file names; Another way to do it: // create a new class, and like TemplateLocation.java and create templateOvfInfo.java to handle it; - private String createOVAFromMetafile(String metafileName) throws Exception { + private String createOVAFromMetafile(String metafileName, int archiveTimeout) throws Exception { File ova_metafile = new File(metafileName); Properties props = null; String ovaFileName = ""; @@ -1080,7 +1086,7 @@ private String createOVAFromMetafile(String metafileName) throws Exception { s_logger.info("ova: " + ovaFileName + ", ovf:" + ovfFileName + ", vmdk:" + disks[0] + "."); Script commandSync = new Script(true, "sync", 0, s_logger); commandSync.execute(); - Script command = new Script(false, "tar", 0, s_logger); + Script command = new Script(false, "tar", archiveTimeout, s_logger); command.setWorkDir(exportDir); // Fang: pass this in to the method? command.add("-cf", ovaFileName); command.add(ovfFileName); // OVF file should be the first file in OVA archive diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java index d0d5964bfa92..ff00f55c8bcb 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java @@ -145,8 +145,11 @@ public Answer executeRequest(Command cmd) { } protected Answer execute(CreateEntityDownloadURLCommand cmd) { - _storageMgr.execute(this, cmd); - return _resource.defaultAction(cmd); + boolean success = _storageMgr.execute(this, cmd); + if (success) { + return _resource.defaultAction(cmd); + } + return new Answer(cmd, false, "Failed to download"); } private Answer execute(PrimaryStorageDownloadCommand cmd) { diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java index fc199722b2bb..02ae2fe50334 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java @@ -21,6 +21,8 @@ import java.io.File; import java.util.EnumMap; +import com.cloud.hypervisor.vmware.manager.VmwareManager; +import com.cloud.utils.NumbersUtil; import org.apache.log4j.Logger; import org.apache.cloudstack.storage.command.CopyCmdAnswer; import org.apache.cloudstack.storage.command.CopyCommand; @@ -95,6 +97,8 @@ protected Answer execute(CopyCommand cmd) { DataTO destData = cmd.getDestTO(); DataStoreTO srcDataStore = srcData.getDataStore(); DataStoreTO destDataStore = destData.getDataStore(); + int timeout = NumbersUtil.parseInt(cmd.getContextParam(VmwareManager.s_vmwareOVAPackageTimeout.key()), + Integer.valueOf(VmwareManager.s_vmwareOVAPackageTimeout.defaultValue()) * VmwareManager.s_vmwareOVAPackageTimeout.multiplier()); //if copied between s3 and nfs cache, go to resource boolean needDelegation = false; if (destDataStore instanceof NfsTO && destDataStore.getRole() == DataStoreRole.ImageCache) { @@ -112,11 +116,11 @@ protected Answer execute(CopyCommand cmd) { String path = vol.getPath(); int index = path.lastIndexOf(File.separator); String name = path.substring(index + 1); - storageManager.createOva(parentPath + File.separator + path, name); + storageManager.createOva(parentPath + File.separator + path, name, timeout); vol.setPath(path + File.separator + name + ".ova"); } else if (srcData.getObjectType() == DataObjectType.TEMPLATE) { // sync template from NFS cache to S3 in NFS migration to S3 case - storageManager.createOvaForTemplate((TemplateObjectTO)srcData); + storageManager.createOvaForTemplate((TemplateObjectTO)srcData, timeout); } else if (srcData.getObjectType() == DataObjectType.SNAPSHOT) { // pack ova first // sync snapshot from NFS cache to S3 in NFS migration to S3 case @@ -126,7 +130,7 @@ protected Answer execute(CopyCommand cmd) { int index = path.lastIndexOf(File.separator); String name = path.substring(index + 1); String snapDir = path.substring(0, index); - storageManager.createOva(parentPath + File.separator + snapDir, name); + storageManager.createOva(parentPath + File.separator + snapDir, name, timeout); if (destData.getObjectType() == DataObjectType.TEMPLATE) { //create template from snapshot on src at first, then copy it to s3 TemplateObjectTO cacheTemplate = (TemplateObjectTO)destData; @@ -169,7 +173,7 @@ protected Answer execute(CopyCommand cmd) { int index = path.lastIndexOf(File.separator); String name = path.substring(index + 1); String dir = path.substring(0, index); - storageManager.createOva(parentPath + File.separator + dir, name); + storageManager.createOva(parentPath + File.separator + dir, name, timeout); newSnapshot.setPath(newSnapshot.getPath() + ".ova"); newSnapshot.setDataStore(cmd.getCacheTO().getDataStore()); CopyCommand newCmd = new CopyCommand(newSnapshot, destData, cmd.getWait(), cmd.executeInSequence()); diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java index bea9b4ad5bfb..69dfd1d86f35 100644 --- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java @@ -367,6 +367,7 @@ public GetUploadParamsResponse doInTransaction(TransactionStatus status) throws dataObject.getDataStore().getRole().toString()); command.setLocalPath(volumeStore.getLocalDownloadPath()); //using the existing max upload size configuration + command.setProcessTimeout(NumbersUtil.parseLong(_configDao.getValue("vmware.package.ova.timeout"), 3600)); command.setMaxUploadSize(_configDao.getValue(Config.MaxUploadVolumeSize.key())); command.setDefaultMaxAccountSecondaryStorage(_configDao.getValue(Config.DefaultMaxAccountSecondaryStorage.key())); command.setAccountId(vol.getAccountId()); diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java index 7a22b20ffdb4..ea4e75d89430 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java @@ -87,6 +87,8 @@ public class HttpUploadServerHandler extends SimpleChannelInboundHandler> uriAttributes = decoderQuery.parameters(); uuid = uriAttributes.get("uuid").get(0); logger.info("URI: uuid=" + uuid); - UploadEntity uploadEntity = null; try { // Validate the request here @@ -175,6 +176,7 @@ public void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Excep } //set the base directory to download the file DiskFileUpload.baseDirectory = uploadEntity.getInstallPathPrefix(); + this.processTimeout = uploadEntity.getProcessTimeout(); logger.info("base directory: " + DiskFileUpload.baseDirectory); try { //initialize the decoder @@ -243,7 +245,7 @@ private HttpResponseStatus readFileUploadData() throws IOException { storageResource.updateStateMapWithError(uuid, errorString); return HttpResponseStatus.BAD_REQUEST; } - String status = storageResource.postUpload(uuid, fileUpload.getFile().getName()); + String status = storageResource.postUpload(uuid, fileUpload.getFile().getName(), processTimeout); if (status != null) { responseContent.append(status); storageResource.updateStateMapWithError(uuid, status); diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java index 93d8c271df33..1f81f6aa841b 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java @@ -251,6 +251,7 @@ public void setTimeout(int timeout) { protected String createTemplateFromSnapshotXenScript; private HashMap uploadEntityStateMap = new HashMap(); private String _ssvmPSK = null; + private long processTimeout; public void setParentPath(String path) { _parent = path; @@ -3345,6 +3346,7 @@ public UploadEntity createUploadEntity(String uuid, String metadata, long conten throw new InvalidParameterValueException(errorMessage); } else { uuid = cmd.getEntityUUID(); + processTimeout = cmd.getProcessTimeout(); if (isOneTimePostUrlUsed(cmd)) { uploadEntity = uploadEntityStateMap.get(uuid); StringBuilder errorMessage = new StringBuilder("The one time post url is already used"); @@ -3366,6 +3368,7 @@ public UploadEntity createUploadEntity(String uuid, String metadata, long conten uploadEntity = new UploadEntity(uuid, cmd.getEntityId(), UploadEntity.Status.IN_PROGRESS, cmd.getName(), absolutePath); uploadEntity.setMetaDataPopulated(true); uploadEntity.setResourceType(UploadEntity.ResourceType.valueOf(cmd.getType())); + uploadEntity.setProcessTimeout(processTimeout); uploadEntity.setFormat(Storage.ImageFormat.valueOf(cmd.getImageFormat())); //relative path with out ssvm mount info. uploadEntity.setTemplatePath(absolutePath); @@ -3447,7 +3450,7 @@ private int getSizeInGB(long sizeInBytes) { return (int)Math.ceil(sizeInBytes * 1.0d / (1024 * 1024 * 1024)); } - public String postUpload(String uuid, String filename) { + public String postUpload(String uuid, String filename, long processTimeout) { UploadEntity uploadEntity = uploadEntityStateMap.get(uuid); int installTimeoutPerGig = 180 * 60 * 1000; @@ -3552,7 +3555,7 @@ public String postUpload(String uuid, String filename) { for (Processor processor : processors.values()) { FormatInfo info = null; try { - info = processor.process(resourcePath, null, templateName); + info = processor.process(resourcePath, null, templateName, processTimeout * 1000); } catch (InternalErrorException e) { s_logger.error("Template process exception ", e); return e.toString(); diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java index 5fa13a34cfc3..2ace37f675a5 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java @@ -90,7 +90,7 @@ public class DownloadManagerImpl extends ManagerBase implements DownloadManager private String _name; StorageLayer _storage; public Map _processors; - + private long _processTimeout; private Integer _nfsVersion; public class Completion implements DownloadCompleteCallback { @@ -459,7 +459,7 @@ private String postLocalDownload(String jobId) { FormatInfo info = null; try { - info = processor.process(resourcePath, null, templateName); + info = processor.process(resourcePath, null, templateName, this._processTimeout); } catch (InternalErrorException e) { s_logger.error("Template process exception ", e); return e.toString(); @@ -677,6 +677,8 @@ public com.cloud.storage.VMTemplateHostVO.Status getDownloadStatus2(String jobId @Override public DownloadAnswer handleDownloadCommand(SecondaryStorageResource resource, DownloadCommand cmd) { + int timeout = NumbersUtil.parseInt(cmd.getContextParam("vmware.package.ova.timeout"), 3600000); + this._processTimeout = timeout; ResourceType resourceType = cmd.getResourceType(); if (cmd instanceof DownloadProgressCommand) { return handleDownloadProgressCmd(resource, (DownloadProgressCommand)cmd); diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadEntity.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadEntity.java index d851143b200f..031a163997e5 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadEntity.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadEntity.java @@ -34,6 +34,7 @@ public class UploadEntity { private int maxSizeInGB; private String description; private long contentLength; + private long processTimeout; public static enum ResourceType { VOLUME, TEMPLATE @@ -60,6 +61,14 @@ public UploadEntity(String uuid, long entityId, Status status, String filename, this.entityId=entityId; } + public void setProcessTimeout(long processTimeout) { + this.processTimeout = processTimeout; + } + + public long getProcessTimeout() { + return processTimeout; + } + public UploadEntity(){ } diff --git a/utils/src/main/java/com/cloud/utils/script/Script.java b/utils/src/main/java/com/cloud/utils/script/Script.java index 01f18bda2d2e..7087395b050f 100644 --- a/utils/src/main/java/com/cloud/utils/script/Script.java +++ b/utils/src/main/java/com/cloud/utils/script/Script.java @@ -37,7 +37,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.cloudstack.utils.security.KeyStoreUtils; import org.apache.commons.io.IOUtils; import org.apache.log4j.Logger; import org.joda.time.Duration; @@ -203,7 +202,7 @@ public String execute(OutputInterpreter interpreter) { String[] command = _command.toArray(new String[_command.size()]); if (_logger.isDebugEnabled()) { - _logger.debug("Executing: " + buildCommandLine(command).split(KeyStoreUtils.defaultKeystoreFile)[0]); + _logger.debug("Executing: " + buildCommandLine(command)); } try { @@ -233,18 +232,23 @@ public String execute(OutputInterpreter interpreter) { } while (true) { + _logger.debug("Executing while with timeout : " + _timeout); try { - if (_process.waitFor() == 0) { - _logger.debug("Execution is successful."); - if (interpreter != null) { - return interpreter.drain() ? task.getResult() : interpreter.interpret(ir); - } else { - // null return exitValue apparently - return String.valueOf(_process.exitValue()); + //process execution completed within timeout period + if (_process.waitFor(_timeout, TimeUnit.MILLISECONDS)) { + //process completed successfully + if (_process.exitValue() == 0) { + _logger.debug("Execution is successful."); + if (interpreter != null) { + return interpreter.drain() ? task.getResult() : interpreter.interpret(ir); + } else { + // null return exitValue apparently + return String.valueOf(_process.exitValue()); + } + } else { //process failed + break; } - } else { - break; - } + } //timeout } catch (InterruptedException e) { if (!_isTimeOut) { /* @@ -254,24 +258,25 @@ public String execute(OutputInterpreter interpreter) { _logger.debug("We are interrupted but it's not a timeout, just continue"); continue; } - - TimedOutLogger log = new TimedOutLogger(_process); - Task timedoutTask = new Task(log, ir); - - timedoutTask.run(); - if (!_passwordCommand) { - _logger.warn("Timed out: " + buildCommandLine(command) + ". Output is: " + timedoutTask.getResult()); - } else { - _logger.warn("Timed out: " + buildCommandLine(command)); - } - - return ERR_TIMEOUT; } finally { if (future != null) { future.cancel(false); } Thread.interrupted(); } + + //timeout without completing the process + TimedOutLogger log = new TimedOutLogger(_process); + Task timedoutTask = new Task(log, ir); + + timedoutTask.run(); + if (!_passwordCommand) { + _logger.warn("Timed out: " + buildCommandLine(command) + ". Output is: " + timedoutTask.getResult()); + } else { + _logger.warn("Timed out: " + buildCommandLine(command)); + } + + return ERR_TIMEOUT; } _logger.debug("Exit value is " + _process.exitValue()); @@ -300,7 +305,7 @@ public String execute(OutputInterpreter interpreter) { IOUtils.closeQuietly(_process.getErrorStream()); IOUtils.closeQuietly(_process.getOutputStream()); IOUtils.closeQuietly(_process.getInputStream()); - _process.destroy(); + _process.destroyForcibly(); } } } From 2ad520282319da9a03061b8c744e51a4ffdf94a2 Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Wed, 28 Feb 2018 12:28:10 +0100 Subject: [PATCH 018/145] dateutil: constistency of tzdate input and output (#2392) Signed-off-by: Yoan Blanc Signed-off-by: Daan Hoogland --- .../main/java/com/cloud/utils/DateUtil.java | 10 ++++--- .../java/com/cloud/utils/DateUtilTest.java | 27 +++++++++++++------ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/utils/src/main/java/com/cloud/utils/DateUtil.java b/utils/src/main/java/com/cloud/utils/DateUtil.java index 7787e1be3bad..9f046d114461 100644 --- a/utils/src/main/java/com/cloud/utils/DateUtil.java +++ b/utils/src/main/java/com/cloud/utils/DateUtil.java @@ -38,10 +38,14 @@ public static Date currentGMTTime() { return new Date(); } - // yyyy-MM-ddTHH:mm:ssZxxxx + // yyyy-MM-ddTHH:mm:ssZZZZ or yyyy-MM-ddTHH:mm:ssZxxxx public static Date parseTZDateString(String str) throws ParseException { - DateFormat dfParse = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'Z"); - return dfParse.parse(str); + try { + return s_outputFormat.parse(str); + } catch (ParseException e) { + final DateFormat dfParse = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'Z"); + return dfParse.parse(str); + } } public static Date parseDateString(TimeZone tz, String dateString) { diff --git a/utils/src/test/java/com/cloud/utils/DateUtilTest.java b/utils/src/test/java/com/cloud/utils/DateUtilTest.java index ba88505f04d1..190adeab2db3 100644 --- a/utils/src/test/java/com/cloud/utils/DateUtilTest.java +++ b/utils/src/test/java/com/cloud/utils/DateUtilTest.java @@ -27,6 +27,9 @@ import com.cloud.utils.DateUtil.IntervalType; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; public class DateUtilTest { @@ -44,17 +47,25 @@ public static void main(String[] args) { if (args.length == 2) { System.out.println("Next run time: " + DateUtil.getNextRunTime(IntervalType.getIntervalType(args[0]), args[1], "GMT", time).toString()); } + } - time = new Date(); + @Test + public void zonedTimeFormatLegacy() throws ParseException { + Date time = new Date(); DateFormat dfDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'Z"); String str = dfDate.format(time); - System.out.println("Formated TZ time string : " + str); - try { - Date dtParsed = DateUtil.parseTZDateString(str); - System.out.println("Parsed TZ time string : " + dtParsed.toString()); - } catch (ParseException e) { - System.err.println("Parsing failed\n string : " + str + "\nexception :" + e.getLocalizedMessage()); - } + Date dtParsed = DateUtil.parseTZDateString(str); + + assertEquals(time.toString(), dtParsed.toString()); } + @Test + public void zonedTimeFormat() throws ParseException { + Date time = new Date(); + DateFormat dfDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ"); + String str = dfDate.format(time); + Date dtParsed = DateUtil.parseTZDateString(str); + + assertEquals(time.toString(), dtParsed.toString()); + } } From 2037dc9eb3979cbefc0a1c7f8b927c8d8b53ac26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Fri, 2 Mar 2018 08:07:53 -0300 Subject: [PATCH 019/145] [CLOUDSTACK-10257]Create template/volume does not allow to specify HVM requirement (#2437) --- ui/scripts/sharedFunctions.js | 183 +++++++++++++++++++++++ ui/scripts/storage.js | 269 +--------------------------------- 2 files changed, 186 insertions(+), 266 deletions(-) diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 606fed45d272..923ab76b5bf4 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -2622,3 +2622,186 @@ $.validator.addMethod("allzonesonly", function(value, element){ }, "All Zones cannot be combined with any other zone"); + +cloudStack.createTemplateMethod = function (isSnapshot){ + return { + label: 'label.create.template', + messages: { + confirm: function(args) { + return 'message.create.template'; + }, + notification: function(args) { + return 'label.create.template'; + } + }, + createForm: { + title: 'label.create.template', + preFilter: cloudStack.preFilter.createTemplate, + desc: '', + preFilter: function(args) { + if (args.context.volumes[0].hypervisor == "XenServer") { + if (isAdmin()) { + args.$form.find('.form-item[rel=xenserverToolsVersion61plus]').css('display', 'inline-block'); + } + } + }, + fields: { + name: { + label: 'label.name', + validation: { + required: true + } + }, + displayText: { + label: 'label.description', + validation: { + required: true + } + }, + xenserverToolsVersion61plus: { + label: 'label.xenserver.tools.version.61.plus', + isBoolean: true, + isChecked: function (args) { + var b = false; + var vmObj; + $.ajax({ + url: createURL("listVirtualMachines"), + data: { + id: args.context.volumes[0].virtualmachineid + }, + async: false, + success: function(json) { + vmObj = json.listvirtualmachinesresponse.virtualmachine[0]; + } + }); + if (vmObj == undefined) { //e.g. VM has failed over + if (isAdmin()) { + $.ajax({ + url: createURL('listConfigurations'), + data: { + name: 'xenserver.pvdriver.version' + }, + async: false, + success: function (json) { + if (json.listconfigurationsresponse.configuration != null && json.listconfigurationsresponse.configuration[0].value == 'xenserver61') { + b = true; + } + } + }); + } + } else { + if ('details' in vmObj && 'hypervisortoolsversion' in vmObj.details) { + if (vmObj.details.hypervisortoolsversion == 'xenserver61') + b = true; + else + b = false; + } + } + return b; + }, + isHidden: true + }, + osTypeId: { + label: 'label.os.type', + select: function(args) { + $.ajax({ + url: createURL("listOsTypes"), + dataType: "json", + async: true, + success: function(json) { + var ostypes = json.listostypesresponse.ostype; + var items = []; + $(ostypes).each(function() { + items.push({ + id: this.id, + description: this.description + }); + }); + args.response.success({ + data: items + }); + } + }); + } + }, + isPublic: { + label: 'label.public', + isBoolean: true + }, + isPasswordEnabled: { + label: 'label.password.enabled', + isBoolean: true + }, + isFeatured: { + label: 'label.featured', + isBoolean: true + }, + isdynamicallyscalable: { + label: 'label.dynamically.scalable', + isBoolean: true + }, + requireshvm: { + label: 'label.hvm', + docID: 'helpRegisterTemplateHvm', + isBoolean: true, + isHidden: false, + isChecked: false + } + } + }, + action: function(args) { + var data = { + name: args.data.name, + displayText: args.data.displayText, + osTypeId: args.data.osTypeId, + isPublic: (args.data.isPublic == "on"), + passwordEnabled: (args.data.isPasswordEnabled == "on"), + isdynamicallyscalable: (args.data.isdynamicallyscalable == "on"), + requireshvm: (args.data.requireshvm == "on") + }; + + if(isSnapshot){ + data.snapshotid = args.context.snapshots[0].id; + } else{ + data.volumeId = args.context.volumes[0].id; + } + if (args.$form.find('.form-item[rel=isFeatured]').css("display") != "none") { + $.extend(data, { + isfeatured: (args.data.isFeatured == "on") + }); + } + + //XenServer only (starts here) + if (args.$form.find('.form-item[rel=xenserverToolsVersion61plus]').length > 0) { + if (args.$form.find('.form-item[rel=xenserverToolsVersion61plus]').css("display") != "none") { + $.extend(data, { + 'details[0].hypervisortoolsversion': (args.data.xenserverToolsVersion61plus == "on") ? "xenserver61" : "xenserver56" + }); + } + } + //XenServer only (ends here) + + $.ajax({ + url: createURL('createTemplate'), + data: data, + success: function(json) { + var jid = json.createtemplateresponse.jobid; + args.response.success({ + _custom: { + jobId: jid, + getUpdatedItem: function(json) { + return {}; //no properties in this volume needs to be updated + }, + getActionFilter: function() { + return volumeActionfilter; + } + } + }); + } + }); + }, + notification: { + poll: pollAsyncJobResult + } + }; +}; \ No newline at end of file diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index e9b6138d0b64..47c4dfc46b15 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1302,175 +1302,8 @@ } }, - createTemplate: { - label: 'label.create.template', - messages: { - confirm: function(args) { - return 'message.create.template'; - }, - notification: function(args) { - return 'label.create.template'; - } - }, - createForm: { - title: 'label.create.template', - preFilter: cloudStack.preFilter.createTemplate, - desc: '', - preFilter: function(args) { - if (args.context.volumes[0].hypervisor == "XenServer") { - args.$form.find('.form-item[rel=xenserverToolsVersion61plus]').css('display', 'inline-block'); - - } - }, - fields: { - name: { - label: 'label.name', - validation: { - required: true - } - }, - displayText: { - label: 'label.description', - validation: { - required: true - } - }, - xenserverToolsVersion61plus: { - label: 'label.xenserver.tools.version.61.plus', - isBoolean: true, - isChecked: function (args) { - var b = false; - var vmObj; - $.ajax({ - url: createURL("listVirtualMachines"), - data: { - id: args.context.volumes[0].virtualmachineid - }, - async: false, - success: function(json) { - vmObj = json.listvirtualmachinesresponse.virtualmachine[0]; - } - }); - if (vmObj == undefined) { //e.g. VM has failed over - if (isAdmin()) { - $.ajax({ - url: createURL('listConfigurations'), - data: { - name: 'xenserver.pvdriver.version' - }, - async: false, - success: function (json) { - if (json.listconfigurationsresponse.configuration != null && json.listconfigurationsresponse.configuration[0].value == 'xenserver61') { - b = true; - } - } - }); - } - } else { - if ('details' in vmObj && 'hypervisortoolsversion' in vmObj.details) { - if (vmObj.details.hypervisortoolsversion == 'xenserver61') - b = true; - else - b = false; - } - } - return b; - }, - isHidden: true - }, - osTypeId: { - label: 'label.os.type', - select: function(args) { - $.ajax({ - url: createURL("listOsTypes"), - dataType: "json", - async: true, - success: function(json) { - var ostypes = json.listostypesresponse.ostype; - var items = []; - $(ostypes).each(function() { - items.push({ - id: this.id, - description: this.description - }); - }); - args.response.success({ - data: items - }); - } - }); - } - }, - isPublic: { - label: 'label.public', - isBoolean: true - }, - isPasswordEnabled: { - label: 'label.password.enabled', - isBoolean: true - }, - isFeatured: { - label: 'label.featured', - isBoolean: true - }, - isdynamicallyscalable: { - label: 'label.dynamically.scalable', - isBoolean: true - } - } - }, - action: function(args) { - var data = { - volumeId: args.context.volumes[0].id, - name: args.data.name, - displayText: args.data.displayText, - osTypeId: args.data.osTypeId, - isPublic: (args.data.isPublic == "on"), - passwordEnabled: (args.data.isPasswordEnabled == "on"), - isdynamicallyscalable: (args.data.isdynamicallyscalable == "on") - - }; - - if (args.$form.find('.form-item[rel=isFeatured]').css("display") != "none") { - $.extend(data, { - isfeatured: (args.data.isFeatured == "on") - }); - } - - //XenServer only (starts here) - if (args.$form.find('.form-item[rel=xenserverToolsVersion61plus]').length > 0) { - if (args.$form.find('.form-item[rel=xenserverToolsVersion61plus]').css("display") != "none") { - $.extend(data, { - 'details[0].hypervisortoolsversion': (args.data.xenserverToolsVersion61plus == "on") ? "xenserver61" : "xenserver56" - }); - } - } - //XenServer only (ends here) - - $.ajax({ - url: createURL('createTemplate'), - data: data, - success: function(json) { - var jid = json.createtemplateresponse.jobid; - args.response.success({ - _custom: { - jobId: jid, - getUpdatedItem: function(json) { - return {}; //no properties in this volume needs to be updated - }, - getActionFilter: function() { - return volumeActionfilter; - } - } - }); - } - }); - }, - notification: { - poll: pollAsyncJobResult - } - }, - + createTemplate: cloudStack.createTemplateMethod(false), + migrateToAnotherStorage: { label: 'label.migrate.volume.to.primary.storage', messages: { @@ -2102,103 +1935,7 @@ detailView: { name: 'Snapshot detail', actions: { - createTemplate: { - label: 'label.create.template', - messages: { - confirm: function(args) { - return 'message.create.template'; - }, - notification: function(args) { - return 'label.create.template'; - } - }, - createForm: { - title: 'label.create.template', - desc: '', - fields: { - name: { - label: 'label.name', - validation: { - required: true - } - }, - displayText: { - label: 'label.description', - validation: { - required: true - } - }, - osTypeId: { - label: 'label.os.type', - select: function(args) { - $.ajax({ - url: createURL("listOsTypes"), - dataType: "json", - async: true, - success: function(json) { - var ostypes = json.listostypesresponse.ostype; - var items = []; - $(ostypes).each(function() { - items.push({ - id: this.id, - description: this.description - }); - }); - args.response.success({ - data: items - }); - } - }); - } - }, - isPublic: { - label: 'label.public', - isBoolean: true - }, - isPasswordEnabled: { - label: 'label.password.enabled', - isBoolean: true - }, - isdynamicallyscalable: { - label: 'label.dynamically.scalable', - isBoolean: true - } - } - }, - action: function(args) { - var data = { - snapshotid: args.context.snapshots[0].id, - name: args.data.name, - displayText: args.data.displayText, - osTypeId: args.data.osTypeId, - isPublic: (args.data.isPublic == "on"), - passwordEnabled: (args.data.isPasswordEnabled == "on"), - isdynamicallyscalable: (args.data.isdynamicallyscalable == "on") - }; - - $.ajax({ - url: createURL('createTemplate'), - data: data, - success: function(json) { - var jid = json.createtemplateresponse.jobid; - args.response.success({ - _custom: { - jobId: jid, - getUpdatedItem: function(json) { - return {}; //nothing in this snapshot needs to be updated - }, - getActionFilter: function() { - return snapshotActionfilter; - } - } - }); - } - }); - }, - notification: { - poll: pollAsyncJobResult - } - }, + createTemplate: cloudStack.createTemplateMethod(true), createVolume: { label: 'label.action.create.volume', From 4412563f19ec8b808fe4c79e2baf658507a84873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Tue, 6 Mar 2018 07:53:10 -0300 Subject: [PATCH 020/145] [CLOUDSTACK-10318] Bug on sorting ACL rules list in chrome (#2478) --- ui/scripts/vpc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 9dc8323e7cdf..a77c4d7b585d 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -1325,7 +1325,7 @@ if(items){ items.sort(function(a, b) { - return a.number >= b.number; + return a.number - b.number; }).map(function(acl) { if (parseInt(acl.protocol)) { // protocol number acl.protocolnumber = acl.protocol; From f2efbcececb3cfb06a51e5d3a2e77417c19c667f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Wed, 7 Mar 2018 18:23:15 -0300 Subject: [PATCH 021/145] [CLOUDSTACK-10240] ACS cannot migrate a local volume to shared storage (#2425) * [CLOUDSTACK-10240] ACS cannot migrate a volume from local to shared storage. CloudStack is logically restricting the migration of local storages to shared storage and vice versa. This restriction is a logical one and can be removed for XenServer deployments. Therefore, we will enable migration of volumes between local-shared storages in XenServers independently of their service offering. This will work as an override mechanism to the disk offering used by volumes. If administrators want to migrate local volumes to a shared storage, they should be able to do so (the hypervisor already allows that). The same the other way around. * Cleanups implemented while working on [CLOUDSTACK-10240] * Fix test case test_03_migrate_options_storage_tags The changes applied were: - When loading hypervisors capabilities we must use "default" instead of nulls - "Enable" storage migration for simulator hypervisor - Remove restriction on "ClusterScopeStoragePoolAllocator" to find shared pools --- .travis.yml | 7 +- .../FindStoragePoolsForMigrationCmd.java | 30 +- .../FindStoragePoolsForMigrationCmdTest.java | 63 +++ .../cloud/vm/VirtualMachineManagerImpl.java | 266 +++++----- .../vm/VirtualMachineManagerImplTest.java | 472 ++---------------- .../dao/HypervisorCapabilitiesDaoImpl.java | 11 +- .../datastore/db/PrimaryDataStoreDaoImpl.java | 22 +- .../ClusterScopeStoragePoolAllocator.java | 5 - .../cloud/server/ManagementServerImpl.java | 133 ++--- .../cloud/storage/VolumeApiServiceImpl.java | 354 ++++++------- .../java/com/cloud/vm/UserVmManagerImpl.java | 25 +- .../storage/VolumeApiServiceImplTest.java | 265 +++++----- .../db/hypervisor_capabilities.simulator.sql | 2 +- .../integration/smoke/test_primary_storage.py | 30 +- 14 files changed, 671 insertions(+), 1014 deletions(-) create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmdTest.java diff --git a/.travis.yml b/.travis.yml index d5fd173d71ed..be0bfb122105 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,9 +70,10 @@ env: smoke/test_password_server smoke/test_portable_publicip smoke/test_portforwardingrules" - - - TESTS="smoke/test_primary_storage - smoke/test_privategw_acl + + - TESTS="smoke/test_primary_storage" + + - TESTS="smoke/test_privategw_acl smoke/test_projects smoke/test_public_ip_range smoke/test_pvlan diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java index 47fa965e7ddb..73c596c9e56a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java @@ -17,10 +17,10 @@ package org.apache.cloudstack.api.command.admin.storage; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; -import org.apache.log4j.Logger; - import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -29,12 +29,14 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.VolumeResponse; +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; import com.cloud.storage.StoragePool; import com.cloud.utils.Pair; @APICommand(name = "findStoragePoolsForMigration", description = "Lists storage pools available for migration of a volume.", responseObject = StoragePoolResponse.class, - requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) +requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class FindStoragePoolsForMigrationCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(FindStoragePoolsForMigrationCmd.class.getName()); @@ -81,7 +83,7 @@ public void execute() { StoragePoolResponse poolResponse = _responseGenerator.createStoragePoolForMigrationResponse(pool); Boolean suitableForMigration = false; for (StoragePool suitablePool : suitablePoolList) { - if (suitablePool.getId() == pool.getId()) { + if (StringUtils.equals(suitablePool.getUuid(), pool.getUuid())) { suitableForMigration = true; break; } @@ -90,9 +92,27 @@ public void execute() { poolResponse.setObjectName("storagepool"); poolResponses.add(poolResponse); } - + sortPoolsBySuitabilityAndName(poolResponses); response.setResponses(poolResponses); response.setResponseName(getCommandName()); this.setResponseObject(response); } + + protected void sortPoolsBySuitabilityAndName(List poolResponses) { + Collections.sort(poolResponses, new Comparator() { + @Override + public int compare(StoragePoolResponse o1, StoragePoolResponse o2) { + if (o1.getSuitableForMigration() && o2.getSuitableForMigration()) { + return o1.getName().compareTo(o2.getName()); + } + if (o1.getSuitableForMigration()) { + return -1; + } + if (o2.getSuitableForMigration()) { + return 1; + } + return 0; + } + }); + } } diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmdTest.java new file mode 100644 index 000000000000..2297946bec73 --- /dev/null +++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmdTest.java @@ -0,0 +1,63 @@ +// 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.command.admin.storage; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.runners.MockitoJUnitRunner; + +@RunWith(MockitoJUnitRunner.class) +public class FindStoragePoolsForMigrationCmdTest { + + private FindStoragePoolsForMigrationCmd findStoragePoolsForMigrationCmd = new FindStoragePoolsForMigrationCmd(); + + @Test + public void sortPoolsBySuitability() { + List storagePoolsResponse = new ArrayList<>(); + StoragePoolResponse storagePoolResponse1 = new StoragePoolResponse(); + storagePoolResponse1.setSuitableForMigration(true); + storagePoolResponse1.setId("1"); + storagePoolResponse1.setName("1"); + + StoragePoolResponse storagePoolResponse2 = new StoragePoolResponse(); + storagePoolResponse2.setSuitableForMigration(false); + storagePoolResponse2.setId("2"); + storagePoolResponse2.setName("2"); + + StoragePoolResponse storagePoolResponse3 = new StoragePoolResponse(); + storagePoolResponse3.setSuitableForMigration(true); + storagePoolResponse3.setId("3"); + storagePoolResponse3.setName("3"); + + storagePoolsResponse.add(storagePoolResponse3); + storagePoolsResponse.add(storagePoolResponse2); + storagePoolsResponse.add(storagePoolResponse1); + + findStoragePoolsForMigrationCmd.sortPoolsBySuitabilityAndName(storagePoolsResponse); + + Assert.assertEquals("1", storagePoolsResponse.get(0).getId()); + Assert.assertEquals("3", storagePoolsResponse.get(1).getId()); + Assert.assertEquals("2", storagePoolsResponse.get(2).getId()); + + } + +} \ No newline at end of file diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java index 375b09106247..fb1c1b419337 100755 --- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java @@ -23,9 +23,9 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -39,9 +39,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.commons.collections.CollectionUtils; -import org.apache.log4j.Logger; - import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; import org.apache.cloudstack.ca.CAManager; import org.apache.cloudstack.context.CallContext; @@ -73,6 +70,9 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.to.VolumeObjectTO; import org.apache.cloudstack.utils.identity.ManagementServerNode; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.MapUtils; +import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; @@ -424,8 +424,9 @@ public void doInTransactionWithoutResult(final TransactionStatus status) throws } try { - if (!vmProfile.getBootArgs().contains("ExternalLoadBalancerVm")) + if (!vmProfile.getBootArgs().contains("ExternalLoadBalancerVm")) { _networkMgr.allocate(vmProfile, auxiliaryNetworks, extraDhcpOptions); + } } catch (final ConcurrentOperationException e) { throw new CloudRuntimeException("Concurrent operation while trying to allocate resources for the VM", e); } @@ -1880,6 +1881,7 @@ public void destroy(final String vmUuid, final boolean expunge) throws AgentUnav deleteVMSnapshots(vm, expunge); Transaction.execute(new TransactionCallbackWithExceptionNoReturn() { + @Override public void doInTransactionWithoutResult(final TransactionStatus status) throws CloudRuntimeException { VMInstanceVO vm = _vmDao.findByUuid(vmUuid); try { @@ -2292,97 +2294,119 @@ protected void migrate(final VMInstanceVO vm, final long srcHostId, final Deploy } } - private Map getPoolListForVolumesForMigration(final VirtualMachineProfile profile, final Host host, final Map volumeToPool) { - final List allVolumes = _volsDao.findUsableVolumesForInstance(profile.getId()); - final Map volumeToPoolObjectMap = new HashMap<>(); - - for (final VolumeVO volume : allVolumes) { - final Long poolId = volumeToPool.get(volume.getId()); - final StoragePoolVO destPool = _storagePoolDao.findById(poolId); - final StoragePoolVO currentPool = _storagePoolDao.findById(volume.getPoolId()); - final DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId()); - - if (destPool != null) { - if (currentPool.isManaged()) { - if (destPool.getId() == currentPool.getId()) { - volumeToPoolObjectMap.put(volume, currentPool); - } - else { - throw new CloudRuntimeException("Currently, a volume on managed storage can only be 'migrated' to itself."); - } - } - else { - // Check if pool is accessible from the destination host and disk offering with which the volume was - // created is compliant with the pool type. - if (_poolHostDao.findByPoolHost(destPool.getId(), host.getId()) == null || destPool.isLocal() != diskOffering.getUseLocalStorage()) { - // Cannot find a pool for the volume. Throw an exception. - throw new CloudRuntimeException("Cannot migrate volume " + volume + " to storage pool " + destPool + " while migrating vm to host " + host + - ". Either the pool is not accessible from the host or because of the offering with which the volume is created it cannot be placed on " + - "the given pool."); - } else if (destPool.getId() == currentPool.getId()) { - // If the pool to migrate to is the same as current pool, the volume doesn't need to be migrated. - } else { - volumeToPoolObjectMap.put(volume, destPool); - } - } - } else { - if (currentPool.isManaged()) { - if (currentPool.getScope() == ScopeType.ZONE) { - volumeToPoolObjectMap.put(volume, currentPool); - } - else { - throw new CloudRuntimeException("Currently, you can only 'migrate' a volume on managed storage if its storage pool is zone wide."); - } - } else { - // Find a suitable pool for the volume. Call the storage pool allocator to find the list of pools. - - final DiskProfile diskProfile = new DiskProfile(volume, diskOffering, profile.getHypervisorType()); - final DataCenterDeployment plan = new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), host.getClusterId(), - host.getId(), null, null); + /** + * Create the mapping of volumes and storage pools. If the user did not enter a mapping on her/his own, we create one using {@link #getDefaultMappingOfVolumesAndStoragePoolForMigration(VirtualMachineProfile, Host)}. + * If the user provided a mapping, we use whatever the user has provided (check the method {@link #createMappingVolumeAndStoragePoolEnteredByUser(VirtualMachineProfile, Host, Map)}). + */ + private Map getPoolListForVolumesForMigration(VirtualMachineProfile profile, Host targetHost, Map volumeToPool) { + if (MapUtils.isEmpty(volumeToPool)) { + return getDefaultMappingOfVolumesAndStoragePoolForMigration(profile, targetHost); + } - final List poolList = new ArrayList<>(); - final ExcludeList avoid = new ExcludeList(); + return createMappingVolumeAndStoragePoolEnteredByUser(profile, targetHost, volumeToPool); + } - for (final StoragePoolAllocator allocator : _storagePoolAllocators) { - final List poolListFromAllocator = allocator.allocateToPool(diskProfile, profile, plan, avoid, StoragePoolAllocator.RETURN_UPTO_ALL); + /** + * We create the mapping of volumes and storage pool to migrate the VMs according to the information sent by the user. + */ + private Map createMappingVolumeAndStoragePoolEnteredByUser(VirtualMachineProfile profile, Host host, Map volumeToPool) { + Map volumeToPoolObjectMap = new HashMap(); + for(Long volumeId: volumeToPool.keySet()) { + VolumeVO volume = _volsDao.findById(volumeId); - if (poolListFromAllocator != null && !poolListFromAllocator.isEmpty()) { - poolList.addAll(poolListFromAllocator); - } - } + Long poolId = volumeToPool.get(volumeId); + StoragePoolVO targetPool = _storagePoolDao.findById(poolId); + StoragePoolVO currentPool = _storagePoolDao.findById(volume.getPoolId()); - boolean currentPoolAvailable = false; + if (_poolHostDao.findByPoolHost(targetPool.getId(), host.getId()) == null) { + throw new CloudRuntimeException(String.format("Cannot migrate the volume [%s] to the storage pool [%s] while migrating VM [%s] to target host [%s]. The host does not have access to the storage pool entered.", volume.getUuid(), targetPool.getUuid(), profile.getUuid(), host.getUuid())); + } + if (currentPool.getId() == targetPool.getId()) { + s_logger.info(String.format("The volume [%s] is already allocated in storage pool [%s].", volume.getUuid(), targetPool.getUuid())); + } + volumeToPoolObjectMap.put(volume, targetPool); + } + return volumeToPoolObjectMap; + } - if (poolList != null && !poolList.isEmpty()) { - // Volume needs to be migrated. Pick the first pool from the list. Add a mapping to migrate the - // volume to a pool only if it is required; that is the current pool on which the volume resides - // is not available on the destination host. + /** + * We create the default mapping of volumes and storage pools for the migration of the VM to the target host. + * If the current storage pool of one of the volumes is using local storage in the host, it then needs to be migrated to a local storage in the target host. + * Otherwise, we do not need to migrate, and the volume can be kept in its current storage pool. + */ + private Map getDefaultMappingOfVolumesAndStoragePoolForMigration(VirtualMachineProfile profile, Host targetHost) { + Map volumeToPoolObjectMap = new HashMap(); + List allVolumes = _volsDao.findUsableVolumesForInstance(profile.getId()); + for (VolumeVO volume : allVolumes) { + StoragePoolVO currentPool = _storagePoolDao.findById(volume.getPoolId()); + if (ScopeType.HOST.equals(currentPool.getScope())) { + createVolumeToStoragePoolMappingIfNeeded(profile, targetHost, volumeToPoolObjectMap, volume, currentPool); + } else { + volumeToPoolObjectMap.put(volume, currentPool); + } + } + return volumeToPoolObjectMap; + } - final Iterator iter = poolList.iterator(); + /** + * We will add a mapping of volume to storage pool if needed. The conditions to add a mapping are the following: + *
    + *
  • The current storage pool where the volume is allocated can be accessed by the target host + *
  • If not storage pool is found to allocate the volume we throw an exception. + *
+ * + */ + private void createVolumeToStoragePoolMappingIfNeeded(VirtualMachineProfile profile, Host targetHost, Map volumeToPoolObjectMap, VolumeVO volume, StoragePoolVO currentPool) { + List poolList = getCandidateStoragePoolsToMigrateLocalVolume(profile, targetHost, volume); + + Collections.shuffle(poolList); + boolean canTargetHostAccessVolumeStoragePool = false; + for (StoragePool storagePool : poolList) { + if (storagePool.getId() == currentPool.getId()) { + canTargetHostAccessVolumeStoragePool = true; + break; + } - while (iter.hasNext()) { - if (currentPool.getId() == iter.next().getId()) { - currentPoolAvailable = true; + } + if(!canTargetHostAccessVolumeStoragePool && CollectionUtils.isEmpty(poolList)) { + throw new CloudRuntimeException(String.format("There is not storage pools avaliable at the target host [%s] to migrate volume [%s]", targetHost.getUuid(), volume.getUuid())); + } + if (!canTargetHostAccessVolumeStoragePool) { + volumeToPoolObjectMap.put(volume, _storagePoolDao.findByUuid(poolList.get(0).getUuid())); + } + if (!canTargetHostAccessVolumeStoragePool && !volumeToPoolObjectMap.containsKey(volume)) { + throw new CloudRuntimeException(String.format("Cannot find a storage pool which is available for volume [%s] while migrating virtual machine [%s] to host [%s]", volume.getUuid(), + profile.getUuid(), targetHost.getUuid())); + } + } - break; - } - } + /** + * We use {@link StoragePoolAllocator} objects to find local storage pools connected to the targetHost where we would be able to allocate the given volume. + */ + private List getCandidateStoragePoolsToMigrateLocalVolume(VirtualMachineProfile profile, Host targetHost, VolumeVO volume) { + List poolList = new ArrayList<>(); - if (!currentPoolAvailable) { - volumeToPoolObjectMap.put(volume, _storagePoolDao.findByUuid(poolList.get(0).getUuid())); - } - } + DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId()); + DiskProfile diskProfile = new DiskProfile(volume, diskOffering, profile.getHypervisorType()); + DataCenterDeployment plan = new DataCenterDeployment(targetHost.getDataCenterId(), targetHost.getPodId(), targetHost.getClusterId(), targetHost.getId(), null, null); + ExcludeList avoid = new ExcludeList(); - if (!currentPoolAvailable && !volumeToPoolObjectMap.containsKey(volume)) { - // Cannot find a pool for the volume. Throw an exception. - throw new CloudRuntimeException("Cannot find a storage pool which is available for volume " + volume + " while migrating virtual machine " + - profile.getVirtualMachine() + " to host " + host); - } + StoragePoolVO volumeStoragePool = _storagePoolDao.findById(volume.getPoolId()); + if (volumeStoragePool.isLocal()) { + diskProfile.setUseLocalStorage(true); + } + for (StoragePoolAllocator allocator : _storagePoolAllocators) { + List poolListFromAllocator = allocator.allocateToPool(diskProfile, profile, plan, avoid, StoragePoolAllocator.RETURN_UPTO_ALL); + if (CollectionUtils.isEmpty(poolListFromAllocator)) { + continue; + } + for (StoragePool pool : poolListFromAllocator) { + if (pool.isLocal()) { + poolList.add(pool); } } } - - return volumeToPoolObjectMap; + return poolList; } private void moveVmToMigratingState(final T vm, final Long hostId, final ItWorkVO work) throws ConcurrentOperationException { @@ -2891,8 +2915,11 @@ private String getControlNicIpForVM(VirtualMachine vm) { if (vm.getType() == VirtualMachine.Type.ConsoleProxy || vm.getType() == VirtualMachine.Type.SecondaryStorageVm) { NicVO nic = _nicsDao.getControlNicForVM(vm.getId()); return nic.getIPv4Address(); - } else if (vm.getType() == VirtualMachine.Type.DomainRouter) return vm.getPrivateIpAddress(); - else return null; + } else if (vm.getType() == VirtualMachine.Type.DomainRouter) { + return vm.getPrivateIpAddress(); + } else { + return null; + } } public Command cleanup(final String vmName) { VirtualMachine vm = _vmDao.findVMByInstanceName(vmName); @@ -2961,67 +2988,6 @@ private void updateVmMetaData(Long vmId, String platform) { _userVmDao.saveDetails(userVm); } - private void ensureVmRunningContext(final long hostId, VMInstanceVO vm, final Event cause) throws OperationTimedoutException, ResourceUnavailableException, - NoTransitionException, InsufficientAddressCapacityException { - final VirtualMachineGuru vmGuru = getVmGuru(vm); - - s_logger.debug("VM state is starting on full sync so updating it to running"); - vm = _vmDao.findById(vm.getId()); - - // grab outstanding work item if any - final ItWorkVO work = _workDao.findByOutstandingWork(vm.getId(), vm.getState()); - if (work != null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Found an outstanding work item for this vm " + vm + " in state:" + vm.getState() + ", work id:" + work.getId()); - } - } - - try { - stateTransitTo(vm, cause, hostId); - } catch (final NoTransitionException e1) { - s_logger.warn(e1.getMessage()); - } - - s_logger.debug("VM's " + vm + " state is starting on full sync so updating it to Running"); - vm = _vmDao.findById(vm.getId()); // this should ensure vm has the most - // up to date info - - final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm); - final List nics = _nicsDao.listByVmId(profile.getId()); - for (final NicVO nic : nics) { - final Network network = _networkModel.getNetwork(nic.getNetworkId()); - final NicProfile nicProfile = - new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null, _networkModel.isSecurityGroupSupportedInNetwork(network), - _networkModel.getNetworkTag(profile.getHypervisorType(), network)); - profile.addNic(nicProfile); - } - - final Commands cmds = new Commands(Command.OnError.Stop); - s_logger.debug("Finalizing commands that need to be send to complete Start process for the vm " + vm); - - if (vmGuru.finalizeCommandsOnStart(cmds, profile)) { - if (cmds.size() != 0) { - _agentMgr.send(vm.getHostId(), cmds); - } - - if (vmGuru.finalizeStart(profile, vm.getHostId(), cmds, null)) { - stateTransitTo(vm, cause, vm.getHostId()); - } else { - s_logger.error("Unable to finish finialization for running vm: " + vm); - } - } else { - s_logger.error("Unable to finalize commands on start for vm: " + vm); - } - - if (work != null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Updating outstanding work item to Done, id:" + work.getId()); - } - work.setStep(Step.Done); - _workDao.update(work.getId(), work); - } - } - @Override public boolean isRecurring() { return true; @@ -3803,7 +3769,7 @@ private void orchestrateMigrateForScale(final String vmUuid, final long srcHostI @Override public boolean replugNic(final Network network, final NicTO nic, final VirtualMachineTO vm, final ReservationContext context, final DeployDestination dest) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + ResourceUnavailableException, InsufficientCapacityException { boolean result = true; final VMInstanceVO router = _vmDao.findById(vm.getId()); @@ -3825,7 +3791,7 @@ public boolean replugNic(final Network network, final NicTO nic, final VirtualMa s_logger.warn("Unable to apply ReplugNic, vm " + router + " is not in the right state " + router.getState()); throw new ResourceUnavailableException("Unable to apply ReplugNic on the backend," + " vm " + vm + " is not in the right state", DataCenter.class, - router.getDataCenterId()); + router.getDataCenterId()); } return result; @@ -4015,8 +3981,8 @@ public String getConfigComponentName() { @Override public ConfigKey[] getConfigKeys() { return new ConfigKey[] {ClusterDeltaSyncInterval, StartRetry, VmDestroyForcestop, VmOpCancelInterval, VmOpCleanupInterval, VmOpCleanupWait, - VmOpLockStateRetry, - VmOpWaitInterval, ExecuteInSequence, VmJobCheckInterval, VmJobTimeout, VmJobStateReportInterval, VmConfigDriveLabel}; + VmOpLockStateRetry, + VmOpWaitInterval, ExecuteInSequence, VmJobCheckInterval, VmJobTimeout, VmJobStateReportInterval, VmConfigDriveLabel}; } public List getStoragePoolAllocators() { diff --git a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java index 9bc22c49274d..f33cc9699ebe 100644 --- a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java +++ b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java @@ -20,455 +20,77 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.isA; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; import java.util.ArrayList; -import com.cloud.service.dao.ServiceOfferingDao; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.mockito.Matchers; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.mockito.Spy; - -import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd; -import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; -import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService; -import org.apache.cloudstack.framework.config.ConfigDepot; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; -import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; +import org.mockito.runners.MockitoJUnitRunner; import com.cloud.agent.AgentManager; -import com.cloud.agent.api.CheckVirtualMachineAnswer; -import com.cloud.agent.api.CheckVirtualMachineCommand; import com.cloud.agent.api.Command; -import com.cloud.agent.api.MigrateWithStorageAnswer; -import com.cloud.agent.api.MigrateWithStorageCommand; -import com.cloud.agent.api.MigrateWithStorageCompleteAnswer; -import com.cloud.agent.api.MigrateWithStorageCompleteCommand; -import com.cloud.agent.api.MigrateWithStorageReceiveAnswer; -import com.cloud.agent.api.MigrateWithStorageReceiveCommand; -import com.cloud.agent.api.MigrateWithStorageSendAnswer; -import com.cloud.agent.api.MigrateWithStorageSendCommand; -import com.cloud.agent.api.PrepareForMigrationAnswer; -import com.cloud.agent.api.PrepareForMigrationCommand; -import com.cloud.agent.api.ScaleVmAnswer; -import com.cloud.agent.api.ScaleVmCommand; import com.cloud.agent.api.StopAnswer; import com.cloud.agent.api.StopCommand; -import com.cloud.capacity.CapacityManager; -import com.cloud.dc.dao.ClusterDao; -import com.cloud.dc.dao.DataCenterDao; -import com.cloud.dc.dao.HostPodDao; -import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlanner; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.ManagementServerException; -import com.cloud.exception.OperationTimedoutException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.exception.VirtualMachineMigrationException; import com.cloud.host.HostVO; -import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.hypervisor.HypervisorGuru; -import com.cloud.hypervisor.HypervisorGuruManager; -import com.cloud.offering.ServiceOffering; import com.cloud.service.ServiceOfferingVO; -import com.cloud.storage.dao.DiskOfferingDao; -import com.cloud.storage.dao.StoragePoolHostDao; -import com.cloud.storage.dao.VMTemplateDao; +import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.dao.VolumeDao; -import com.cloud.storage.Storage.ProvisioningType; -import com.cloud.storage.DiskOfferingVO; -import com.cloud.storage.StoragePoolHostVO; -import com.cloud.storage.VolumeVO; -import com.cloud.storage.VMTemplateVO; -import com.cloud.user.Account; -import com.cloud.user.AccountVO; -import com.cloud.user.UserVO; -import com.cloud.user.dao.AccountDao; -import com.cloud.user.dao.UserDao; -import com.cloud.utils.Pair; -import com.cloud.utils.db.EntityManager; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.vm.VirtualMachine.Event; import com.cloud.vm.VirtualMachine.State; -import com.cloud.vm.VirtualMachine.PowerState; -import com.cloud.vm.dao.UserVmDao; -import com.cloud.vm.dao.UserVmDetailsDao; import com.cloud.vm.dao.VMInstanceDao; -import com.cloud.vm.snapshot.VMSnapshotManager; +@RunWith(MockitoJUnitRunner.class) public class VirtualMachineManagerImplTest { @Spy - VirtualMachineManagerImpl _vmMgr = new VirtualMachineManagerImpl(); - @Mock - VolumeOrchestrationService _storageMgr; - @Mock - Account _account; - @Mock - CapacityManager _capacityMgr; - @Mock - AgentManager _agentMgr; - @Mock - AccountDao _accountDao; - @Mock - ConfigurationDao _configDao; - @Mock - HostDao _hostDao; - @Mock - UserDao _userDao; - @Mock - UserVmDao _vmDao; - @Mock - ItWorkDao _workDao; + @InjectMocks + private VirtualMachineManagerImpl virtualMachineManagerImpl; @Mock - VMInstanceDao _vmInstanceDao; + private AgentManager agentManagerMock; @Mock - ServiceOfferingDao _offeringDao; + private VMInstanceDao vmInstanceDao; @Mock - VMTemplateDao _templateDao; + private ServiceOfferingDao serviceOfferingDao; @Mock - VolumeDao _volsDao; + private VolumeDao volumeDao; @Mock - RestoreVMCmd _restoreVMCmd; + private VMInstanceVO vmInstanceMock; @Mock - AccountVO _accountMock; + private ServiceOfferingVO serviceOfferingMock; @Mock - UserVO _userMock; + private HostVO hostMock; @Mock - UserVmVO _vmMock; - @Mock - VMInstanceVO _vmInstance; - @Mock - ServiceOfferingVO _serviceOfferingMock; - @Mock - HostVO _host; - @Mock - VMTemplateVO _templateMock; - @Mock - VolumeVO _volumeMock; - @Mock - List _rootVols; - @Mock - ItWorkVO _work; - @Mock - HostVO hostVO; - @Mock - UserVmDetailVO _vmDetailVO; - - @Mock - ClusterDao _clusterDao; - @Mock - HostPodDao _podDao; - @Mock - DataCenterDao _dcDao; - @Mock - DiskOfferingDao _diskOfferingDao; - @Mock - PrimaryDataStoreDao _storagePoolDao; - @Mock - UserVmDetailsDao _vmDetailsDao; - @Mock - StoragePoolHostDao _poolHostDao; - @Mock - NetworkOrchestrationService _networkMgr; - @Mock - HypervisorGuruManager _hvGuruMgr; - @Mock - VMSnapshotManager _vmSnapshotMgr; - - // Mock objects for vm migration with storage test. - @Mock - DiskOfferingVO _diskOfferingMock; - @Mock - StoragePoolVO _srcStoragePoolMock; - @Mock - StoragePoolVO _destStoragePoolMock; - @Mock - HostVO _srcHostMock; - @Mock - HostVO _destHostMock; - @Mock - Map _volumeToPoolMock; - @Mock - EntityManager _entityMgr; - @Mock - ConfigDepot _configDepot; + private VirtualMachineProfile virtualMachineProfileMock; @Before public void setup() { - MockitoAnnotations.initMocks(this); - - _vmMgr._templateDao = _templateDao; - _vmMgr._volsDao = _volsDao; - _vmMgr.volumeMgr = _storageMgr; - _vmMgr._capacityMgr = _capacityMgr; - _vmMgr._hostDao = _hostDao; - _vmMgr._nodeId = 1L; - _vmMgr._workDao = _workDao; - _vmMgr._agentMgr = _agentMgr; - _vmMgr._podDao = _podDao; - _vmMgr._clusterDao = _clusterDao; - _vmMgr._dcDao = _dcDao; - _vmMgr._diskOfferingDao = _diskOfferingDao; - _vmMgr._storagePoolDao = _storagePoolDao; - _vmMgr._poolHostDao = _poolHostDao; - _vmMgr._networkMgr = _networkMgr; - _vmMgr._hvGuruMgr = _hvGuruMgr; - _vmMgr._vmSnapshotMgr = _vmSnapshotMgr; - _vmMgr._vmDao = _vmInstanceDao; - _vmMgr._uservmDetailsDao = _vmDetailsDao; - _vmMgr._entityMgr = _entityMgr; - _vmMgr._configDepot = _configDepot; - _vmMgr._offeringDao = _offeringDao; - _vmMgr.hostAllocators = new ArrayList<>(); - - when(_vmMock.getId()).thenReturn(314l); - when(_vmInstance.getId()).thenReturn(1L); - when(_vmInstance.getServiceOfferingId()).thenReturn(2L); - when(_vmInstance.getInstanceName()).thenReturn("myVm"); - when(_vmInstance.getHostId()).thenReturn(2L); - when(_vmInstance.getType()).thenReturn(VirtualMachine.Type.User); - when(_host.getId()).thenReturn(1L); - when(_hostDao.findById(anyLong())).thenReturn(null); - when(_entityMgr.findById(Matchers.eq(ServiceOffering.class), anyLong())).thenReturn(getSvcoffering(512)); - when(_workDao.persist(_work)).thenReturn(_work); - when(_workDao.update("1", _work)).thenReturn(true); - when(_work.getId()).thenReturn("1"); - doNothing().when(_work).setStep(ItWorkVO.Step.Done); - when(_vmInstanceDao.findByUuid(any(String.class))).thenReturn(_vmMock); - //doNothing().when(_volsDao).detachVolume(anyLong()); - //when(_work.setStep(ItWorkVO.Step.Done)).thenReturn("1"); - - } - - @Test(expected = CloudRuntimeException.class) - public void testScaleVM1() throws Exception { - - DeployDestination dest = new DeployDestination(null, null, null, _host); - long l = 1L; - - when(_vmInstanceDao.findById(anyLong())).thenReturn(_vmInstance); - _vmMgr.migrateForScale(_vmInstance.getUuid(), l, dest, l); - - } - - @Test(expected = CloudRuntimeException.class) - public void testScaleVM2() throws Exception { - - new DeployDestination(null, null, null, _host); - doReturn(3L).when(_vmInstance).getId(); - when(_vmInstanceDao.findById(anyLong())).thenReturn(_vmInstance); - ServiceOfferingVO newServiceOffering = getSvcoffering(512); - doReturn(1L).when(_vmInstance).getHostId(); - doReturn(hostVO).when(_hostDao).findById(1L); - doReturn(1L).when(_vmInstance).getDataCenterId(); - doReturn(1L).when(hostVO).getClusterId(); - when(CapacityManager.CpuOverprovisioningFactor.valueIn(1L)).thenReturn(1.0f); - ScaleVmCommand reconfigureCmd = - new ScaleVmCommand("myVmName", newServiceOffering.getCpu(), newServiceOffering.getSpeed(), newServiceOffering.getSpeed(), newServiceOffering.getRamSize(), - newServiceOffering.getRamSize(), newServiceOffering.getLimitCpuUse()); - new ScaleVmAnswer(reconfigureCmd, true, "details"); - when(_agentMgr.send(2l, reconfigureCmd)).thenReturn(null); - _vmMgr.reConfigureVm(_vmInstance.getUuid(), getSvcoffering(256), false); - + virtualMachineManagerImpl.hostAllocators = new ArrayList<>(); + + when(vmInstanceMock.getId()).thenReturn(1L); + when(vmInstanceMock.getServiceOfferingId()).thenReturn(2L); + when(vmInstanceMock.getInstanceName()).thenReturn("myVm"); + when(vmInstanceMock.getHostId()).thenReturn(2L); + when(vmInstanceMock.getType()).thenReturn(VirtualMachine.Type.User); + when(hostMock.getId()).thenReturn(1L); } @Test(expected = CloudRuntimeException.class) public void testScaleVM3() throws Exception { - - /*VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm); - - Long srcHostId = vm.getHostId(); - Long oldSvcOfferingId = vm.getServiceOfferingId(); - if (srcHostId == null) { - throw new CloudRuntimeException("Unable to scale the vm because it doesn't have a host id"); - }*/ - - when(_vmInstance.getHostId()).thenReturn(null); - when(_vmInstanceDao.findById(anyLong())).thenReturn(_vmInstance); - when(_vmInstanceDao.findByUuid(any(String.class))).thenReturn(_vmInstance); + when(vmInstanceMock.getHostId()).thenReturn(null); + when(vmInstanceDao.findById(anyLong())).thenReturn(vmInstanceMock); + when(vmInstanceDao.findByUuid(any(String.class))).thenReturn(vmInstanceMock); DeploymentPlanner.ExcludeList excludeHostList = new DeploymentPlanner.ExcludeList(); - _vmMgr.findHostAndMigrate(_vmInstance.getUuid(), 2l, excludeHostList); - - } - - private ServiceOfferingVO getSvcoffering(int ramSize) { - - String name = "name"; - String displayText = "displayText"; - int cpu = 1; - //int ramSize = 256; - int speed = 128; - - boolean ha = false; - boolean useLocalStorage = false; - - ServiceOfferingVO serviceOffering = - new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, ProvisioningType.THIN, useLocalStorage, false, null, false, null, false); - return serviceOffering; - } - - private void initializeMockConfigForMigratingVmWithVolumes() throws OperationTimedoutException, ResourceUnavailableException { - - // Mock the source and destination hosts. - when(_srcHostMock.getId()).thenReturn(5L); - when(_destHostMock.getId()).thenReturn(6L); - when(_hostDao.findById(5L)).thenReturn(_srcHostMock); - when(_hostDao.findById(6L)).thenReturn(_destHostMock); - - // Mock the vm being migrated. - when(_vmMock.getId()).thenReturn(1L); - when(_vmMock.getHypervisorType()).thenReturn(HypervisorType.XenServer); - when(_vmMock.getState()).thenReturn(State.Running).thenReturn(State.Running).thenReturn(State.Migrating).thenReturn(State.Migrating); - when(_vmMock.getHostId()).thenReturn(5L); - when(_vmInstance.getId()).thenReturn(1L); - when(_vmInstance.getServiceOfferingId()).thenReturn(2L); - when(_vmInstance.getInstanceName()).thenReturn("myVm"); - when(_vmInstance.getHostId()).thenReturn(5L); - when(_vmInstance.getType()).thenReturn(VirtualMachine.Type.User); - when(_vmInstance.getState()).thenReturn(State.Running).thenReturn(State.Running).thenReturn(State.Migrating).thenReturn(State.Migrating); - - // Mock the work item. - when(_workDao.persist(any(ItWorkVO.class))).thenReturn(_work); - when(_workDao.update("1", _work)).thenReturn(true); - when(_work.getId()).thenReturn("1"); - doNothing().when(_work).setStep(ItWorkVO.Step.Done); - - // Mock the vm guru and the user vm object that gets returned. - _vmMgr._vmGurus = new HashMap(); -// UserVmManagerImpl userVmManager = mock(UserVmManagerImpl.class); -// _vmMgr.registerGuru(VirtualMachine.Type.User, userVmManager); - - // Mock the iteration over all the volumes of an instance. - Iterator volumeIterator = mock(Iterator.class); - when(_volsDao.findUsableVolumesForInstance(anyLong())).thenReturn(_rootVols); - when(_rootVols.iterator()).thenReturn(volumeIterator); - when(volumeIterator.hasNext()).thenReturn(true, false); - when(volumeIterator.next()).thenReturn(_volumeMock); - - // Mock the disk offering and pool objects for a volume. - when(_volumeMock.getDiskOfferingId()).thenReturn(5L); - when(_volumeMock.getPoolId()).thenReturn(200L); - when(_volumeMock.getId()).thenReturn(5L); - when(_diskOfferingDao.findById(anyLong())).thenReturn(_diskOfferingMock); - when(_storagePoolDao.findById(200L)).thenReturn(_srcStoragePoolMock); - when(_storagePoolDao.findById(201L)).thenReturn(_destStoragePoolMock); - - // Mock the volume to pool mapping. - when(_volumeToPoolMock.get(5L)).thenReturn(201L); - when(_destStoragePoolMock.getId()).thenReturn(201L); - when(_srcStoragePoolMock.getId()).thenReturn(200L); - when(_destStoragePoolMock.isLocal()).thenReturn(false); - when(_diskOfferingMock.getUseLocalStorage()).thenReturn(false); - when(_poolHostDao.findByPoolHost(anyLong(), anyLong())).thenReturn(mock(StoragePoolHostVO.class)); - - // Mock hypervisor guru. - HypervisorGuru guruMock = mock(HypervisorGuru.class); - when(_hvGuruMgr.getGuru(HypervisorType.XenServer)).thenReturn(guruMock); - - when(_srcHostMock.getClusterId()).thenReturn(3L); - when(_destHostMock.getClusterId()).thenReturn(3L); - - // Mock the commands and answers to the agent. - PrepareForMigrationAnswer prepAnswerMock = mock(PrepareForMigrationAnswer.class); - when(prepAnswerMock.getResult()).thenReturn(true); - when(_agentMgr.send(anyLong(), isA(PrepareForMigrationCommand.class))).thenReturn(prepAnswerMock); - - MigrateWithStorageAnswer migAnswerMock = mock(MigrateWithStorageAnswer.class); - when(migAnswerMock.getResult()).thenReturn(true); - when(_agentMgr.send(anyLong(), isA(MigrateWithStorageCommand.class))).thenReturn(migAnswerMock); - - MigrateWithStorageReceiveAnswer migRecAnswerMock = mock(MigrateWithStorageReceiveAnswer.class); - when(migRecAnswerMock.getResult()).thenReturn(true); - when(_agentMgr.send(anyLong(), isA(MigrateWithStorageReceiveCommand.class))).thenReturn(migRecAnswerMock); - - MigrateWithStorageSendAnswer migSendAnswerMock = mock(MigrateWithStorageSendAnswer.class); - when(migSendAnswerMock.getResult()).thenReturn(true); - when(_agentMgr.send(anyLong(), isA(MigrateWithStorageSendCommand.class))).thenReturn(migSendAnswerMock); - - MigrateWithStorageCompleteAnswer migCompleteAnswerMock = mock(MigrateWithStorageCompleteAnswer.class); - when(migCompleteAnswerMock.getResult()).thenReturn(true); - when(_agentMgr.send(anyLong(), isA(MigrateWithStorageCompleteCommand.class))).thenReturn(migCompleteAnswerMock); - - CheckVirtualMachineAnswer checkVmAnswerMock = mock(CheckVirtualMachineAnswer.class); - when(checkVmAnswerMock.getResult()).thenReturn(true); - when(checkVmAnswerMock.getState()).thenReturn(PowerState.PowerOn); - when(_agentMgr.send(anyLong(), isA(CheckVirtualMachineCommand.class))).thenReturn(checkVmAnswerMock); - - // Mock the state transitions of vm. - Pair opaqueMock = new Pair(_vmMock.getHostId(), _destHostMock.getId()); - when(_vmSnapshotMgr.hasActiveVMSnapshotTasks(anyLong())).thenReturn(false); - when(_vmInstanceDao.updateState(State.Running, Event.MigrationRequested, State.Migrating, _vmMock, opaqueMock)).thenReturn(true); - when(_vmInstanceDao.updateState(State.Migrating, Event.OperationSucceeded, State.Running, _vmMock, opaqueMock)).thenReturn(true); - } - - // Check migration of a vm with its volumes within a cluster. - @Test - public void testMigrateWithVolumeWithinCluster() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, - VirtualMachineMigrationException, OperationTimedoutException { - - initializeMockConfigForMigratingVmWithVolumes(); - when(_srcHostMock.getClusterId()).thenReturn(3L); - when(_destHostMock.getClusterId()).thenReturn(3L); - - _vmMgr.migrateWithStorage(_vmInstance.getUuid(), _srcHostMock.getId(), _destHostMock.getId(), _volumeToPoolMock); - } - - // Check migration of a vm with its volumes across a cluster. - @Test - public void testMigrateWithVolumeAcrossCluster() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, - VirtualMachineMigrationException, OperationTimedoutException { - - initializeMockConfigForMigratingVmWithVolumes(); - when(_srcHostMock.getClusterId()).thenReturn(3L); - when(_destHostMock.getClusterId()).thenReturn(4L); - - _vmMgr.migrateWithStorage(_vmInstance.getUuid(), _srcHostMock.getId(), _destHostMock.getId(), _volumeToPoolMock); - } - - // Check migration of a vm fails when src and destination pool are not of same type; that is, one is shared and - // other is local. - @Test(expected = CloudRuntimeException.class) - public void testMigrateWithVolumeFail1() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, - VirtualMachineMigrationException, OperationTimedoutException { - - initializeMockConfigForMigratingVmWithVolumes(); - when(_srcHostMock.getClusterId()).thenReturn(3L); - when(_destHostMock.getClusterId()).thenReturn(3L); - - when(_destStoragePoolMock.isLocal()).thenReturn(true); - when(_diskOfferingMock.getUseLocalStorage()).thenReturn(false); - - _vmMgr.migrateWithStorage(_vmInstance.getUuid(), _srcHostMock.getId(), _destHostMock.getId(), _volumeToPoolMock); - } - - // Check migration of a vm fails when vm is not in Running state. - @Test(expected = ConcurrentOperationException.class) - public void testMigrateWithVolumeFail2() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, - VirtualMachineMigrationException, OperationTimedoutException { - - initializeMockConfigForMigratingVmWithVolumes(); - when(_srcHostMock.getClusterId()).thenReturn(3L); - when(_destHostMock.getClusterId()).thenReturn(3L); - - when(_vmMock.getState()).thenReturn(State.Stopped); - - _vmMgr.migrateWithStorage(_vmInstance.getUuid(), _srcHostMock.getId(), _destHostMock.getId(), _volumeToPoolMock); + virtualMachineManagerImpl.findHostAndMigrate(vmInstanceMock.getUuid(), 2l, excludeHostList); } @Test @@ -479,9 +101,9 @@ public void testSendStopWithOkAnswer() throws Exception { StopAnswer answer = new StopAnswer(new StopCommand(vm, false, false), "ok", true); when(profile.getVirtualMachine()).thenReturn(vm); when(vm.getHostId()).thenReturn(1L); - when(_agentMgr.send(anyLong(), (Command)any())).thenReturn(answer); + when(agentManagerMock.send(anyLong(), (Command)any())).thenReturn(answer); - boolean actual = _vmMgr.sendStop(guru, profile, false, false); + boolean actual = virtualMachineManagerImpl.sendStop(guru, profile, false, false); Assert.assertTrue(actual); } @@ -494,9 +116,9 @@ public void testSendStopWithFailAnswer() throws Exception { StopAnswer answer = new StopAnswer(new StopCommand(vm, false, false), "fail", false); when(profile.getVirtualMachine()).thenReturn(vm); when(vm.getHostId()).thenReturn(1L); - when(_agentMgr.send(anyLong(), (Command)any())).thenReturn(answer); + when(agentManagerMock.send(anyLong(), (Command)any())).thenReturn(answer); - boolean actual = _vmMgr.sendStop(guru, profile, false, false); + boolean actual = virtualMachineManagerImpl.sendStop(guru, profile, false, false); Assert.assertFalse(actual); } @@ -508,38 +130,38 @@ public void testSendStopWithNullAnswer() throws Exception { VirtualMachineProfile profile = mock(VirtualMachineProfile.class); when(profile.getVirtualMachine()).thenReturn(vm); when(vm.getHostId()).thenReturn(1L); - when(_agentMgr.send(anyLong(), (Command)any())).thenReturn(null); + when(agentManagerMock.send(anyLong(), (Command)any())).thenReturn(null); - boolean actual = _vmMgr.sendStop(guru, profile, false, false); + boolean actual = virtualMachineManagerImpl.sendStop(guru, profile, false, false); Assert.assertFalse(actual); } @Test public void testExeceuteInSequence() { - assertTrue(_vmMgr.getExecuteInSequence(HypervisorType.XenServer) == false); - assertTrue(_vmMgr.getExecuteInSequence(HypervisorType.KVM) == false); - assertTrue(_vmMgr.getExecuteInSequence(HypervisorType.VMware) == HypervisorGuru.VmwareFullClone.value()); - assertTrue(_vmMgr.getExecuteInSequence(HypervisorType.Ovm3) == VirtualMachineManager.ExecuteInSequence.value()); + assertTrue(virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.XenServer) == false); + assertTrue(virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.KVM) == false); + assertTrue(virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.VMware) == HypervisorGuru.VmwareFullClone.value()); + assertTrue(virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.Ovm3) == VirtualMachineManager.ExecuteInSequence.value()); } @Test public void testCheckIfCanUpgrade() throws Exception { - when(_vmInstance.getState()).thenReturn(State.Stopped); - when(_serviceOfferingMock.isDynamic()).thenReturn(true); - when(_vmInstance.getServiceOfferingId()).thenReturn(1l); - when(_serviceOfferingMock.getId()).thenReturn(2l); + when(vmInstanceMock.getState()).thenReturn(State.Stopped); + when(serviceOfferingMock.isDynamic()).thenReturn(true); + when(vmInstanceMock.getServiceOfferingId()).thenReturn(1l); + when(serviceOfferingMock.getId()).thenReturn(2l); ServiceOfferingVO mockCurrentServiceOffering = mock(ServiceOfferingVO.class); - when(_offeringDao.findByIdIncludingRemoved(anyLong(), anyLong())).thenReturn(mockCurrentServiceOffering); + when(serviceOfferingDao.findByIdIncludingRemoved(anyLong(), anyLong())).thenReturn(mockCurrentServiceOffering); when(mockCurrentServiceOffering.getUseLocalStorage()).thenReturn(true); - when(_serviceOfferingMock.getUseLocalStorage()).thenReturn(true); + when(serviceOfferingMock.getUseLocalStorage()).thenReturn(true); when(mockCurrentServiceOffering.getSystemUse()).thenReturn(true); - when(_serviceOfferingMock.getSystemUse()).thenReturn(true); + when(serviceOfferingMock.getSystemUse()).thenReturn(true); when(mockCurrentServiceOffering.getTags()).thenReturn("x,y"); - when(_serviceOfferingMock.getTags()).thenReturn("z,x,y"); + when(serviceOfferingMock.getTags()).thenReturn("z,x,y"); - _vmMgr.checkIfCanUpgrade(_vmInstance, _serviceOfferingMock); + virtualMachineManagerImpl.checkIfCanUpgrade(vmInstanceMock, serviceOfferingMock); } } diff --git a/engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java b/engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java index b4d2f6f785f3..a4341380ddc4 100644 --- a/engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java @@ -18,7 +18,7 @@ import java.util.List; - +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -66,6 +66,9 @@ public List listAllByHypervisorType(HypervisorType hyp @Override public HypervisorCapabilitiesVO findByHypervisorTypeAndVersion(HypervisorType hypervisorType, String hypervisorVersion) { + if (StringUtils.isBlank(hypervisorVersion)) { + hypervisorVersion = DEFAULT_VERSION; + } SearchCriteria sc = HypervisorTypeAndVersionSearch.create(); sc.setParameters("hypervisorType", hypervisorType); sc.setParameters("hypervisorVersion", hypervisorVersion); @@ -76,11 +79,13 @@ public HypervisorCapabilitiesVO findByHypervisorTypeAndVersion(HypervisorType hy public Long getMaxGuestsLimit(HypervisorType hypervisorType, String hypervisorVersion) { Long defaultLimit = new Long(50); HypervisorCapabilitiesVO result = getCapabilities(hypervisorType, hypervisorVersion); - if (result == null) + if (result == null) { return defaultLimit; + } Long limit = result.getMaxGuestsLimit(); - if (limit == null) + if (limit == null) { return defaultLimit; + } return limit; } diff --git a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java index 3cd59055774e..fee9dc28bd02 100644 --- a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java +++ b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java @@ -231,23 +231,21 @@ public List listLocalStoragePoolByPath(long datacenterId, String @Override public List listBy(long datacenterId, Long podId, Long clusterId, ScopeType scope) { + SearchCriteria sc = null; if (clusterId != null) { - SearchCriteria sc = DcPodSearch.create(); - sc.setParameters("datacenterId", datacenterId); - sc.setParameters("podId", podId); - sc.setParameters("status", Status.Up); - sc.setParameters("scope", scope); - + sc = DcPodSearch.create(); sc.setParameters("cluster", clusterId); - return listBy(sc); } else { - SearchCriteria sc = DcPodAnyClusterSearch.create(); - sc.setParameters("datacenterId", datacenterId); - sc.setParameters("podId", podId); - sc.setParameters("status", Status.Up); + sc = DcPodAnyClusterSearch.create(); + + } + sc.setParameters("datacenterId", datacenterId); + sc.setParameters("podId", podId); + sc.setParameters("status", Status.Up); + if (scope != null) { sc.setParameters("scope", scope); - return listBy(sc); } + return listBy(sc); } @Override diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java index b040c74c28c8..6e9c682e9701 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java @@ -48,11 +48,6 @@ public class ClusterScopeStoragePoolAllocator extends AbstractStoragePoolAllocat protected List select(DiskProfile dskCh, VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid, int returnUpTo) { s_logger.debug("ClusterScopeStoragePoolAllocator looking for storage pool"); - if (dskCh.useLocalStorage()) { - // cluster wide allocator should bail out in case of local disk - return null; - } - List suitablePools = new ArrayList(); long dcId = plan.getDataCenterId(); diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java index 56c912d29c12..56a6b77b4076 100644 --- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java +++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java @@ -140,15 +140,15 @@ import org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCmd; import org.apache.cloudstack.api.command.admin.offering.UpdateDiskOfferingCmd; import org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCmd; +import org.apache.cloudstack.api.command.admin.outofbandmanagement.ChangeOutOfBandManagementPasswordCmd; +import org.apache.cloudstack.api.command.admin.outofbandmanagement.ConfigureOutOfBandManagementCmd; import org.apache.cloudstack.api.command.admin.outofbandmanagement.DisableOutOfBandManagementForClusterCmd; import org.apache.cloudstack.api.command.admin.outofbandmanagement.DisableOutOfBandManagementForHostCmd; import org.apache.cloudstack.api.command.admin.outofbandmanagement.DisableOutOfBandManagementForZoneCmd; import org.apache.cloudstack.api.command.admin.outofbandmanagement.EnableOutOfBandManagementForClusterCmd; import org.apache.cloudstack.api.command.admin.outofbandmanagement.EnableOutOfBandManagementForHostCmd; import org.apache.cloudstack.api.command.admin.outofbandmanagement.EnableOutOfBandManagementForZoneCmd; -import org.apache.cloudstack.api.command.admin.outofbandmanagement.ConfigureOutOfBandManagementCmd; import org.apache.cloudstack.api.command.admin.outofbandmanagement.IssueOutOfBandManagementPowerActionCmd; -import org.apache.cloudstack.api.command.admin.outofbandmanagement.ChangeOutOfBandManagementPasswordCmd; import org.apache.cloudstack.api.command.admin.pod.CreatePodCmd; import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd; import org.apache.cloudstack.api.command.admin.pod.ListPodsByCmd; @@ -519,7 +519,6 @@ import org.apache.cloudstack.config.Configuration; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService; -import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.cloudstack.framework.config.ConfigKey; @@ -535,6 +534,8 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.utils.identity.ManagementServerNode; import org.apache.commons.codec.binary.Base64; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; @@ -696,7 +697,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe public static final Logger s_logger = Logger.getLogger(ManagementServerImpl.class.getName()); static final ConfigKey vmPasswordLength = new ConfigKey("Advanced", Integer.class, "vm.password.length", "6", - "Specifies the length of a randomly generated password", false); + "Specifies the length of a randomly generated password", false); static final ConfigKey sshKeyLength = new ConfigKey("Advanced", Integer.class, "ssh.key.length", "2048", "Specifies custom SSH key length (bit)", true, ConfigKey.Scope.Global); @Inject @@ -794,8 +795,6 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe @Inject private HighAvailabilityManager _haMgr; @Inject - private DataStoreManager dataStoreMgr; - @Inject private HostTagsDao _hostTagsDao; @Inject private ConfigDepot _configDepot; @@ -809,12 +808,12 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe private DeploymentPlanningManager _dpMgr; @Inject private GuestOsDetailsDao _guestOsDetailsDao; + @Inject + private KeystoreManager _ksMgr; private LockMasterListener _lockMasterListener; private final ScheduledExecutorService _eventExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("EventChecker")); private final ScheduledExecutorService _alertExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("AlertChecker")); - @Inject - private KeystoreManager _ksMgr; private Map _configs; @@ -1127,9 +1126,9 @@ public Pair, Integer> searchForServers(final ListHostsCmd c @Override public Ternary, Integer>, List, Map> - listHostsForMigrationOfVM(final Long vmId, - final Long startIndex, - final Long pageSize, final String keyword) { + listHostsForMigrationOfVM(final Long vmId, + final Long startIndex, + final Long pageSize, final String keyword) { final Account caller = getCaller(); if (!_accountMgr.isRootAdmin(caller.getId())) { if (s_logger.isDebugEnabled()) { @@ -1224,14 +1223,14 @@ public Pair, Integer> searchForServers(final ListHostsCmd c allHosts.remove(srcHost); for (final VolumeVO volume : volumes) { - final StoragePool storagePool = _poolDao.findById(volume.getPoolId()); - final Long volClusterId = storagePool.getClusterId(); + StoragePool storagePool = _poolDao.findById(volume.getPoolId()); + Long volClusterId = storagePool.getClusterId(); - for (final Iterator iterator = allHosts.iterator(); iterator.hasNext();) { + for (Iterator iterator = allHosts.iterator(); iterator.hasNext();) { final Host host = iterator.next(); if (volClusterId != null) { - if (!host.getClusterId().equals(volClusterId) || usesLocal) { + if (storagePool.isLocal() || !host.getClusterId().equals(volClusterId) || usesLocal) { if (storagePool.isManaged()) { // At the time being, we do not support storage migration of a volume from managed storage unless the managed storage // is at the zone level and the source and target storage pool is the same. @@ -1346,8 +1345,8 @@ public Pair, List> listStorag } // Volume must be attached to an instance for live migration. - final List allPools = new ArrayList(); - final List suitablePools = new ArrayList(); + List allPools = new ArrayList(); + List suitablePools = new ArrayList(); // Volume must be in Ready state to be migrated. if (!Volume.State.Ready.equals(volume.getState())) { @@ -1355,11 +1354,6 @@ public Pair, List> listStorag return new Pair, List>(allPools, suitablePools); } - if (!_volumeMgr.volumeOnSharedStoragePool(volume)) { - s_logger.info("Volume " + volume + " is on local storage. It cannot be migrated to another pool."); - return new Pair, List>(allPools, suitablePools); - } - final Long instanceId = volume.getInstanceId(); VMInstanceVO vm = null; if (instanceId != null) { @@ -1397,55 +1391,78 @@ public Pair, List> listStorag } } - // Source pool of the volume. - final StoragePoolVO srcVolumePool = _poolDao.findById(volume.getPoolId()); - // Get all the pools available. Only shared pools are considered because only a volume on a shared pools - // can be live migrated while the virtual machine stays on the same host. + StoragePool srcVolumePool = _poolDao.findById(volume.getPoolId()); + allPools = getAllStoragePoolCompatileWithVolumeSourceStoragePool(srcVolumePool); + allPools.remove(srcVolumePool); + suitablePools = findAllSuitableStoragePoolsForVm(volume, vm, srcVolumePool); - List storagePools; + return new Pair, List>(allPools, suitablePools); + } - if (srcVolumePool.getClusterId() != null) { - storagePools = _poolDao.findPoolsByTags(volume.getDataCenterId(), srcVolumePool.getPodId(), srcVolumePool.getClusterId(), null); + + /** + * This method looks for all storage pools that are compatible with the given volume. + *
    + *
  • We will look for storage systems that are zone wide.
    • + *
  • We also all storage available filtering by data center, pod and cluster as the current storage pool used by the given volume.
    • + *
+ */ + private List getAllStoragePoolCompatileWithVolumeSourceStoragePool(StoragePool srcVolumePool) { + List storagePools = new ArrayList<>(); + List zoneWideStoragePools = _poolDao.findZoneWideStoragePoolsByTags(srcVolumePool.getDataCenterId(), null); + if(CollectionUtils.isNotEmpty(zoneWideStoragePools)) { + storagePools.addAll(zoneWideStoragePools); } - else { - storagePools = new ArrayList<>(); + List clusterAndLocalStoragePools = _poolDao.listBy(srcVolumePool.getDataCenterId(), srcVolumePool.getPodId(), srcVolumePool.getClusterId(), null); + if(CollectionUtils.isNotEmpty(clusterAndLocalStoragePools)) { + storagePools.addAll(clusterAndLocalStoragePools); } + return storagePools; + } - List zoneWideStoragePools = _poolDao.findZoneWideStoragePoolsByTags(volume.getDataCenterId(), null); - - storagePools.addAll(zoneWideStoragePools); + /** + * Looks for all suitable storage pools to allocate the given volume. + * We take into account the service offering of the VM and volume to find suitable storage pools. It is also excluded from the search the current storage pool used by the volume. + * We use {@link StoragePoolAllocator} to look for possible storage pools to allocate the given volume. We will look for possible local storage poosl even if the volume is using a shared storage disk offering. + * + * Side note: the idea behind this method is to provide power for administrators of manually overriding deployments defined by CloudStack. + */ + private List findAllSuitableStoragePoolsForVm(final VolumeVO volume, VMInstanceVO vm, StoragePool srcVolumePool) { + List suitablePools = new ArrayList<>(); - storagePools.remove(srcVolumePool); - for (final StoragePoolVO pool : storagePools) { - if (pool.isShared()) { - allPools.add((StoragePool)dataStoreMgr.getPrimaryDataStore(pool.getId())); - } + HostVO host = _hostDao.findById(vm.getHostId()); + if (host == null) { + host = _hostDao.findById(vm.getLastHostId()); } - // Get all the suitable pools. - // Exclude the current pool from the list of pools to which the volume can be migrated. - final ExcludeList avoid = new ExcludeList(); + ExcludeList avoid = new ExcludeList(); avoid.addPool(srcVolumePool.getId()); - // Volume stays in the same cluster after migration. - final DataCenterDeployment plan = new DataCenterDeployment(volume.getDataCenterId(), srcVolumePool.getPodId(), srcVolumePool.getClusterId(), null, null, null); - final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm); + DataCenterDeployment plan = new DataCenterDeployment(volume.getDataCenterId(), srcVolumePool.getPodId(), srcVolumePool.getClusterId(), null, null, null); + VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm); - final DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId()); - final DiskProfile diskProfile = new DiskProfile(volume, diskOffering, profile.getHypervisorType()); + DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId()); + //This is an override mechanism so we can list the possible local storage pools that a volume in a shared pool might be able to be migrated to + DiskProfile diskProfile = new DiskProfile(volume, diskOffering, profile.getHypervisorType()); + diskProfile.setUseLocalStorage(true); - // Call the storage pool allocator to find the list of storage pools. - for (final StoragePoolAllocator allocator : _storagePoolAllocators) { - final List pools = allocator.allocateToPool(diskProfile, profile, plan, avoid, StoragePoolAllocator.RETURN_UPTO_ALL); - if (pools != null && !pools.isEmpty()) { - suitablePools.addAll(pools); - break; + for (StoragePoolAllocator allocator : _storagePoolAllocators) { + List pools = allocator.allocateToPool(diskProfile, profile, plan, avoid, StoragePoolAllocator.RETURN_UPTO_ALL); + if (CollectionUtils.isEmpty(pools)) { + continue; } - } + for (StoragePool pool : pools) { + boolean isLocalPoolSameHostAsSourcePool = pool.isLocal() && StringUtils.equals(host.getPrivateIpAddress(), pool.getHostAddress()); + if (isLocalPoolSameHostAsSourcePool || pool.isShared()) { + suitablePools.add(pool); + } - return new Pair, List>(allPools, suitablePools); + } + } + return suitablePools; } + private Pair, Integer> searchForServers(final Long startIndex, final Long pageSize, final Object name, final Object type, final Object state, final Object zone, final Object pod, final Object cluster, final Object id, final Object keyword, final Object resourceState, final Object haHosts, final Object hypervisorType, final Object hypervisorVersion) { final Filter searchFilter = new Filter(HostVO.class, "id", Boolean.TRUE, startIndex, pageSize); @@ -1888,10 +1905,8 @@ public Pair, Integer> searchForIPAddresses(final ListP vlanSearch.and("vlanType", vlanSearch.entity().getVlanType(), SearchCriteria.Op.EQ); sb.join("vlanSearch", vlanSearch, sb.entity().getVlanId(), vlanSearch.entity().getId(), JoinBuilder.JoinType.INNER); - boolean allocatedOnly = false; if (isAllocated != null && isAllocated == true) { sb.and("allocated", sb.entity().getAllocatedTime(), SearchCriteria.Op.NNULL); - allocatedOnly = true; } VlanType vlanType = null; @@ -2149,7 +2164,7 @@ public GuestOS addGuestOs(final AddGuestOsCmd cmd) { if(cmd.getDetails() != null && !cmd.getDetails().isEmpty()){ Map detailsMap = cmd.getDetails(); for(Object key: detailsMap.keySet()){ - _guestOsDetailsDao.addDetail(guestOsPersisted.getId(),(String) key,detailsMap.get((String) key), false); + _guestOsDetailsDao.addDetail(guestOsPersisted.getId(),(String) key,detailsMap.get(key), false); } } @@ -2182,7 +2197,7 @@ public GuestOS updateGuestOs(final UpdateGuestOsCmd cmd) { if(cmd.getDetails() != null && !cmd.getDetails().isEmpty()){ Map detailsMap = cmd.getDetails(); for(Object key: detailsMap.keySet()){ - _guestOsDetailsDao.addDetail(id,(String) key,detailsMap.get((String) key), false); + _guestOsDetailsDao.addDetail(id,(String) key,detailsMap.get(key), false); } } diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java index 69dfd1d86f35..2ac317c660f9 100644 --- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java @@ -16,6 +16,70 @@ // under the License. package com.cloud.storage; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ExecutionException; + +import javax.inject.Inject; + +import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.GetUploadParamsForVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd; +import org.apache.cloudstack.api.response.GetUploadParamsResponse; +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService; +import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; +import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; +import org.apache.cloudstack.engine.subsystem.api.storage.HostScope; +import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.Scope; +import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService.VolumeApiResult; +import org.apache.cloudstack.framework.async.AsyncCallFuture; +import org.apache.cloudstack.framework.config.ConfigKey; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.framework.jobs.AsyncJob; +import org.apache.cloudstack.framework.jobs.AsyncJobExecutionContext; +import org.apache.cloudstack.framework.jobs.AsyncJobManager; +import org.apache.cloudstack.framework.jobs.Outcome; +import org.apache.cloudstack.framework.jobs.dao.VmWorkJobDao; +import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO; +import org.apache.cloudstack.framework.jobs.impl.OutcomeImpl; +import org.apache.cloudstack.framework.jobs.impl.VmWorkJobVO; +import org.apache.cloudstack.jobs.JobInfo; +import org.apache.cloudstack.storage.command.AttachAnswer; +import org.apache.cloudstack.storage.command.AttachCommand; +import org.apache.cloudstack.storage.command.DettachCommand; +import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; +import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO; +import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity; +import org.apache.cloudstack.utils.identity.ManagementServerNode; +import org.apache.cloudstack.utils.imagestore.ImageStoreUtil; +import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo; +import org.apache.log4j.Logger; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; + import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.ModifyTargetsCommand; @@ -26,7 +90,6 @@ import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.Resource.ResourceType; import com.cloud.dc.ClusterDetailsDao; -import com.cloud.dc.ClusterVO; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenterVO; import com.cloud.dc.dao.DataCenterDao; @@ -53,7 +116,6 @@ import com.cloud.storage.dao.SnapshotDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; -import com.cloud.storage.dao.VolumeDetailsDao; import com.cloud.storage.snapshot.SnapshotApiService; import com.cloud.storage.snapshot.SnapshotManager; import com.cloud.template.TemplateManager; @@ -111,150 +173,82 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonParseException; -import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd; -import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd; -import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd; -import org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd; -import org.apache.cloudstack.api.command.user.volume.GetUploadParamsForVolumeCmd; -import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd; -import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd; -import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd; -import org.apache.cloudstack.api.response.GetUploadParamsResponse; -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService; -import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo; -import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; -import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; -import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; -import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; -import org.apache.cloudstack.engine.subsystem.api.storage.HostScope; -import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo; -import org.apache.cloudstack.engine.subsystem.api.storage.Scope; -import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; -import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; -import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; -import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService; -import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService.VolumeApiResult; -import org.apache.cloudstack.framework.async.AsyncCallFuture; -import org.apache.cloudstack.framework.config.ConfigKey; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.cloudstack.framework.jobs.AsyncJob; -import org.apache.cloudstack.framework.jobs.AsyncJobExecutionContext; -import org.apache.cloudstack.framework.jobs.AsyncJobManager; -import org.apache.cloudstack.framework.jobs.Outcome; -import org.apache.cloudstack.framework.jobs.dao.VmWorkJobDao; -import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO; -import org.apache.cloudstack.framework.jobs.impl.OutcomeImpl; -import org.apache.cloudstack.framework.jobs.impl.VmWorkJobVO; -import org.apache.cloudstack.jobs.JobInfo; -import org.apache.cloudstack.storage.command.AttachAnswer; -import org.apache.cloudstack.storage.command.AttachCommand; -import org.apache.cloudstack.storage.command.DettachCommand; -import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; -import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao; -import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; -import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao; -import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO; -import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity; -import org.apache.cloudstack.utils.identity.ManagementServerNode; -import org.apache.cloudstack.utils.imagestore.ImageStoreUtil; -import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo; -import org.apache.log4j.Logger; -import org.joda.time.DateTime; -import org.joda.time.DateTimeZone; - -import javax.inject.Inject; - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ExecutionException; - public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiService, VmWorkJobHandler { private final static Logger s_logger = Logger.getLogger(VolumeApiServiceImpl.class); public static final String VM_WORK_JOB_HANDLER = VolumeApiServiceImpl.class.getSimpleName(); @Inject - VolumeOrchestrationService _volumeMgr; - @Inject - EntityManager _entityMgr; + private UserVmManager _userVmMgr; @Inject - AgentManager _agentMgr; + private VolumeOrchestrationService _volumeMgr; @Inject - TemplateManager _tmpltMgr; + private EntityManager _entityMgr; @Inject - SnapshotManager _snapshotMgr; + private AgentManager _agentMgr; @Inject - AccountManager _accountMgr; + private TemplateManager _tmpltMgr; @Inject - ConfigurationManager _configMgr; + private SnapshotManager _snapshotMgr; @Inject - VolumeDao _volsDao; + private AccountManager _accountMgr; @Inject - VolumeDetailsDao _volDetailDao; + private ConfigurationManager _configMgr; @Inject - HostDao _hostDao; + private VolumeDao _volsDao; @Inject - SnapshotDao _snapshotDao; + private HostDao _hostDao; @Inject - ServiceOfferingDetailsDao _serviceOfferingDetailsDao; + private SnapshotDao _snapshotDao; @Inject - StoragePoolDetailsDao storagePoolDetailsDao; + private ServiceOfferingDetailsDao _serviceOfferingDetailsDao; @Inject - UserVmDao _userVmDao; + private UserVmDao _userVmDao; @Inject - UserVmService _userVmService; + private UserVmService _userVmService; @Inject - VolumeDataStoreDao _volumeStoreDao; + private VolumeDataStoreDao _volumeStoreDao; @Inject - VMInstanceDao _vmInstanceDao; + private VMInstanceDao _vmInstanceDao; @Inject - PrimaryDataStoreDao _storagePoolDao; + private PrimaryDataStoreDao _storagePoolDao; @Inject - DiskOfferingDao _diskOfferingDao; + private DiskOfferingDao _diskOfferingDao; @Inject - AccountDao _accountDao; + private AccountDao _accountDao; @Inject - DataCenterDao _dcDao = null; + private DataCenterDao _dcDao; @Inject - VMTemplateDao _templateDao; + private VMTemplateDao _templateDao; @Inject - ResourceLimitService _resourceLimitMgr; + private ResourceLimitService _resourceLimitMgr; @Inject - VmDiskStatisticsDao _vmDiskStatsDao; + private VmDiskStatisticsDao _vmDiskStatsDao; @Inject - VMSnapshotDao _vmSnapshotDao; + private VMSnapshotDao _vmSnapshotDao; @Inject - ConfigurationDao _configDao; + private ConfigurationDao _configDao; @Inject - DataStoreManager dataStoreMgr; + private DataStoreManager dataStoreMgr; @Inject - VolumeService volService; + private VolumeService volService; @Inject - VolumeDataFactory volFactory; + private VolumeDataFactory volFactory; @Inject - SnapshotApiService snapshotMgr; + private SnapshotApiService snapshotMgr; @Inject - UUIDManager _uuidMgr; + private UUIDManager _uuidMgr; @Inject - HypervisorCapabilitiesDao _hypervisorCapabilitiesDao; + private HypervisorCapabilitiesDao _hypervisorCapabilitiesDao; @Inject - AsyncJobManager _jobMgr; + private AsyncJobManager _jobMgr; @Inject - VmWorkJobDao _workJobDao; + private VmWorkJobDao _workJobDao; @Inject - ClusterDetailsDao _clusterDetailsDao; + private ClusterDetailsDao _clusterDetailsDao; @Inject - UserVmManager _userVmMgr; + private StorageManager storageMgr; + protected Gson _gson; - @Inject - StorageManager storageMgr; private List _storagePoolAllocators; @@ -358,13 +352,13 @@ public GetUploadParamsResponse doInTransaction(TransactionStatus status) throws response.setTimeout(expires); String key = _configDao.getValue(Config.SSVMPSK.key()); - /* - * encoded metadata using the post upload config key - */ + /* + * encoded metadata using the post upload config key + */ TemplateOrVolumePostUploadCommand command = - new TemplateOrVolumePostUploadCommand(vol.getId(), vol.getUuid(), volumeStore.getInstallPath(), cmd.getChecksum(), vol.getType().toString(), - vol.getName(), vol.getFormat().toString(), dataObject.getDataStore().getUri(), - dataObject.getDataStore().getRole().toString()); + new TemplateOrVolumePostUploadCommand(vol.getId(), vol.getUuid(), volumeStore.getInstallPath(), cmd.getChecksum(), vol.getType().toString(), + vol.getName(), vol.getFormat().toString(), dataObject.getDataStore().getUri(), + dataObject.getDataStore().getRole().toString()); command.setLocalPath(volumeStore.getLocalDownloadPath()); //using the existing max upload size configuration command.setProcessTimeout(NumbersUtil.parseLong(_configDao.getValue("vmware.package.ova.timeout"), 3600)); @@ -1149,7 +1143,7 @@ private void validateIops(Long minIops, Long maxIops) { } private VolumeVO orchestrateResizeVolume(long volumeId, long currentSize, long newSize, Long newMinIops, Long newMaxIops, - Integer newHypervisorSnapshotReserve, Long newDiskOfferingId, boolean shrinkOk) { + Integer newHypervisorSnapshotReserve, Long newDiskOfferingId, boolean shrinkOk) { VolumeVO volume = _volsDao.findById(volumeId); UserVmVO userVm = _userVmDao.findById(volume.getInstanceId()); StoragePoolVO storagePool = _storagePoolDao.findById(volume.getPoolId()); @@ -1411,7 +1405,7 @@ private Volume orchestrateAttachVolumeToVM(Long vmId, Long volumeId, Long device PrimaryDataStoreInfo primaryStore = (PrimaryDataStoreInfo)newVolumeOnPrimaryStorage.getDataStore(); if (primaryStore.isLocal()) { throw new CloudRuntimeException("Failed to attach local data volume " + volumeToAttach.getName() + " to VM " + vm.getDisplayName() - + " as migration of local data volume is not allowed"); + + " as migration of local data volume is not allowed"); } StoragePoolVO vmRootVolumePool = _storagePoolDao.findById(exstingVolumeOfVm.getPoolId()); @@ -1586,15 +1580,15 @@ public Volume attachVolumeToVM(Long vmId, Long volumeId, Long deviceId) { Object jobResult = _jobMgr.unmarshallResultObject(outcome.getJob()); if (jobResult != null) { - if (jobResult instanceof ConcurrentOperationException) + if (jobResult instanceof ConcurrentOperationException) { throw (ConcurrentOperationException)jobResult; - else if (jobResult instanceof InvalidParameterValueException) + } else if (jobResult instanceof InvalidParameterValueException) { throw (InvalidParameterValueException)jobResult; - else if (jobResult instanceof RuntimeException) + } else if (jobResult instanceof RuntimeException) { throw (RuntimeException)jobResult; - else if (jobResult instanceof Throwable) + } else if (jobResult instanceof Throwable) { throw new RuntimeException("Unexpected exception", (Throwable)jobResult); - else if (jobResult instanceof Long) { + } else if (jobResult instanceof Long) { vol = _volsDao.findById((Long)jobResult); } } @@ -1608,8 +1602,9 @@ public Volume updateVolume(long volumeId, String path, String state, Long storag VolumeVO volume = _volsDao.findById(volumeId); - if(volume == null) + if(volume == null) { throw new InvalidParameterValueException("The volume id doesn't exist"); + } if (path != null) { volume.setPath(path); @@ -1690,8 +1685,9 @@ private void saveUsageEvent(Volume volume, Boolean displayVolume){ } private boolean isVolumeDestroyed(Volume volume){ - if(volume.getState() == Volume.State.Destroy || volume.getState() == Volume.State.Expunging && volume.getState() == Volume.State.Expunged) + if(volume.getState() == Volume.State.Destroy || volume.getState() == Volume.State.Expunging && volume.getState() == Volume.State.Expunged) { return true; + } return false; } @@ -1792,13 +1788,13 @@ public Volume detachVolumeFromVM(DetachVolumeCmd cmmd) { Object jobResult = _jobMgr.unmarshallResultObject(outcome.getJob()); if (jobResult != null) { - if (jobResult instanceof ConcurrentOperationException) + if (jobResult instanceof ConcurrentOperationException) { throw (ConcurrentOperationException)jobResult; - else if (jobResult instanceof RuntimeException) + } else if (jobResult instanceof RuntimeException) { throw (RuntimeException)jobResult; - else if (jobResult instanceof Throwable) + } else if (jobResult instanceof Throwable) { throw new RuntimeException("Unexpected exception", (Throwable)jobResult); - else if (jobResult instanceof Long) { + } else if (jobResult instanceof Long) { vol = _volsDao.findById((Long) jobResult); } } @@ -2033,37 +2029,28 @@ public Volume migrateVolume(MigrateVolumeCmd cmd) { " as the storage pool is in maintenance mode."); } - if (_volumeMgr.volumeOnSharedStoragePool(vol)) { - if (destPool.isLocal()) { - throw new InvalidParameterValueException("Migration of volume from shared to local storage pool is not supported"); - } else { - // If the volume is attached to a running vm and the volume is on a shared storage pool, check - // to make sure that the destination storage pool is in the same cluster as the vm. - if (liveMigrateVolume && destPool.getClusterId() != null && srcClusterId != null) { - if (!srcClusterId.equals(destPool.getClusterId())) { - throw new InvalidParameterValueException("Cannot migrate a volume of a virtual machine to a storage pool in a different cluster"); - } + if (liveMigrateVolume && destPool.getClusterId() != null && srcClusterId != null) { + if (!srcClusterId.equals(destPool.getClusterId())) { + throw new InvalidParameterValueException("Cannot migrate a volume of a virtual machine to a storage pool in a different cluster"); + } + } + // In case of VMware, if ROOT volume is being cold-migrated, then ensure destination storage pool is in the same Datacenter as the VM. + if (vm != null && vm.getHypervisorType().equals(HypervisorType.VMware)) { + if (!liveMigrateVolume && vol.volumeType.equals(Volume.Type.ROOT)) { + Long hostId = vm.getHostId() != null ? vm.getHostId() : vm.getLastHostId(); + HostVO host = _hostDao.findById(hostId); + if (host != null) { + srcClusterId = host.getClusterId(); } - // In case of VMware, if ROOT volume is being cold-migrated, then ensure destination storage pool is in the same Datacenter as the VM. - if (vm != null && vm.getHypervisorType().equals(HypervisorType.VMware)) { - if (!liveMigrateVolume && vol.volumeType.equals(Volume.Type.ROOT)) { - Long hostId = vm.getHostId() != null ? vm.getHostId() : vm.getLastHostId(); - HostVO host = _hostDao.findById(hostId); - if (host != null) - srcClusterId = host.getClusterId(); - if (srcClusterId != null && destPool.getClusterId() != null && !srcClusterId.equals(destPool.getClusterId())) { - String srcDcName = _clusterDetailsDao.getVmwareDcName(srcClusterId); - String destDcName = _clusterDetailsDao.getVmwareDcName(destPool.getClusterId()); - if (srcDcName != null && destDcName != null && !srcDcName.equals(destDcName)) { - throw new InvalidParameterValueException("Cannot migrate ROOT volume of a stopped VM to a storage pool in a different VMware datacenter"); - } - } - updateMissingRootDiskController(vm, vol.getChainInfo()); + if (srcClusterId != null && destPool.getClusterId() != null && !srcClusterId.equals(destPool.getClusterId())) { + String srcDcName = _clusterDetailsDao.getVmwareDcName(srcClusterId); + String destDcName = _clusterDetailsDao.getVmwareDcName(destPool.getClusterId()); + if (srcDcName != null && destDcName != null && !srcDcName.equals(destDcName)) { + throw new InvalidParameterValueException("Cannot migrate ROOT volume of a stopped VM to a storage pool in a different VMware datacenter"); } } + updateMissingRootDiskController(vm, vol.getChainInfo()); } - } else { - throw new InvalidParameterValueException("Migration of volume from local storage pool is not supported"); } if (vm != null) { @@ -2093,12 +2080,13 @@ public Volume migrateVolume(MigrateVolumeCmd cmd) { Object jobResult = _jobMgr.unmarshallResultObject(outcome.getJob()); if (jobResult != null) { - if (jobResult instanceof ConcurrentOperationException) + if (jobResult instanceof ConcurrentOperationException) { throw (ConcurrentOperationException)jobResult; - else if (jobResult instanceof RuntimeException) + } else if (jobResult instanceof RuntimeException) { throw (RuntimeException)jobResult; - else if (jobResult instanceof Throwable) + } else if (jobResult instanceof Throwable) { throw new RuntimeException("Unexpected exception", (Throwable)jobResult); + } } // retrieve the migrated new volume from job result @@ -2175,8 +2163,9 @@ public Snapshot takeSnapshot(Long volumeId, Long policyId, Long snapshotId, Acco } VMInstanceVO vm = null; - if (volume.getInstanceId() != null) + if (volume.getInstanceId() != null) { vm = _vmInstanceDao.findById(volume.getInstanceId()); + } if (vm != null) { // serialize VM operation @@ -2205,12 +2194,13 @@ public Snapshot takeSnapshot(Long volumeId, Long policyId, Long snapshotId, Acco Object jobResult = _jobMgr.unmarshallResultObject(outcome.getJob()); if (jobResult != null) { - if (jobResult instanceof ConcurrentOperationException) + if (jobResult instanceof ConcurrentOperationException) { throw (ConcurrentOperationException)jobResult; - else if (jobResult instanceof ResourceAllocationException) + } else if (jobResult instanceof ResourceAllocationException) { throw (ResourceAllocationException)jobResult; - else if (jobResult instanceof Throwable) + } else if (jobResult instanceof Throwable) { throw new RuntimeException("Unexpected exception", (Throwable)jobResult); + } } return _snapshotDao.findById(snapshotId); @@ -2228,8 +2218,8 @@ else if (jobResult instanceof Throwable) } private Snapshot orchestrateTakeVolumeSnapshot(Long volumeId, Long policyId, Long snapshotId, Account account, - boolean quiescevm, Snapshot.LocationType locationType, boolean asyncBackup) - throws ResourceAllocationException { + boolean quiescevm, Snapshot.LocationType locationType, boolean asyncBackup) + throws ResourceAllocationException { VolumeInfo volume = volFactory.getVolume(volumeId); @@ -2449,12 +2439,13 @@ public String extractVolume(ExtractVolumeCmd cmd) { Object jobResult = _jobMgr.unmarshallResultObject(outcome.getJob()); if (jobResult != null) { - if (jobResult instanceof ConcurrentOperationException) + if (jobResult instanceof ConcurrentOperationException) { throw (ConcurrentOperationException)jobResult; - else if (jobResult instanceof RuntimeException) + } else if (jobResult instanceof RuntimeException) { throw (RuntimeException)jobResult; - else if (jobResult instanceof Throwable) + } else if (jobResult instanceof Throwable) { throw new RuntimeException("Unexpected exception", (Throwable)jobResult); + } } // retrieve the entity url from job result @@ -2523,24 +2514,6 @@ public boolean isDisplayResourceEnabled(Long id) { return volume.isDisplayVolume(); } - private String getFormatForPool(StoragePool pool) { - ClusterVO cluster = ApiDBUtils.findClusterById(pool.getClusterId()); - - if (cluster.getHypervisorType() == HypervisorType.XenServer) { - return "vhd"; - } else if (cluster.getHypervisorType() == HypervisorType.KVM) { - return "qcow2"; - } else if (cluster.getHypervisorType() == HypervisorType.Hyperv) { - return "vhdx"; - } else if (cluster.getHypervisorType() == HypervisorType.VMware) { - return "ova"; - } else if (cluster.getHypervisorType() == HypervisorType.Ovm) { - return "raw"; - } else { - return null; - } - } - private boolean needMoveVolume(VolumeVO existingVolume, VolumeInfo newVolume) { if (existingVolume == null || existingVolume.getPoolId() == null || newVolume.getPoolId() == null) { return false; @@ -2832,7 +2805,6 @@ private Long getDeviceId(UserVmVO vm, Long deviceId) { @Override public boolean configure(String name, Map params) { - String maxVolumeSizeInGbString = _configDao.getValue(Config.MaxVolumeSize.toString()); _maxVolumeSizeInGb = NumbersUtil.parseLong(maxVolumeSizeInGbString, 2000); return true; @@ -2848,15 +2820,15 @@ public void setStoragePoolAllocators(List storagePoolAlloc } public class VmJobVolumeUrlOutcome extends OutcomeImpl { - public VmJobVolumeUrlOutcome(final AsyncJob job) { super(String.class, job, VmJobCheckInterval.value(), new Predicate() { @Override public boolean checkCondition() { AsyncJobVO jobVo = _entityMgr.findById(AsyncJobVO.class, job.getId()); assert (jobVo != null); - if (jobVo == null || jobVo.getStatus() != JobInfo.Status.IN_PROGRESS) + if (jobVo == null || jobVo.getStatus() != JobInfo.Status.IN_PROGRESS) { return true; + } return false; } @@ -2873,8 +2845,9 @@ public VmJobVolumeOutcome(final AsyncJob job, final long volumeId) { public boolean checkCondition() { AsyncJobVO jobVo = _entityMgr.findById(AsyncJobVO.class, job.getId()); assert (jobVo != null); - if (jobVo == null || jobVo.getStatus() != JobInfo.Status.IN_PROGRESS) + if (jobVo == null || jobVo.getStatus() != JobInfo.Status.IN_PROGRESS) { return true; + } return false; } @@ -2897,8 +2870,9 @@ public VmJobSnapshotOutcome(final AsyncJob job, final long snapshotId) { public boolean checkCondition() { AsyncJobVO jobVo = _entityMgr.findById(AsyncJobVO.class, job.getId()); assert (jobVo != null); - if (jobVo == null || jobVo.getStatus() != JobInfo.Status.IN_PROGRESS) + if (jobVo == null || jobVo.getStatus() != JobInfo.Status.IN_PROGRESS) { return true; + } return false; } @@ -2980,8 +2954,8 @@ public Outcome detachVolumeFromVmThroughJobQueue(final Long vmId, final } public Outcome resizeVolumeThroughJobQueue(final Long vmId, final long volumeId, final long currentSize, final long newSize, - final Long newMinIops, final Long newMaxIops, final Integer newHypervisorSnapshotReserve, - final Long newServiceOfferingId, final boolean shrinkOk) { + final Long newMinIops, final Long newMaxIops, final Integer newHypervisorSnapshotReserve, + final Long newServiceOfferingId, final boolean shrinkOk) { final CallContext context = CallContext.current(); final User callingUser = context.getCallingUser(); final Account callingAccount = context.getCallingAccount(); @@ -3102,7 +3076,7 @@ public Outcome takeVolumeSnapshotThroughJobQueue(final Long vmId, fina // save work context info (there are some duplications) VmWorkTakeVolumeSnapshot workInfo = new VmWorkTakeVolumeSnapshot( callingUser.getId(), accountId != null ? accountId : callingAccount.getId(), vm.getId(), - VolumeApiServiceImpl.VM_WORK_JOB_HANDLER, volumeId, policyId, snapshotId, quiesceVm, locationType, asyncBackup); + VolumeApiServiceImpl.VM_WORK_JOB_HANDLER, volumeId, policyId, snapshotId, quiesceVm, locationType, asyncBackup); workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo)); _jobMgr.submitAsyncJob(workJob, VmWorkConstants.VM_WORK_QUEUE, vm.getId()); diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index dab741c3c274..722f8c249013 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -4995,21 +4995,22 @@ public VirtualMachine vmStorageMigration(Long vmId, StoragePool destPool) { private boolean isVMUsingLocalStorage(VMInstanceVO vm) { boolean usesLocalStorage = false; - ServiceOfferingVO svcOffering = _serviceOfferingDao.findById(vm.getId(), vm.getServiceOfferingId()); - if (svcOffering.getUseLocalStorage()) { - usesLocalStorage = true; - } else { - List volumes = _volsDao.findByInstanceAndType(vm.getId(), Volume.Type.DATADISK); - for (VolumeVO vol : volumes) { - DiskOfferingVO diskOffering = _diskOfferingDao.findById(vol.getDiskOfferingId()); - if (diskOffering.getUseLocalStorage()) { - usesLocalStorage = true; - break; - } + + List volumes = _volsDao.findByInstance(vm.getId()); + for (VolumeVO vol : volumes) { + DiskOfferingVO diskOffering = _diskOfferingDao.findById(vol.getDiskOfferingId()); + if (diskOffering.getUseLocalStorage()) { + usesLocalStorage = true; + break; + } + StoragePoolVO storagePool = _storagePoolDao.findById(vol.getPoolId()); + if (storagePool.isLocal()) { + usesLocalStorage = true; + break; } } return usesLocalStorage; - } +} @Override @ActionEvent(eventType = EventTypes.EVENT_VM_MIGRATE, eventDescription = "migrating VM", async = true) diff --git a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java index 16f39bcddff0..286ec3cb7a7e 100644 --- a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java +++ b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java @@ -16,32 +16,21 @@ // under the License. package com.cloud.storage; -import com.cloud.dc.DataCenterVO; -import com.cloud.dc.dao.DataCenterDao; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.org.Grouping; -import com.cloud.serializer.GsonHelper; -import com.cloud.storage.dao.VolumeDao; -import com.cloud.user.Account; -import com.cloud.user.AccountManager; -import com.cloud.user.AccountVO; -import com.cloud.user.User; -import com.cloud.user.UserVO; -import com.cloud.utils.db.TransactionLegacy; -import com.cloud.vm.UserVmManager; -import com.cloud.vm.UserVmVO; -import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachine.State; -import com.cloud.vm.dao.UserVmDao; -import com.cloud.vm.dao.VMInstanceDao; -import com.cloud.vm.snapshot.VMSnapshotVO; -import com.cloud.vm.snapshot.dao.VMSnapshotDao; -import com.cloud.user.dao.AccountDao; -import com.cloud.user.ResourceLimitService; -import com.cloud.configuration.Resource; -import com.cloud.host.dao.HostDao; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.anyString; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd; @@ -58,103 +47,103 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.junit.Assert; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; +import org.mockito.Spy; +import org.mockito.runners.MockitoJUnitRunner; -import javax.inject.Inject; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import com.cloud.configuration.Resource; +import com.cloud.dc.DataCenterVO; +import com.cloud.dc.dao.DataCenterDao; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.host.dao.HostDao; +import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.org.Grouping; +import com.cloud.serializer.GsonHelper; +import com.cloud.storage.dao.VolumeDao; +import com.cloud.user.Account; +import com.cloud.user.AccountManager; +import com.cloud.user.AccountVO; +import com.cloud.user.ResourceLimitService; +import com.cloud.user.User; +import com.cloud.user.UserVO; +import com.cloud.user.dao.AccountDao; +import com.cloud.utils.db.TransactionLegacy; +import com.cloud.vm.UserVmManager; +import com.cloud.vm.UserVmVO; +import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VirtualMachine.State; +import com.cloud.vm.dao.UserVmDao; +import com.cloud.vm.dao.VMInstanceDao; +import com.cloud.vm.snapshot.VMSnapshotVO; +import com.cloud.vm.snapshot.dao.VMSnapshotDao; +@RunWith(MockitoJUnitRunner.class) public class VolumeApiServiceImplTest { - @Inject - VolumeApiServiceImpl _svc = new VolumeApiServiceImpl(); + + @Spy + @InjectMocks + private VolumeApiServiceImpl volumeApiServiceImpl; @Mock - VolumeDao _volumeDao; + private VolumeDao _volumeDao; @Mock - AccountManager _accountMgr; + private AccountManager _accountMgr; @Mock - UserVmDao _userVmDao; + private UserVmDao _userVmDao; @Mock - PrimaryDataStoreDao _storagePoolDao; + private PrimaryDataStoreDao _storagePoolDao; @Mock - VMSnapshotDao _vmSnapshotDao; + private VMSnapshotDao _vmSnapshotDao; @Mock - AsyncJobManager _jobMgr; + private AsyncJobManager _jobMgr; @Mock - AsyncJobJoinMapDao _joinMapDao; + private AsyncJobJoinMapDao _joinMapDao; @Mock - VolumeDataFactory _volFactory; - + private VolumeDataFactory _volFactory; @Mock - VMInstanceDao _vmInstanceDao; + private VMInstanceDao _vmInstanceDao; @Mock - VolumeInfo volumeInfoMock; + private VolumeInfo volumeInfoMock; @Mock - SnapshotInfo snapshotInfoMock; + private SnapshotInfo snapshotInfoMock; @Mock - VolumeService volService; + private VolumeService volService; @Mock - CreateVolumeCmd createVol; + private CreateVolumeCmd createVol; @Mock - UserVmManager _userVmMgr; + private UserVmManager userVmManager; @Mock - DataCenterDao _dcDao; + private DataCenterDao _dcDao; @Mock - ResourceLimitService _resourceLimitMgr; + private ResourceLimitService _resourceLimitMgr; @Mock - AccountDao _accountDao; + private AccountDao _accountDao; @Mock - HostDao _hostDao; + private HostDao _hostDao; - DetachVolumeCmd detachCmd = new DetachVolumeCmd(); - Class _detachCmdClass = detachCmd.getClass(); + private DetachVolumeCmd detachCmd = new DetachVolumeCmd(); + private Class _detachCmdClass = detachCmd.getClass(); @Before public void setup() throws Exception { - MockitoAnnotations.initMocks(this); - _svc._volsDao = _volumeDao; - _svc._accountMgr = _accountMgr; - _svc._userVmDao = _userVmDao; - _svc._storagePoolDao = _storagePoolDao; - _svc._vmSnapshotDao = _vmSnapshotDao; - _svc._vmInstanceDao = _vmInstanceDao; - _svc._jobMgr = _jobMgr; - _svc.volFactory = _volFactory; - _svc.volService = volService; - _svc._userVmMgr = _userVmMgr; - _svc._dcDao = _dcDao; - _svc._resourceLimitMgr = _resourceLimitMgr; - _svc._accountDao = _accountDao; - _svc._hostDao = _hostDao; - _svc._gson = GsonHelper.getGsonLogger(); + volumeApiServiceImpl._gson = GsonHelper.getGsonLogger(); // mock caller context AccountVO account = new AccountVO("admin", 1L, "networkDomain", Account.ACCOUNT_TYPE_NORMAL, "uuid"); - AccountVO account2 = new AccountVO("Account2", 2L, "networkDomain", Account.ACCOUNT_TYPE_NORMAL, "uuid"); UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN); CallContext.register(user, account); // mock async context AsyncJobExecutionContext context = new AsyncJobExecutionContext(); - AsyncJobExecutionContext.init(_svc._jobMgr, _joinMapDao); + AsyncJobExecutionContext.init(_jobMgr, _joinMapDao); AsyncJobVO job = new AsyncJobVO(); context.setJob(job); AsyncJobExecutionContext.setCurrentExecutionContext(context); @@ -164,25 +153,25 @@ public void setup() throws Exception { // volume of running vm id=1 VolumeVO volumeOfRunningVm = new VolumeVO("root", 1L, 1L, 1L, 1L, 1L, "root", "root", Storage.ProvisioningType.THIN, 1, null, null, "root", Volume.Type.ROOT); - when(_svc._volsDao.findById(1L)).thenReturn(volumeOfRunningVm); + when(_volumeDao.findById(1L)).thenReturn(volumeOfRunningVm); UserVmVO runningVm = new UserVmVO(1L, "vm", "vm", 1, HypervisorType.XenServer, 1L, false, false, 1L, 1L, 1, 1L, null, "vm", null); runningVm.setState(State.Running); runningVm.setDataCenterId(1L); - when(_svc._userVmDao.findById(1L)).thenReturn(runningVm); + when(_userVmDao.findById(1L)).thenReturn(runningVm); // volume of stopped vm id=2 VolumeVO volumeOfStoppedVm = new VolumeVO("root", 1L, 1L, 1L, 1L, 2L, "root", "root", Storage.ProvisioningType.THIN, 1, null, null, "root", Volume.Type.ROOT); volumeOfStoppedVm.setPoolId(1L); - when(_svc._volsDao.findById(2L)).thenReturn(volumeOfStoppedVm); + when(_volumeDao.findById(2L)).thenReturn(volumeOfStoppedVm); UserVmVO stoppedVm = new UserVmVO(2L, "vm", "vm", 1, HypervisorType.XenServer, 1L, false, false, 1L, 1L, 1, 1L, null, "vm", null); stoppedVm.setState(State.Stopped); stoppedVm.setDataCenterId(1L); - when(_svc._userVmDao.findById(2L)).thenReturn(stoppedVm); + when(_userVmDao.findById(2L)).thenReturn(stoppedVm); // volume of hyperV vm id=3 @@ -190,31 +179,31 @@ public void setup() throws Exception { false, 1L, 1L, 1, 1L, null, "vm", null); hyperVVm.setState(State.Stopped); hyperVVm.setDataCenterId(1L); - when(_svc._userVmDao.findById(3L)).thenReturn(hyperVVm); + when(_userVmDao.findById(3L)).thenReturn(hyperVVm); VolumeVO volumeOfStoppeHyperVVm = new VolumeVO("root", 1L, 1L, 1L, 1L, 3L, "root", "root", Storage.ProvisioningType.THIN, 1, null, null, "root", Volume.Type.ROOT); volumeOfStoppeHyperVVm.setPoolId(1L); - when(_svc._volsDao.findById(3L)).thenReturn(volumeOfStoppeHyperVVm); + when(_volumeDao.findById(3L)).thenReturn(volumeOfStoppeHyperVVm); StoragePoolVO unmanagedPool = new StoragePoolVO(); - when(_svc._storagePoolDao.findById(1L)).thenReturn(unmanagedPool); + when(_storagePoolDao.findById(1L)).thenReturn(unmanagedPool); // volume of managed pool id=4 StoragePoolVO managedPool = new StoragePoolVO(); managedPool.setManaged(true); - when(_svc._storagePoolDao.findById(2L)).thenReturn(managedPool); + when(_storagePoolDao.findById(2L)).thenReturn(managedPool); VolumeVO managedPoolVolume = new VolumeVO("root", 1L, 1L, 1L, 1L, 2L, "root", "root", Storage.ProvisioningType.THIN, 1, null, null, "root", Volume.Type.ROOT); managedPoolVolume.setPoolId(2L); - when(_svc._volsDao.findById(4L)).thenReturn(managedPoolVolume); + when(_volumeDao.findById(4L)).thenReturn(managedPoolVolume); // non-root non-datadisk volume VolumeInfo volumeWithIncorrectVolumeType = Mockito.mock(VolumeInfo.class); when(volumeWithIncorrectVolumeType.getId()).thenReturn(5L); when(volumeWithIncorrectVolumeType.getVolumeType()).thenReturn(Volume.Type.ISO); - when(_svc.volFactory.getVolume(5L)).thenReturn(volumeWithIncorrectVolumeType); + when(_volFactory.getVolume(5L)).thenReturn(volumeWithIncorrectVolumeType); // correct root volume VolumeInfo correctRootVolume = Mockito.mock(VolumeInfo.class); @@ -225,11 +214,11 @@ public void setup() throws Exception { when(correctRootVolume.getState()).thenReturn(Volume.State.Ready); when(correctRootVolume.getTemplateId()).thenReturn(null); when(correctRootVolume.getPoolId()).thenReturn(1L); - when(_svc.volFactory.getVolume(6L)).thenReturn(correctRootVolume); + when(_volFactory.getVolume(6L)).thenReturn(correctRootVolume); VolumeVO correctRootVolumeVO = new VolumeVO("root", 1L, 1L, 1L, 1L, 2L, "root", "root", Storage.ProvisioningType.THIN, 1, null, null, "root", Volume.Type.ROOT); - when(_svc._volsDao.findById(6L)).thenReturn(correctRootVolumeVO); + when(_volumeDao.findById(6L)).thenReturn(correctRootVolumeVO); // managed root volume VolumeInfo managedVolume = Mockito.mock(VolumeInfo.class); @@ -238,23 +227,23 @@ public void setup() throws Exception { when(managedVolume.getVolumeType()).thenReturn(Volume.Type.ROOT); when(managedVolume.getInstanceId()).thenReturn(null); when(managedVolume.getPoolId()).thenReturn(2L); - when(_svc.volFactory.getVolume(7L)).thenReturn(managedVolume); + when(_volFactory.getVolume(7L)).thenReturn(managedVolume); VolumeVO managedVolume1 = new VolumeVO("root", 1L, 1L, 1L, 1L, 2L, "root", "root", Storage.ProvisioningType.THIN, 1, null, null, "root", Volume.Type.ROOT); managedVolume1.setPoolId(2L); managedVolume1.setDataCenterId(1L); - when(_svc._volsDao.findById(7L)).thenReturn(managedVolume1); + when(_volumeDao.findById(7L)).thenReturn(managedVolume1); // vm having root volume UserVmVO vmHavingRootVolume = new UserVmVO(4L, "vm", "vm", 1, HypervisorType.XenServer, 1L, false, false, 1L, 1L, 1, 1L, null, "vm", null); vmHavingRootVolume.setState(State.Stopped); vmHavingRootVolume.setDataCenterId(1L); - when(_svc._userVmDao.findById(4L)).thenReturn(vmHavingRootVolume); + when(_userVmDao.findById(4L)).thenReturn(vmHavingRootVolume); List vols = new ArrayList(); vols.add(new VolumeVO()); - when(_svc._volsDao.findByInstanceAndDeviceId(4L, 0L)).thenReturn(vols); + when(_volumeDao.findByInstanceAndDeviceId(4L, 0L)).thenReturn(vols); // volume in uploaded state VolumeInfo uploadedVolume = Mockito.mock(VolumeInfo.class); @@ -264,32 +253,32 @@ public void setup() throws Exception { when(uploadedVolume.getInstanceId()).thenReturn(null); when(uploadedVolume.getPoolId()).thenReturn(1L); when(uploadedVolume.getState()).thenReturn(Volume.State.Uploaded); - when(_svc.volFactory.getVolume(8L)).thenReturn(uploadedVolume); + when(_volFactory.getVolume(8L)).thenReturn(uploadedVolume); VolumeVO upVolume = new VolumeVO("root", 1L, 1L, 1L, 1L, 2L, "root", "root", Storage.ProvisioningType.THIN, 1, null, null, "root", Volume.Type.ROOT); upVolume.setPoolId(1L); upVolume.setDataCenterId(1L); upVolume.setState(Volume.State.Uploaded); - when(_svc._volsDao.findById(8L)).thenReturn(upVolume); + when(_volumeDao.findById(8L)).thenReturn(upVolume); // helper dao methods mock - when(_svc._vmSnapshotDao.findByVm(any(Long.class))).thenReturn(new ArrayList()); - when(_svc._vmInstanceDao.findById(any(Long.class))).thenReturn(stoppedVm); + when(_vmSnapshotDao.findByVm(any(Long.class))).thenReturn(new ArrayList()); + when(_vmInstanceDao.findById(any(Long.class))).thenReturn(stoppedVm); DataCenterVO enabledZone = Mockito.mock(DataCenterVO.class); when(enabledZone.getAllocationState()).thenReturn(Grouping.AllocationState.Enabled); - when(_svc._dcDao.findById(anyLong())).thenReturn(enabledZone); + when(_dcDao.findById(anyLong())).thenReturn(enabledZone); } finally { txn.close("runVolumeDaoImplTest"); } // helper methods mock - doNothing().when(_svc._accountMgr).checkAccess(any(Account.class), any(AccessType.class), any(Boolean.class), any(ControlledEntity.class)); - doNothing().when(_svc._jobMgr).updateAsyncJobAttachment(any(Long.class), any(String.class), any(Long.class)); - when(_svc._jobMgr.submitAsyncJob(any(AsyncJobVO.class), any(String.class), any(Long.class))).thenReturn(1L); + doNothing().when(_accountMgr).checkAccess(any(Account.class), any(AccessType.class), any(Boolean.class), any(ControlledEntity.class)); + doNothing().when(_jobMgr).updateAsyncJobAttachment(any(Long.class), any(String.class), any(Long.class)); + when(_jobMgr.submitAsyncJob(any(AsyncJobVO.class), any(String.class), any(Long.class))).thenReturn(1L); } /** @@ -302,7 +291,7 @@ public void testDetachVolumeFromRunningVm() throws NoSuchFieldException, Illegal Field dedicateIdField = _detachCmdClass.getDeclaredField("id"); dedicateIdField.setAccessible(true); dedicateIdField.set(detachCmd, 1L); - _svc.detachVolumeFromVM(detachCmd); + volumeApiServiceImpl.detachVolumeFromVM(detachCmd); } @Test(expected = InvalidParameterValueException.class) @@ -310,7 +299,7 @@ public void testDetachVolumeFromStoppedHyperVVm() throws NoSuchFieldException, I Field dedicateIdField = _detachCmdClass.getDeclaredField("id"); dedicateIdField.setAccessible(true); dedicateIdField.set(detachCmd, 3L); - _svc.detachVolumeFromVM(detachCmd); + volumeApiServiceImpl.detachVolumeFromVM(detachCmd); } @Test(expected = InvalidParameterValueException.class) @@ -318,7 +307,7 @@ public void testDetachVolumeOfManagedDataStore() throws NoSuchFieldException, Il Field dedicateIdField = _detachCmdClass.getDeclaredField("id"); dedicateIdField.setAccessible(true); dedicateIdField.set(detachCmd, 4L); - _svc.detachVolumeFromVM(detachCmd); + volumeApiServiceImpl.detachVolumeFromVM(detachCmd); } @Rule @@ -330,7 +319,7 @@ public void testDetachVolumeFromStoppedXenVm() throws NoSuchFieldException, Ille Field dedicateIdField = _detachCmdClass.getDeclaredField("id"); dedicateIdField.setAccessible(true); dedicateIdField.set(detachCmd, 2L); - _svc.detachVolumeFromVM(detachCmd); + volumeApiServiceImpl.detachVolumeFromVM(detachCmd); } /** @@ -340,44 +329,44 @@ public void testDetachVolumeFromStoppedXenVm() throws NoSuchFieldException, Ille // Negative test - try to attach non-root non-datadisk volume @Test(expected = InvalidParameterValueException.class) public void attachIncorrectDiskType() throws NoSuchFieldException, IllegalAccessException { - _svc.attachVolumeToVM(1L, 5L, 0L); + volumeApiServiceImpl.attachVolumeToVM(1L, 5L, 0L); } // Negative test - attach root volume to running vm @Test(expected = InvalidParameterValueException.class) public void attachRootDiskToRunningVm() throws NoSuchFieldException, IllegalAccessException { - _svc.attachVolumeToVM(1L, 6L, 0L); + volumeApiServiceImpl.attachVolumeToVM(1L, 6L, 0L); } // Negative test - attach root volume to non-xen vm @Test(expected = InvalidParameterValueException.class) public void attachRootDiskToHyperVm() throws NoSuchFieldException, IllegalAccessException { - _svc.attachVolumeToVM(3L, 6L, 0L); + volumeApiServiceImpl.attachVolumeToVM(3L, 6L, 0L); } // Negative test - attach root volume from the managed data store @Test(expected = InvalidParameterValueException.class) public void attachRootDiskOfManagedDataStore() throws NoSuchFieldException, IllegalAccessException { - _svc.attachVolumeToVM(2L, 7L, 0L); + volumeApiServiceImpl.attachVolumeToVM(2L, 7L, 0L); } // Negative test - root volume can't be attached to the vm already having a root volume attached @Test(expected = InvalidParameterValueException.class) public void attachRootDiskToVmHavingRootDisk() throws NoSuchFieldException, IllegalAccessException { - _svc.attachVolumeToVM(4L, 6L, 0L); + volumeApiServiceImpl.attachVolumeToVM(4L, 6L, 0L); } // Negative test - root volume in uploaded state can't be attached @Test(expected = InvalidParameterValueException.class) public void attachRootInUploadedState() throws NoSuchFieldException, IllegalAccessException { - _svc.attachVolumeToVM(2L, 8L, 0L); + volumeApiServiceImpl.attachVolumeToVM(2L, 8L, 0L); } // Positive test - attach ROOT volume in correct state, to the vm not having root volume attached @Test public void attachRootVolumePositive() throws NoSuchFieldException, IllegalAccessException { thrown.expect(NullPointerException.class); - _svc.attachVolumeToVM(2L, 6L, 0L); + volumeApiServiceImpl.attachVolumeToVM(2L, 6L, 0L); } // volume not Ready @@ -386,7 +375,7 @@ public void testTakeSnapshotF1() throws ResourceAllocationException { when(_volFactory.getVolume(anyLong())).thenReturn(volumeInfoMock); when(volumeInfoMock.getState()).thenReturn(Volume.State.Allocated); when(volumeInfoMock.getPoolId()).thenReturn(1L); - _svc.takeSnapshot(5L, Snapshot.MANUAL_POLICY_ID, 3L, null, false, null, false); + volumeApiServiceImpl.takeSnapshot(5L, Snapshot.MANUAL_POLICY_ID, 3L, null, false, null, false); } @Test @@ -396,45 +385,46 @@ public void testTakeSnapshotF2() throws ResourceAllocationException { when(volumeInfoMock.getInstanceId()).thenReturn(null); when(volumeInfoMock.getPoolId()).thenReturn(1L); when (volService.takeSnapshot(Mockito.any(VolumeInfo.class))).thenReturn(snapshotInfoMock); - _svc.takeSnapshot(5L, Snapshot.MANUAL_POLICY_ID, 3L, null, false, null, false); + volumeApiServiceImpl.takeSnapshot(5L, Snapshot.MANUAL_POLICY_ID, 3L, null, false, null, false); } @Test public void testNullGetVolumeNameFromCmd() { when(createVol.getVolumeName()).thenReturn(null); - Assert.assertNotNull(_svc.getVolumeNameFromCommand(createVol)); + Assert.assertNotNull(volumeApiServiceImpl.getVolumeNameFromCommand(createVol)); } @Test public void testEmptyGetVolumeNameFromCmd() { when(createVol.getVolumeName()).thenReturn(""); - Assert.assertNotNull(_svc.getVolumeNameFromCommand(createVol)); + Assert.assertNotNull(volumeApiServiceImpl.getVolumeNameFromCommand(createVol)); } @Test public void testBlankGetVolumeNameFromCmd() { when(createVol.getVolumeName()).thenReturn(" "); - Assert.assertNotNull(_svc.getVolumeNameFromCommand(createVol)); + Assert.assertNotNull(volumeApiServiceImpl.getVolumeNameFromCommand(createVol)); } @Test public void testNonEmptyGetVolumeNameFromCmd() { when(createVol.getVolumeName()).thenReturn("abc"); - Assert.assertSame(_svc.getVolumeNameFromCommand(createVol), "abc"); + Assert.assertSame(volumeApiServiceImpl.getVolumeNameFromCommand(createVol), "abc"); } @Test public void testUpdateMissingRootDiskControllerWithNullChainInfo() { - _svc.updateMissingRootDiskController(null, null); - verify(_svc._userVmMgr, times(0)).persistDeviceBusInfo(any(UserVmVO.class), anyString()); + volumeApiServiceImpl.updateMissingRootDiskController(null, null); + verify(userVmManager, times(0)).persistDeviceBusInfo(any(UserVmVO.class), anyString()); } @Test public void testUpdateMissingRootDiskControllerWithValidChainInfo() { - UserVmVO vm = _svc._userVmDao.findById(1L); - assert vm.getType() == VirtualMachine.Type.User; - _svc.updateMissingRootDiskController(vm, "{\"diskDeviceBusName\":\"scsi0:0\",\"diskChain\":[\"[somedatastore] i-3-VM-somePath/ROOT-1.vmdk\"]}"); - verify(_svc._userVmMgr, times(1)).persistDeviceBusInfo(any(UserVmVO.class), eq("scsi")); + UserVmVO vm = _userVmDao.findById(1L); + + Mockito.doNothing().when(userVmManager).persistDeviceBusInfo(any(UserVmVO.class), eq("scsi")); + volumeApiServiceImpl.updateMissingRootDiskController(vm, "{\"diskDeviceBusName\":\"scsi0:0\",\"diskChain\":[\"[somedatastore] i-3-VM-somePath/ROOT-1.vmdk\"]}"); + verify(userVmManager, times(1)).persistDeviceBusInfo(any(UserVmVO.class), eq("scsi")); } @Test @@ -443,7 +433,7 @@ public void testUpdateMissingRootDiskControllerWithValidChainInfo() { */ public void testAllocSnapshotNonManagedStorageArchive() { try { - _svc.allocSnapshot(6L, 1L, "test", Snapshot.LocationType.SECONDARY); + volumeApiServiceImpl.allocSnapshot(6L, 1L, "test", Snapshot.LocationType.SECONDARY); } catch (InvalidParameterValueException e) { Assert.assertEquals(e.getMessage(), "VolumeId: 6 LocationType is supported only for managed storage"); return; @@ -462,7 +452,8 @@ public void testAllocSnapshotNonManagedStorageArchive() { */ @Test public void testResourceLimitCheckForUploadedVolume() throws NoSuchFieldException, IllegalAccessException, ResourceAllocationException { - doThrow(new ResourceAllocationException("primary storage resource limit check failed", Resource.ResourceType.primary_storage)).when(_svc._resourceLimitMgr).checkResourceLimit(any(AccountVO.class), any(Resource.ResourceType.class), any(Long.class)); + doThrow(new ResourceAllocationException("primary storage resource limit check failed", Resource.ResourceType.primary_storage)).when(_resourceLimitMgr).checkResourceLimit(any(AccountVO.class), + any(Resource.ResourceType.class), any(Long.class)); UserVmVO vm = Mockito.mock(UserVmVO.class); VolumeInfo volumeToAttach = Mockito.mock(VolumeInfo.class); when(volumeToAttach.getId()).thenReturn(9L); @@ -473,14 +464,14 @@ public void testResourceLimitCheckForUploadedVolume() throws NoSuchFieldExceptio when(vm.getType()).thenReturn(VirtualMachine.Type.User); when(vm.getState()).thenReturn(State.Running); when(vm.getDataCenterId()).thenReturn(34L); - when(_svc._volsDao.findByInstanceAndType(anyLong(), any(Volume.Type.class))).thenReturn(new ArrayList(10)); - when(_svc.volFactory.getVolume(9L)).thenReturn(volumeToAttach); + when(_volumeDao.findByInstanceAndType(anyLong(), any(Volume.Type.class))).thenReturn(new ArrayList<>(10)); + when(_volFactory.getVolume(9L)).thenReturn(volumeToAttach); when(volumeToAttach.getState()).thenReturn(Volume.State.Uploaded); DataCenterVO zoneWithDisabledLocalStorage = Mockito.mock(DataCenterVO.class); - when(_svc._dcDao.findById(anyLong())).thenReturn(zoneWithDisabledLocalStorage); + when(_dcDao.findById(anyLong())).thenReturn(zoneWithDisabledLocalStorage); when(zoneWithDisabledLocalStorage.isLocalStorageEnabled()).thenReturn(true); try { - _svc.attachVolumeToVM(2L, 9L, null); + volumeApiServiceImpl.attachVolumeToVM(2L, 9L, null); } catch (InvalidParameterValueException e) { Assert.assertEquals(e.getMessage(), ("primary storage resource limit check failed")); } diff --git a/setup/db/hypervisor_capabilities.simulator.sql b/setup/db/hypervisor_capabilities.simulator.sql index 32f9aaa7351a..f0644f7ae08f 100755 --- a/setup/db/hypervisor_capabilities.simulator.sql +++ b/setup/db/hypervisor_capabilities.simulator.sql @@ -16,4 +16,4 @@ -- under the License. -INSERT INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'Simulator', 'default', 50, 1, 6, NULL, 0, 1); +INSERT INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'Simulator', 'default', 50, 1, 6, NULL, 1, 1); diff --git a/test/integration/smoke/test_primary_storage.py b/test/integration/smoke/test_primary_storage.py index 882df3c22b98..707d0b95fcdb 100644 --- a/test/integration/smoke/test_primary_storage.py +++ b/test/integration/smoke/test_primary_storage.py @@ -43,11 +43,7 @@ def setUp(self): self.pod = get_pod(self.apiclient, self.zone.id) self.hypervisor = self.testClient.getHypervisorInfo() self.domain = get_domain(self.apiclient) - self.template = get_template( - self.apiclient , - self.zone.id , - self.services["ostype"] - ) + self.template = get_template(self.apiclient, self.zone.id, self.services["ostype"]) return @@ -383,11 +379,7 @@ def setUpClass(cls): cls.pod = get_pod(cls.apiclient, cls.zone.id) cls.hypervisor = testClient.getHypervisorInfo() cls.domain = get_domain(cls.apiclient) - cls.template = get_template( - cls.apiclient, - cls.zone.id, - cls.services["ostype"] - ) + cls.template = get_template(cls.apiclient, cls.zone.id, cls.services["ostype"]) cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["template"] = cls.template.id cls.services["storage_tags"] = StorageTagsServices().storage_tags @@ -477,17 +469,18 @@ def tearDownClass(cls): try: # First expunge vm, so PS can be cleaned up cls.virtual_machine_1.delete(cls.apiclient) + time.sleep(60) # Force delete primary storage cmd = enableStorageMaintenance.enableStorageMaintenanceCmd() cmd.id = cls.storage_pool_1.id cls.apiclient.enableStorageMaintenance(cmd) - time.sleep(30) + time.sleep(45) cmd = deleteStoragePool.deleteStoragePoolCmd() cmd.id = cls.storage_pool_1.id cmd.forced = True cls.apiclient.deleteStoragePool(cmd) - + time.sleep(30) cleanup_resources(cls.apiclient, cls._cleanup) except Exception as e: raise Exception("Cleanup failed with %s" % e) @@ -660,12 +653,23 @@ def test_03_migration_options_storage_tags(self): if self.hypervisor.lower() not in ["vmware", "xenserver"]: self.virtual_machine_1.stop(self.apiclient) + volumePool = StoragePool.list( + self.apiclient, + id=vol.storageid + ) + self.debug("Volume %s is on storage: %s" % (vol.id, volumePool)) + allStoragePools = StoragePool.list( + self.apiclient + ) + self.debug("All storage pools in the system: %s" % (allStoragePools)) # Check migration options for volume pools_response = StoragePool.listForMigration( self.apiclient, id=vol.id ) pools_suitable = filter(lambda p : p.suitableformigration, pools_response) + + self.debug("Suitable storage pools found: %s" % len(pools_suitable)) self.assertEquals(1, len(pools_suitable), "Check that there is only one item on the list") self.assertEquals(pools_suitable[0].id, storage_pool_2.id, "Check that PS-2 is the migration option for volume") @@ -682,6 +686,8 @@ def test_03_migration_options_storage_tags(self): id=vol.id ) pools_suitable = filter(lambda p : p.suitableformigration, pools_response) + + self.debug("Suitable storage pools found: %s" % len(pools_suitable)) self.assertEquals(0, len(pools_suitable), "Check that there is no migration option for volume") return \ No newline at end of file From c3e5c09ac6bfecedbdd831acba0e8fbcb5d4d3d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Thu, 8 Mar 2018 06:59:52 -0300 Subject: [PATCH 022/145] [CLOUDSTACK-10197] Update DisplayText of XenServer tools ISO entry in the database when it already exists (#2470) * Update the displayText of XenServer ISO when it already exist in the DB Besides updating the ISO display text, I also created unit test cases for 'createXenServerToolsIsoEntryInDatabase' and 'getActualIsoTemplate' methods. * Formatting and cleanups for checkstyle of changed classes --- .../discoverer/XcpServerDiscoverer.java | 110 ++-- .../resource/CitrixResourceBase.java | 555 +++++++++--------- .../discoverer/XcpServerDiscovererTest.java | 72 +++ .../resource/CitrixResourceBaseTest.java | 76 +++ .../resource/XcpOssResourceTest.java | 16 +- .../resource/XcpServerResourceTest.java | 15 +- .../resource/XenServer56FP1ResourceTest.java | 15 +- .../resource/XenServer56ResourceTest.java | 14 +- .../resource/XenServer56SP2ResourceTest.java | 20 +- .../resource/XenServer600ResourceTest.java | 21 +- .../resource/XenServer625ResourceTest.java | 13 +- .../resource/XenServer650ResourceTest.java | 20 +- 12 files changed, 524 insertions(+), 423 deletions(-) create mode 100644 plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscovererTest.java diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java index d23f7a86c35e..75ee55793bdf 100644 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java @@ -16,6 +16,24 @@ // under the License. package com.cloud.hypervisor.xenserver.discoverer; +import java.net.InetAddress; +import java.net.URI; +import java.net.UnknownHostException; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Queue; +import java.util.Set; + +import javax.inject.Inject; +import javax.naming.ConfigurationException; +import javax.persistence.EntityExistsException; + +import org.apache.cloudstack.hypervisor.xenserver.XenserverConfigs; +import org.apache.log4j.Logger; +import org.apache.xmlrpc.XmlRpcException; + import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; import com.cloud.agent.api.AgentControlAnswer; @@ -81,46 +99,28 @@ import com.xensource.xenapi.Types.SessionAuthenticationFailed; import com.xensource.xenapi.Types.UuidInvalid; import com.xensource.xenapi.Types.XenAPIException; -import org.apache.cloudstack.hypervisor.xenserver.XenserverConfigs; -import org.apache.log4j.Logger; -import org.apache.xmlrpc.XmlRpcException; - -import javax.inject.Inject; -import javax.naming.ConfigurationException; -import javax.persistence.EntityExistsException; -import java.net.InetAddress; -import java.net.URI; -import java.net.UnknownHostException; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Queue; -import java.util.Set; public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(XcpServerDiscoverer.class); - protected String _publicNic; - protected String _privateNic; - protected String _storageNic1; - protected String _storageNic2; - protected int _wait; - protected XenServerConnectionPool _connPool; - protected boolean _checkHvm; - protected String _guestNic; - protected boolean _setupMultipath; - protected String _instance; + private int _wait; + private XenServerConnectionPool _connPool; + private boolean _checkHvm; + private boolean _setupMultipath; + private String _instance; @Inject - protected AlertManager _alertMgr; + private AlertManager _alertMgr; @Inject - protected AgentManager _agentMgr; + private AgentManager _agentMgr; @Inject private VMTemplateDao _tmpltDao; @Inject private HostPodDao _podDao; + private String xenServerIsoName = "xs-tools.iso"; + private String xenServerIsoDisplayText = "XenServer Tools Installer ISO (xen-pv-drv-iso)"; + protected XcpServerDiscoverer() { } @@ -198,8 +198,9 @@ protected boolean poolHasHotFix(Connection conn, String hostIp, String hotFixUui ClusterVO cluster = _clusterDao.findById(clusterId); if (cluster == null || cluster.getHypervisorType() != HypervisorType.XenServer) { - if (s_logger.isInfoEnabled()) + if (s_logger.isInfoEnabled()) { s_logger.info("invalid cluster id or cluster is not for XenServer hypervisors"); + } return null; } @@ -237,7 +238,7 @@ protected boolean poolHasHotFix(Connection conn, String hostIp, String hotFixUui if (clusterHosts != null && clusterHosts.size() > 0) { if (!clu.getGuid().equals(poolUuid)) { String msg = "Please join the host " + hostIp + " to XS pool " - + clu.getGuid() + " through XC/XS before adding it through CS UI"; + + clu.getGuid() + " through XC/XS before adding it through CS UI"; s_logger.warn(msg); throw new DiscoveryException(msg); } @@ -395,18 +396,18 @@ protected void addSamePool(Connection conn, Map params) throws Configu super.configure(name, params); serverConfig(); - _publicNic = _params.get(Config.XenServerPublicNetwork.key()); - _privateNic = _params.get(Config.XenServerPrivateNetwork.key()); - - _storageNic1 = _params.get(Config.XenServerStorageNetwork1.key()); - _storageNic2 = _params.get(Config.XenServerStorageNetwork2.key()); - - _guestNic = _params.get(Config.XenServerGuestNetwork.key()); - String value = _params.get(Config.XapiWait.toString()); _wait = NumbersUtil.parseInt(value, Integer.parseInt(Config.XapiWait.getDefaultValue())); _instance = _params.get(Config.InstanceName.key()); - value = _params.get(Config.XenServerSetupMultipath.key()); - Boolean.parseBoolean(value); - value = _params.get("xenserver.check.hvm"); _checkHvm = Boolean.parseBoolean(value); _connPool = XenServerConnectionPool.getInstance(); _agentMgr.registerForHostEvents(this, true, false, true); - createXsToolsISO(); + createXenServerToolsIsoEntryInDatabase(); _resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this); return true; } @Override public boolean matchHypervisor(String hypervisor) { - if (hypervisor == null) + if (hypervisor == null) { return true; + } return Hypervisor.HypervisorType.XenServer.toString().equalsIgnoreCase(hypervisor); } @@ -528,20 +519,23 @@ public boolean processCommands(long agentId, long seq, Command[] commands) { return false; } - private void createXsToolsISO() { - String isoName = "xs-tools.iso"; - VMTemplateVO tmplt = _tmpltDao.findByTemplateName(isoName); - Long id; + /** + * Create the XenServer tools ISO entry in the database. + * If there is already an entry with 'isoName' equals to {@value #xenServerIsoName} , we update its 'displayText' to {@value #xenServerIsoDisplayText}. + * Otherwise, we create a new entry. + */ + protected void createXenServerToolsIsoEntryInDatabase() { + VMTemplateVO tmplt = _tmpltDao.findByTemplateName(xenServerIsoName); if (tmplt == null) { - id = _tmpltDao.getNextInSequence(Long.class, "id"); - VMTemplateVO template = - VMTemplateVO.createPreHostIso(id, isoName, isoName, ImageFormat.ISO, true, true, TemplateType.PERHOST, null, null, true, 64, Account.ACCOUNT_ID_SYSTEM, - null, "XenServer Tools Installer ISO (xen-pv-drv-iso)", false, 1, false, HypervisorType.XenServer); + long id = _tmpltDao.getNextInSequence(Long.class, "id"); + VMTemplateVO template = VMTemplateVO.createPreHostIso(id, xenServerIsoName, xenServerIsoName, ImageFormat.ISO, true, true, TemplateType.PERHOST, null, null, true, 64, + Account.ACCOUNT_ID_SYSTEM, null, xenServerIsoDisplayText, false, 1, false, HypervisorType.XenServer); _tmpltDao.persist(template); } else { - id = tmplt.getId(); + long id = tmplt.getId(); tmplt.setTemplateType(TemplateType.PERHOST); tmplt.setUrl(null); + tmplt.setDisplayText(xenServerIsoDisplayText); _tmpltDao.update(id, tmplt); } } diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java index 4b7080aa5ab2..ee146a1f88c9 100644 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java @@ -16,8 +16,52 @@ // under the License. package com.cloud.hypervisor.xenserver.resource; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLConnection; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Properties; +import java.util.Queue; +import java.util.Random; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.TimeoutException; + +import javax.naming.ConfigurationException; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import org.apache.cloudstack.storage.to.TemplateObjectTO; +import org.apache.cloudstack.storage.to.VolumeObjectTO; import org.apache.commons.collections.MapUtils; +import org.apache.commons.io.FileUtils; +import org.apache.log4j.Logger; +import org.apache.xmlrpc.XmlRpcException; +import org.joda.time.Duration; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + import com.cloud.agent.IAgentControl; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; @@ -112,49 +156,6 @@ import com.xensource.xenapi.VLAN; import com.xensource.xenapi.VM; import com.xensource.xenapi.XenAPIObject; -import org.apache.cloudstack.storage.to.TemplateObjectTO; -import org.apache.cloudstack.storage.to.VolumeObjectTO; -import org.apache.commons.io.FileUtils; -import org.apache.log4j.Logger; -import org.apache.xmlrpc.XmlRpcException; -import org.joda.time.Duration; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - -import javax.naming.ConfigurationException; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.URLConnection; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Properties; -import java.util.Queue; -import java.util.Random; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.TimeoutException; /** * CitrixResourceBase encapsulates the calls to the XenServer Xapi process to @@ -205,6 +206,9 @@ public String toString() { private static final Logger s_logger = Logger.getLogger(CitrixResourceBase.class); protected static final HashMap s_powerStatesTable; + private String xenServer70plusGuestToolsName = "guest-tools.iso"; + private String xenServerBefore70GuestToolsName = "xs-tools.iso"; + static { s_powerStatesTable = new HashMap(); s_powerStatesTable.put(VmPowerState.HALTED, PowerState.PowerOff); @@ -268,8 +272,8 @@ private static boolean isAlienVm(final VM vm, final Connection conn) throws XenA protected VirtualRoutingResource _vrResource; - protected String _configDriveIsopath = "/opt/xensource/packages/configdrive_iso/"; - protected String _configDriveSRName = "ConfigDriveISOs"; + protected String _configDriveIsopath = "/opt/xensource/packages/configdrive_iso/"; + protected String _configDriveSRName = "ConfigDriveISOs"; public String _attachIsoDeviceNum = "3"; protected XenServerUtilitiesHelper xenServerUtilitiesHelper = new XenServerUtilitiesHelper(); @@ -562,7 +566,7 @@ private void CheckXenHostInfo() throws ConfigurationException { @Override public ExecutionResult cleanupCommand(final NetworkElementCommand cmd) { if (cmd instanceof IpAssocCommand && !(cmd instanceof IpAssocVpcCommand)) { - return cleanupNetworkElementCommand((IpAssocCommand) cmd); + return cleanupNetworkElementCommand((IpAssocCommand)cmd); } return new ExecutionResult(true, null); } @@ -600,7 +604,6 @@ protected ExecutionResult cleanupNetworkElementCommand(final IpAssocCommand cmd) try { final IpAddressTO[] ips = cmd.getIpAddresses(); - final int ipsCount = ips.length; for (final IpAddressTO ip : ips) { final VM router = getVM(conn, routerName); @@ -734,7 +737,7 @@ protected VDI cloudVDIcopy(final Connection conn, final VDI vdi, final SR sr, in try { task = vdi.copyAsync(conn, sr); // poll every 1 seconds , timeout after 2 hours - waitForTask(conn, task, 1000, (long) wait * 1000); + waitForTask(conn, task, 1000, (long)wait * 1000); checkForSuccess(conn, task); final VDI dvdi = Types.toVDI(task, conn); return dvdi; @@ -783,44 +786,44 @@ public boolean configure(final String name, final Map params) th _name = name; try { - _dcId = Long.parseLong((String) params.get("zone")); + _dcId = Long.parseLong((String)params.get("zone")); } catch (final NumberFormatException e) { throw new ConfigurationException("Unable to get the zone " + params.get("zone")); } - _host.setUuid((String) params.get("guid")); + _host.setUuid((String)params.get("guid")); _name = _host.getUuid(); - _host.setIp((String) params.get("ipaddress")); - - _username = (String) params.get("username"); - _password.add((String) params.get("password")); - _pod = (String) params.get("pod"); - _cluster = (String) params.get("cluster"); - _privateNetworkName = (String) params.get("private.network.device"); - _publicNetworkName = (String) params.get("public.network.device"); - _guestNetworkName = (String) params.get("guest.network.device"); - _instance = (String) params.get("instance.name"); - _securityGroupEnabled = Boolean.parseBoolean((String) params.get("securitygroupenabled")); - - _linkLocalPrivateNetworkName = (String) params.get("private.linkLocal.device"); + _host.setIp((String)params.get("ipaddress")); + + _username = (String)params.get("username"); + _password.add((String)params.get("password")); + _pod = (String)params.get("pod"); + _cluster = (String)params.get("cluster"); + _privateNetworkName = (String)params.get("private.network.device"); + _publicNetworkName = (String)params.get("public.network.device"); + _guestNetworkName = (String)params.get("guest.network.device"); + _instance = (String)params.get("instance.name"); + _securityGroupEnabled = Boolean.parseBoolean((String)params.get("securitygroupenabled")); + + _linkLocalPrivateNetworkName = (String)params.get("private.linkLocal.device"); if (_linkLocalPrivateNetworkName == null) { _linkLocalPrivateNetworkName = "cloud_link_local_network"; } - _storageNetworkName1 = (String) params.get("storage.network.device1"); - _storageNetworkName2 = (String) params.get("storage.network.device2"); + _storageNetworkName1 = (String)params.get("storage.network.device1"); + _storageNetworkName2 = (String)params.get("storage.network.device2"); - _heartbeatTimeout = NumbersUtil.parseInt((String) params.get("xenserver.heartbeat.timeout"), 120); - _heartbeatInterval = NumbersUtil.parseInt((String) params.get("xenserver.heartbeat.interval"), 60); + _heartbeatTimeout = NumbersUtil.parseInt((String)params.get("xenserver.heartbeat.timeout"), 120); + _heartbeatInterval = NumbersUtil.parseInt((String)params.get("xenserver.heartbeat.interval"), 60); - String value = (String) params.get("wait"); + String value = (String)params.get("wait"); _wait = NumbersUtil.parseInt(value, 600); - value = (String) params.get("migratewait"); + value = (String)params.get("migratewait"); _migratewait = NumbersUtil.parseInt(value, 3600); - _maxNics = NumbersUtil.parseInt((String) params.get("xenserver.nics.max"), 7); + _maxNics = NumbersUtil.parseInt((String)params.get("xenserver.nics.max"), 7); if (_pod == null) { throw new ConfigurationException("Unable to get the pod"); @@ -869,7 +872,7 @@ public synchronized Network configureTunnelNetwork(final Connection conn, final if (configuredHosts != null) { final String hostIdsStr[] = configuredHosts.split(","); for (final String hostIdStr : hostIdsStr) { - if (hostIdStr.equals(((Long) hostId).toString())) { + if (hostIdStr.equals(((Long)hostId).toString())) { configured = true; break; } @@ -879,17 +882,15 @@ public synchronized Network configureTunnelNetwork(final Connection conn, final if (!configured) { String result; if (bridgeName.startsWith("OVS-DR-VPC-Bridge")) { - result = callHostPlugin(conn, "ovstunnel", "setup_ovs_bridge_for_distributed_routing", "bridge", bridge, "key", bridgeName, "xs_nw_uuid", nw.getUuid(conn), - "cs_host_id", ((Long) hostId).toString()); + result = callHostPlugin(conn, "ovstunnel", "setup_ovs_bridge_for_distributed_routing", "bridge", bridge, "key", bridgeName, "xs_nw_uuid", nw.getUuid(conn), "cs_host_id", + ((Long)hostId).toString()); } else { - result = callHostPlugin(conn, "ovstunnel", "setup_ovs_bridge", "bridge", bridge, "key", bridgeName, "xs_nw_uuid", nw.getUuid(conn), "cs_host_id", - ((Long) hostId).toString()); + result = callHostPlugin(conn, "ovstunnel", "setup_ovs_bridge", "bridge", bridge, "key", bridgeName, "xs_nw_uuid", nw.getUuid(conn), "cs_host_id", ((Long)hostId).toString()); } // Note down the fact that the ovs bridge has been setup final String[] res = result.split(":"); if (res.length != 2 || !res[0].equalsIgnoreCase("SUCCESS")) { - // TODO: Should make this error not fatal? throw new CloudRuntimeException("Unable to pre-configure OVS bridge " + bridge); } } @@ -937,8 +938,7 @@ public String connect(final Connection conn, final String vmName, final String i public String copyVhdFromSecondaryStorage(final Connection conn, final String mountpoint, final String sruuid, final int wait) { final String nameLabel = "cloud-" + UUID.randomUUID().toString(); - final String results = callHostPluginAsync(conn, "vmopspremium", "copy_vhd_from_secondarystorage", wait, "mountpoint", mountpoint, "sruuid", sruuid, "namelabel", - nameLabel); + final String results = callHostPluginAsync(conn, "vmopspremium", "copy_vhd_from_secondarystorage", wait, "mountpoint", mountpoint, "sruuid", sruuid, "namelabel", nameLabel); String errMsg = null; if (results == null || results.isEmpty()) { errMsg = "copy_vhd_from_secondarystorage return null"; @@ -1093,8 +1093,8 @@ protected boolean createSecondaryStorageFolder(final Connection conn, final Stri String createTemplateFromSnapshot(final Connection conn, final String templatePath, final String snapshotPath, final int wait) { final String tmpltLocalDir = UUID.randomUUID().toString(); - final String results = callHostPluginAsync(conn, "vmopspremium", "create_privatetemplate_from_snapshot", wait, "templatePath", templatePath, "snapshotPath", snapshotPath, - "tmpltLocalDir", tmpltLocalDir); + final String results = callHostPluginAsync(conn, "vmopspremium", "create_privatetemplate_from_snapshot", wait, "templatePath", templatePath, "snapshotPath", snapshotPath, "tmpltLocalDir", + tmpltLocalDir); String errMsg = null; if (results == null || results.isEmpty()) { errMsg = "create_privatetemplate_from_snapshot return null"; @@ -1113,8 +1113,7 @@ String createTemplateFromSnapshot(final Connection conn, final String templatePa throw new CloudRuntimeException(errMsg); } - public VBD createVbd(final Connection conn, final DiskTO volume, final String vmName, final VM vm, final BootloaderType bootLoaderType, VDI vdi) throws XmlRpcException, - XenAPIException { + public VBD createVbd(final Connection conn, final DiskTO volume, final String vmName, final VM vm, final BootloaderType bootLoaderType, VDI vdi) throws XmlRpcException, XenAPIException { final Volume.Type type = volume.getType(); if (vdi == null) { @@ -1158,7 +1157,7 @@ public VBD createVbd(final Connection conn, final DiskTO volume, final String vm vbdr.userdevice = "autodetect"; final Long deviceId = volume.getDiskSeq(); if (deviceId != null && (!isDeviceUsed(conn, vm, deviceId) || deviceId > 3)) { - vbdr.userdevice = deviceId.toString(); + vbdr.userdevice = deviceId.toString(); } } final VBD vbd = VBD.create(conn, vbdr); @@ -1268,7 +1267,7 @@ public VM createVmFromTemplate(final Connection conn, final VirtualMachineTO vmS vmr.actionsAfterCrash = Types.OnCrashBehaviour.DESTROY; vmr.actionsAfterShutdown = Types.OnNormalExit.DESTROY; vmr.otherConfig.put("vm_uuid", vmSpec.getUuid()); - vmr.VCPUsMax = (long) vmSpec.getCpus(); // FIX ME: In case of dynamic + vmr.VCPUsMax = (long)vmSpec.getCpus(); // FIX ME: In case of dynamic // scaling this VCPU max should // be the minumum of // recommended value for that template and capacity remaining on host @@ -1276,32 +1275,30 @@ public VM createVmFromTemplate(final Connection conn, final VirtualMachineTO vmS long recommendedMemoryMin = 0l; long recommendedMemoryMax = 0l; - Map guestOsDetails = vmSpec.getGuestOsDetails(); + Map guestOsDetails = vmSpec.getGuestOsDetails(); - if(guestOsDetails != null){ - if(guestOsDetails.containsKey("xenserver.dynamicMin")){ + if (guestOsDetails != null) { + if (guestOsDetails.containsKey("xenserver.dynamicMin")) { recommendedMemoryMin = Long.valueOf(guestOsDetails.get("xenserver.dynamicMin")).longValue(); } - if(guestOsDetails.containsKey("xenserver.dynamicMax")){ + if (guestOsDetails.containsKey("xenserver.dynamicMax")) { recommendedMemoryMax = Long.valueOf(guestOsDetails.get("xenserver.dynamicMax")).longValue(); } } - - if (isDmcEnabled(conn, host) && vmSpec.isEnableDynamicallyScaleVm()) { // scaling is allowed - vmr.memoryStaticMin = getStaticMin(vmSpec.getOs(), vmSpec.getBootloader() == BootloaderType.CD, vmSpec.getMinRam(), vmSpec.getMaxRam(),recommendedMemoryMin); - vmr.memoryStaticMax = getStaticMax(vmSpec.getOs(), vmSpec.getBootloader() == BootloaderType.CD, vmSpec.getMinRam(), vmSpec.getMaxRam(),recommendedMemoryMax); + vmr.memoryStaticMin = getStaticMin(vmSpec.getOs(), vmSpec.getBootloader() == BootloaderType.CD, vmSpec.getMinRam(), vmSpec.getMaxRam(), recommendedMemoryMin); + vmr.memoryStaticMax = getStaticMax(vmSpec.getOs(), vmSpec.getBootloader() == BootloaderType.CD, vmSpec.getMinRam(), vmSpec.getMaxRam(), recommendedMemoryMax); vmr.memoryDynamicMin = vmSpec.getMinRam(); vmr.memoryDynamicMax = vmSpec.getMaxRam(); if (guestOsTypeName.toLowerCase().contains("windows")) { - vmr.VCPUsMax = (long) vmSpec.getCpus(); + vmr.VCPUsMax = (long)vmSpec.getCpus(); } else { if (vmSpec.getVcpuMaxLimit() != null) { - vmr.VCPUsMax = (long) vmSpec.getVcpuMaxLimit(); + vmr.VCPUsMax = (long)vmSpec.getVcpuMaxLimit(); } } } else { @@ -1315,16 +1312,16 @@ public VM createVmFromTemplate(final Connection conn, final VirtualMachineTO vmS ; vmr.memoryDynamicMax = vmSpec.getMaxRam(); - vmr.VCPUsMax = (long) vmSpec.getCpus(); + vmr.VCPUsMax = (long)vmSpec.getCpus(); } - vmr.VCPUsAtStartup = (long) vmSpec.getCpus(); + vmr.VCPUsAtStartup = (long)vmSpec.getCpus(); vmr.consoles.clear(); vmr.xenstoreData.clear(); //Add xenstore data for the NetscalerVM - if(vmSpec.getType()== VirtualMachine.Type.NetScalerVm) { + if (vmSpec.getType() == VirtualMachine.Type.NetScalerVm) { NicTO mgmtNic = vmSpec.getNics()[0]; - if(mgmtNic != null ) { + if (mgmtNic != null) { Map xenstoreData = new HashMap(3); xenstoreData.put("vm-data/ip", mgmtNic.getIp().toString().trim()); xenstoreData.put("vm-data/gateway", mgmtNic.getGateway().toString().trim()); @@ -1342,11 +1339,11 @@ public VM createVmFromTemplate(final Connection conn, final VirtualMachineTO vmS final Integer speed = vmSpec.getMinSpeed(); if (speed != null) { - int cpuWeight = _maxWeight; // cpu_weight + int cpuWeight = _maxWeight; // cpu_weight int utilization = 0; // max CPU cap, default is unlimited // weight based allocation, CPU weight is calculated per VCPU - cpuWeight = (int) (speed * 0.99 / _host.getSpeed() * _maxWeight); + cpuWeight = (int)(speed * 0.99 / _host.getSpeed() * _maxWeight); if (cpuWeight > _maxWeight) { cpuWeight = _maxWeight; } @@ -1354,7 +1351,7 @@ public VM createVmFromTemplate(final Connection conn, final VirtualMachineTO vmS if (vmSpec.getLimitCpuUse()) { // CPU cap is per VM, so need to assign cap based on the number // of vcpus - utilization = (int) (vmSpec.getMaxSpeed() * 0.99 * vmSpec.getCpus() / _host.getSpeed() * 100); + utilization = (int)(vmSpec.getMaxSpeed() * 0.99 * vmSpec.getCpus() / _host.getSpeed() * 100); } vcpuParams.put("weight", Integer.toString(cpuWeight)); @@ -1381,7 +1378,7 @@ public VM createVmFromTemplate(final Connection conn, final VirtualMachineTO vmS final DiskTO[] disks = vmSpec.getDisks(); for (final DiskTO disk : disks) { if (disk.getType() == Volume.Type.ISO) { - final TemplateObjectTO iso = (TemplateObjectTO) disk.getData(); + final TemplateObjectTO iso = (TemplateObjectTO)disk.getData(); final String osType = iso.getGuestOsType(); if (osType != null) { final String isoGuestOsName = getGuestOsType(vmSpec.getPlatformEmulator()); @@ -1399,7 +1396,7 @@ public VM createVmFromTemplate(final Connection conn, final VirtualMachineTO vmS } } else if (vmSpec.getBootloader() == BootloaderType.PyGrub) { vm.setPVBootloader(conn, "pygrub"); - vm.setPVBootloaderArgs(conn,CitrixHelper.getPVbootloaderArgs(guestOsTypeName)); + vm.setPVBootloaderArgs(conn, CitrixHelper.getPVbootloaderArgs(guestOsTypeName)); } else { vm.destroy(conn); throw new CloudRuntimeException("Unable to handle boot loader type: " + vmSpec.getBootloader()); @@ -1418,8 +1415,7 @@ public VM createWorkingVM(final Connection conn, final String vmName, final Stri // below is redundant but keeping for consistency and code readabilty final String guestOsTypeName = platformEmulator; if (guestOsTypeName == null) { - final String msg = " Hypervisor " + this.getClass().getName() + " doesn't support guest OS type " + guestOSType - + ". you can choose 'Other install media' to run it as HVM"; + final String msg = " Hypervisor " + this.getClass().getName() + " doesn't support guest OS type " + guestOSType + ". you can choose 'Other install media' to run it as HVM"; s_logger.warn(msg); throw new CloudRuntimeException(msg); } @@ -1466,12 +1462,11 @@ protected boolean deleteSecondaryStorageFolder(final Connection conn, final Stri return details != null && details.equals("1"); } - protected String deleteSnapshotBackup(final Connection conn, final Long dcId, final Long accountId, final Long volumeId, final String secondaryStorageMountPath, - final String backupUUID) { + protected String deleteSnapshotBackup(final Connection conn, final Long dcId, final Long accountId, final Long volumeId, final String secondaryStorageMountPath, final String backupUUID) { // If anybody modifies the formatting below again, I'll skin them - final String result = callHostPlugin(conn, "vmopsSnapshot", "deleteSnapshotBackup", "backupUUID", backupUUID, "dcId", dcId.toString(), "accountId", accountId.toString(), - "volumeId", volumeId.toString(), "secondaryStorageMountPath", secondaryStorageMountPath); + final String result = callHostPlugin(conn, "vmopsSnapshot", "deleteSnapshotBackup", "backupUUID", backupUUID, "dcId", dcId.toString(), "accountId", accountId.toString(), "volumeId", + volumeId.toString(), "secondaryStorageMountPath", secondaryStorageMountPath); return result; } @@ -1500,13 +1495,9 @@ public void destroyPatchVbd(final Connection conn, final String vmName) throws X public synchronized void destroyTunnelNetwork(final Connection conn, final Network nw, final long hostId) { try { final String bridge = nw.getBridge(conn); - final String result = callHostPlugin(conn, "ovstunnel", "destroy_ovs_bridge", "bridge", bridge, "cs_host_id", ((Long) hostId).toString()); + final String result = callHostPlugin(conn, "ovstunnel", "destroy_ovs_bridge", "bridge", bridge, "cs_host_id", ((Long)hostId).toString()); final String[] res = result.split(":"); if (res.length != 2 || !res[0].equalsIgnoreCase("SUCCESS")) { - // TODO: Should make this error not fatal? - // Can Concurrent VM shutdown/migration/reboot events can cause - // this method - // to be executed on a bridge which has already been removed? throw new CloudRuntimeException("Unable to remove OVS bridge " + bridge + ":" + result); } return; @@ -1791,7 +1782,7 @@ protected void fillHostInfo(final Connection conn, final StartupRoutingCommand c } } - ram = (long) ((ram - dom0Ram - _xsMemoryUsed) * _xsVirtualizationFactor); + ram = (long)((ram - dom0Ram - _xsMemoryUsed) * _xsVirtualizationFactor); cmd.setMemory(ram); cmd.setDom0MinMemory(dom0Ram); @@ -1852,8 +1843,7 @@ protected void fillHostInfo(final Connection conn, final StartupRoutingCommand c Pair result = xenServerUtilitiesHelper.executeSshWrapper(_host.getIp(), 22, _username, null, getPwdFromQueue(), cmdLine); - boolean supportsClonedVolumes = result != null && result.first() != null && result.first() && - result.second() != null && result.second().length() > 0; + boolean supportsClonedVolumes = result != null && result.first() != null && result.first() && result.second() != null && result.second().length() > 0; cmd.setSupportsClonedVolumes(supportsClonedVolumes); } catch (NumberFormatException ex) { @@ -2215,10 +2205,10 @@ public HostStatsEntry getHostStats(final Connection conn, final GetHostStatsComm return null; } - final Integer numRows = (Integer) rrdData[0]; - final Integer numColumns = (Integer) rrdData[1]; - final Node legend = (Node) rrdData[2]; - final Node dataNode = (Node) rrdData[3]; + final Integer numRows = (Integer)rrdData[0]; + final Integer numColumns = (Integer)rrdData[1]; + final Node legend = (Node)rrdData[2]; + final Node dataNode = (Node)rrdData[3]; final NodeList legendChildren = legend.getChildNodes(); for (int col = 0; col < numColumns; col++) { @@ -2329,24 +2319,20 @@ protected HashMap getHostVmStateReport(final Con return vmStates; } - public SR getIscsiSR(final Connection conn, final String srNameLabel, final String target, String path, final String chapInitiatorUsername, - final String chapInitiatorPassword, final boolean ignoreIntroduceException) { + public SR getIscsiSR(final Connection conn, final String srNameLabel, final String target, String path, final String chapInitiatorUsername, final String chapInitiatorPassword, + final boolean ignoreIntroduceException) { - return getIscsiSR(conn, srNameLabel, target, path, chapInitiatorUsername, - chapInitiatorPassword, false, SRType.LVMOISCSI.toString(), - ignoreIntroduceException); + return getIscsiSR(conn, srNameLabel, target, path, chapInitiatorUsername, chapInitiatorPassword, false, SRType.LVMOISCSI.toString(), ignoreIntroduceException); } - public SR getIscsiSR(final Connection conn, final String srNameLabel, final String target, String path, final String chapInitiatorUsername, - final String chapInitiatorPassword, final boolean resignature, final boolean ignoreIntroduceException) { + public SR getIscsiSR(final Connection conn, final String srNameLabel, final String target, String path, final String chapInitiatorUsername, final String chapInitiatorPassword, + final boolean resignature, final boolean ignoreIntroduceException) { - return getIscsiSR(conn, srNameLabel, target, path, chapInitiatorUsername, - chapInitiatorPassword, resignature, SRType.LVMOISCSI.toString(), - ignoreIntroduceException); + return getIscsiSR(conn, srNameLabel, target, path, chapInitiatorUsername, chapInitiatorPassword, resignature, SRType.LVMOISCSI.toString(), ignoreIntroduceException); } - public SR getIscsiSR(final Connection conn, final String srNameLabel, final String target, String path, final String chapInitiatorUsername, - final String chapInitiatorPassword, final boolean resignature, final String srType, final boolean ignoreIntroduceException) { + public SR getIscsiSR(final Connection conn, final String srNameLabel, final String target, String path, final String chapInitiatorUsername, final String chapInitiatorPassword, + final boolean resignature, final String srType, final boolean ignoreIntroduceException) { synchronized (srNameLabel.intern()) { final Map deviceConfig = new HashMap(); try { @@ -2396,8 +2382,7 @@ public SR getIscsiSR(final Connection conn, final String srNameLabel, final Stri if (pooluuid == null || pooluuid.length() != 36) { sr = SR.create(conn, host, deviceConfig, new Long(0), srNameLabel, srNameLabel, srType, "user", true, smConfig); - } - else { + } else { if (resignature) { // We resignature the SR for managed storage if needed. At the end of this // we have an SR which is ready to be attached. For VHDoISCSI SR, @@ -2422,7 +2407,8 @@ public SR getIscsiSR(final Connection conn, final String srNameLabel, final Stri } } - private SR introduceAndPlugIscsiSr(Connection conn, String pooluuid, String srNameLabel, String type, Map smConfig, Map deviceConfig, boolean ignoreIntroduceException) throws XmlRpcException, XenAPIException { + private SR introduceAndPlugIscsiSr(Connection conn, String pooluuid, String srNameLabel, String type, Map smConfig, Map deviceConfig, + boolean ignoreIntroduceException) throws XmlRpcException, XenAPIException { SR sr = null; try { sr = SR.introduce(conn, pooluuid, srNameLabel, srNameLabel, type, "user", true, smConfig); @@ -2459,8 +2445,7 @@ private SR introduceAndPlugIscsiSr(Connection conn, String pooluuid, String srNa return sr; } - private String resignatureIscsiSr(Connection conn, Host host, Map deviceConfig, String srNameLabel, Map smConfig) - throws XmlRpcException, XenAPIException { + private String resignatureIscsiSr(Connection conn, Host host, Map deviceConfig, String srNameLabel, Map smConfig) throws XmlRpcException, XenAPIException { String pooluuid; try { @@ -2471,8 +2456,7 @@ private String resignatureIscsiSr(Connection conn, Host host, Map srs = SR.getByNameLabel(conn, srNameLabel); - for (final SR sr : srs) { - if (!(SRType.LVMOISCSI.equals(sr.getType(conn)))) { - continue; - } - final Set pbds = sr.getPBDs(conn); - if (pbds.isEmpty()) { - continue; - } - final PBD pbd = pbds.iterator().next(); - final Map dc = pbd.getDeviceConfig(conn); - if (dc == null) { - continue; - } - if (dc.get("target") == null) { - continue; - } - if (dc.get("targetIQN") == null) { - continue; - } - if (dc.get("lunid") == null) { - continue; - } - if (target.equals(dc.get("target")) && targetiqn.equals(dc.get("targetIQN")) && lunid.equals(dc.get("lunid"))) { - throw new CloudRuntimeException("There is a SR using the same configuration target:" + dc.get("target") + ", targetIQN:" + dc.get("targetIQN") - + ", lunid:" + dc.get("lunid") + " for pool " + srNameLabel + "on host:" + _host.getUuid()); - } - } + final Set srs = SR.getByNameLabel(conn, srNameLabel); + for (final SR sr : srs) { + if (!(SRType.LVMOISCSI.equals(sr.getType(conn)))) { + continue; + } + final Set pbds = sr.getPBDs(conn); + if (pbds.isEmpty()) { + continue; + } + final PBD pbd = pbds.iterator().next(); + final Map dc = pbd.getDeviceConfig(conn); + if (dc == null) { + continue; + } + if (dc.get("target") == null) { + continue; + } + if (dc.get("targetIQN") == null) { + continue; + } + if (dc.get("lunid") == null) { + continue; + } + if (target.equals(dc.get("target")) && targetiqn.equals(dc.get("targetIQN")) && lunid.equals(dc.get("lunid"))) { + throw new CloudRuntimeException("There is a SR using the same configuration target:" + dc.get("target") + ", targetIQN:" + dc.get("targetIQN") + ", lunid:" + dc.get("lunid") + + " for pool " + srNameLabel + "on host:" + _host.getUuid()); + } + } } - private String probeScisiId(Connection conn, Host host, Map deviceConfig, String type, String srNameLabel, String lunid, Map smConfig) throws XenAPIException, XmlRpcException { - SR sr = null; + private String probeScisiId(Connection conn, Host host, Map deviceConfig, String type, String srNameLabel, String lunid, Map smConfig) + throws XenAPIException, XmlRpcException { String scsiid = null; try { - sr = SR.create(conn, host, deviceConfig, new Long(0), srNameLabel, srNameLabel, type, "user", true, smConfig); + SR.create(conn, host, deviceConfig, new Long(0), srNameLabel, srNameLabel, type, "user", true, smConfig); } catch (final XenAPIException e) { final String errmsg = e.toString(); if (errmsg.contains("SR_BACKEND_FAILURE_107")) { @@ -2593,7 +2577,7 @@ public VDI getIsoVDIByURL(final Connection conn, final String vmName, final Stri String mountpoint = null; if (isoURL.startsWith("xs-tools")) { try { - final String actualIsoURL = actualIsoTemplate(conn); + final String actualIsoURL = getActualIsoTemplate(conn); final Set vdis = VDI.getByNameLabel(conn, actualIsoURL); if (vdis.isEmpty()) { throw new CloudRuntimeException("Could not find ISO with URL: " + actualIsoURL); @@ -2632,20 +2616,27 @@ public VDI getIsoVDIByURL(final Connection conn, final String vmName, final Stri } } - private String actualIsoTemplate(final Connection conn) throws BadServerResponse, XenAPIException, XmlRpcException { - final Host host = Host.getByUuid(conn, _host.getUuid()); - final Host.Record record = host.getRecord(conn); - final String xenBrand = record.softwareVersion.get("product_brand"); - final String xenVersion = record.softwareVersion.get("product_version"); - final String[] items = xenVersion.split("\\."); + /** + * Retrieve the actual ISO 'name-label' to be used. + * We based our decision on XenServer version. + *
    + *
  • for XenServer 7.0+, we use {@value #xenServer70plusGuestToolsName}; + *
  • for versions before 7.0, we use {@value #xenServerBefore70GuestToolsName}. + *
+ * + * For XCP we always use {@value #xenServerBefore70GuestToolsName}. + */ + protected String getActualIsoTemplate(Connection conn) throws XenAPIException, XmlRpcException { + Host host = Host.getByUuid(conn, _host.getUuid()); + Host.Record record = host.getRecord(conn); + String xenBrand = record.softwareVersion.get("product_brand"); + String xenVersion = record.softwareVersion.get("product_version"); + String[] items = xenVersion.split("\\."); - // guest-tools.iso for XenServer version 7.0+ if (xenBrand.equals("XenServer") && Integer.parseInt(items[0]) >= 7) { - return "guest-tools.iso"; + return xenServer70plusGuestToolsName; } - - // xs-tools.iso for older XenServer versions - return "xs-tools.iso"; + return xenServerBefore70GuestToolsName; } public String getLabel() { @@ -2774,8 +2765,8 @@ protected XsLocalNetwork getManagementNetwork(final Connection conn) throws XmlR final PIF.Record rec = pif.getRecord(conn); if (rec.management) { if (rec.VLAN != null && rec.VLAN != -1) { - final String msg = new StringBuilder("Unsupported configuration. Management network is on a VLAN. host=").append(_host.getUuid()).append("; pif=") - .append(rec.uuid).append("; vlan=").append(rec.VLAN).toString(); + final String msg = new StringBuilder("Unsupported configuration. Management network is on a VLAN. host=").append(_host.getUuid()).append("; pif=").append(rec.uuid) + .append("; vlan=").append(rec.VLAN).toString(); s_logger.warn(msg); throw new CloudRuntimeException(msg); } @@ -2795,7 +2786,7 @@ protected XsLocalNetwork getManagementNetwork(final Connection conn) throws XmlR final Bond bond = mgmtPifRec.bondSlaveOf; if (!isRefNull(bond)) { final String msg = "Management interface is on slave(" + mgmtPifRec.uuid + ") of bond(" + bond.getUuid(conn) + ") on host(" + _host.getUuid() - + "), please move management interface to bond!"; + + "), please move management interface to bond!"; s_logger.warn(msg); throw new CloudRuntimeException(msg); } @@ -3014,8 +3005,8 @@ public SR getNfsSR(final Connection conn, final String poolid, final String uuid } if (server.equals(dc.get("server")) && serverpath.equals(dc.get("serverpath"))) { - throw new CloudRuntimeException("There is a SR using the same configuration server:" + dc.get("server") + ", serverpath:" + dc.get("serverpath") - + " for pool " + uuid + " on host:" + _host.getUuid()); + throw new CloudRuntimeException( + "There is a SR using the same configuration server:" + dc.get("server") + ", serverpath:" + dc.get("serverpath") + " for pool " + uuid + " on host:" + _host.getUuid()); } } @@ -3052,7 +3043,7 @@ protected List getPatchFiles() { String patch = getPatchFilePath(); String patchfilePath = Script.findScript("", patch); if (patchfilePath == null) { - throw new CloudRuntimeException("Unable to find patch file "+patch); + throw new CloudRuntimeException("Unable to find patch file " + patch); } List files = new ArrayList(); files.add(new File(patchfilePath)); @@ -3114,7 +3105,7 @@ protected Object[] getRRDData(final Connection conn, final int flag) { } } - return new Object[] { numRows, numColumns, legend, dataNode }; + return new Object[] {numRows, numColumns, legend, dataNode}; } @Override @@ -3153,8 +3144,7 @@ private long getStaticMax(final String os, final boolean b, final long dynamicMi // stability if (dynamicMaxRam > staticMax) { // XS contraint that dynamic max <= // static max - s_logger.warn("dynamixMax " + dynamicMaxRam + " cant be greater than static max " + staticMax - + ", can lead to stability issues. Setting static max as much as dynamic max "); + s_logger.warn("dynamixMax " + dynamicMaxRam + " cant be greater than static max " + staticMax + ", can lead to stability issues. Setting static max as much as dynamic max "); return dynamicMaxRam; } return staticMax; @@ -3295,8 +3285,7 @@ public VDI getVDIbyUuid(final Connection conn, final String uuid, final boolean } public String getVhdParent(final Connection conn, final String primaryStorageSRUuid, final String snapshotUuid, final Boolean isISCSI) { - final String parentUuid = callHostPlugin(conn, "vmopsSnapshot", "getVhdParent", "primaryStorageSRUuid", primaryStorageSRUuid, "snapshotUuid", snapshotUuid, "isISCSI", - isISCSI.toString()); + final String parentUuid = callHostPlugin(conn, "vmopsSnapshot", "getVhdParent", "primaryStorageSRUuid", primaryStorageSRUuid, "snapshotUuid", snapshotUuid, "isISCSI", isISCSI.toString()); if (parentUuid == null || parentUuid.isEmpty() || parentUuid.equalsIgnoreCase("None")) { s_logger.debug("Unable to get parent of VHD " + snapshotUuid + " in SR " + primaryStorageSRUuid); @@ -3351,7 +3340,8 @@ public String getVMInstanceName() { return _instance; } - public long getVMSnapshotChainSize(final Connection conn, final VolumeObjectTO volumeTo, final String vmName, final String vmSnapshotName) throws BadServerResponse, XenAPIException, XmlRpcException { + public long getVMSnapshotChainSize(final Connection conn, final VolumeObjectTO volumeTo, final String vmName, final String vmSnapshotName) + throws BadServerResponse, XenAPIException, XmlRpcException { if (volumeTo.getVolumeType() == Volume.Type.DATADISK) { final VDI dataDisk = VDI.getByUuid(conn, volumeTo.getPath()); if (dataDisk != null) { @@ -3383,10 +3373,10 @@ public long getVMSnapshotChainSize(final Connection conn, final VolumeObjectTO v } if (volumeTo.getVolumeType() == Volume.Type.ROOT) { VM vm = getVM(conn, vmName); - if(vm != null){ - Set vmSnapshots=vm.getSnapshots(conn); - if(vmSnapshots != null){ - for(VM vmsnap: vmSnapshots){ + if (vm != null) { + Set vmSnapshots = vm.getSnapshots(conn); + if (vmSnapshots != null) { + for (VM vmsnap : vmSnapshots) { try { final String vmSnapName = vmsnap.getNameLabel(conn); s_logger.debug("snapname " + vmSnapName); @@ -3395,16 +3385,16 @@ public long getVMSnapshotChainSize(final Connection conn, final VolumeObjectTO v VDI memoryVDI = vmsnap.getSuspendVDI(conn); if (!isRefNull(memoryVDI)) { size = size + memoryVDI.getPhysicalUtilisation(conn); - s_logger.debug("memoryVDI size :"+size); + s_logger.debug("memoryVDI size :" + size); String parentUuid = memoryVDI.getSmConfig(conn).get("vhd-parent"); VDI pMemoryVDI = VDI.getByUuid(conn, parentUuid); if (!isRefNull(pMemoryVDI)) { size = size + pMemoryVDI.getPhysicalUtilisation(conn); } - s_logger.debug("memoryVDI size+parent :"+size); + s_logger.debug("memoryVDI size+parent :" + size); } } - } catch (Exception e) { + } catch (Exception e) { s_logger.debug("Exception occurs when calculate snapshot capacity for memory: due to " + e.toString()); continue; } @@ -3462,7 +3452,7 @@ public HashMap getVmStats(final Connection conn, final Get final HashMap vmResponseMap = new HashMap(); for (final String vmUUID : vmUUIDs) { - vmResponseMap.put(vmUUID, new VmStatsEntry(0,0,0,0, 0, 0, 0, "vm")); + vmResponseMap.put(vmUUID, new VmStatsEntry(0, 0, 0, 0, 0, 0, 0, "vm")); } final Object[] rrdData = getRRDData(conn, 2); // call rrddata with 2 for @@ -3472,10 +3462,10 @@ public HashMap getVmStats(final Connection conn, final Get return null; } - final Integer numRows = (Integer) rrdData[0]; - final Integer numColumns = (Integer) rrdData[1]; - final Node legend = (Node) rrdData[2]; - final Node dataNode = (Node) rrdData[3]; + final Integer numRows = (Integer)rrdData[0]; + final Integer numColumns = (Integer)rrdData[1]; + final Node legend = (Node)rrdData[2]; + final Node dataNode = (Node)rrdData[3]; final NodeList legendChildren = legend.getChildNodes(); for (int col = 0; col < numColumns; col++) { @@ -3682,9 +3672,9 @@ public StartupCommand[] initialize() throws IllegalArgumentException { } final StartupStorageCommand sscmd = initializeLocalSR(conn); if (sscmd != null) { - return new StartupCommand[] { cmd, sscmd }; + return new StartupCommand[] {cmd, sscmd}; } - return new StartupCommand[] { cmd }; + return new StartupCommand[] {cmd}; } protected StartupStorageCommand initializeLocalSR(final Connection conn) { @@ -3834,8 +3824,7 @@ boolean killCopyProcess(final Connection conn, final String nameLabel) { } public boolean launchHeartBeat(final Connection conn) { - final String result = callHostPluginPremium(conn, "heartbeat", "host", _host.getUuid(), "timeout", Integer.toString(_heartbeatTimeout), "interval", - Integer.toString(_heartbeatInterval)); + final String result = callHostPluginPremium(conn, "heartbeat", "host", _host.getUuid(), "timeout", Integer.toString(_heartbeatTimeout), "interval", Integer.toString(_heartbeatInterval)); if (result == null || !result.contains("> DONE <")) { s_logger.warn("Unable to launch the heartbeat process on " + _host.getIp()); return false; @@ -3888,7 +3877,7 @@ protected VDI mount(final Connection conn, final String vmName, final DiskTO vol final DataTO data = volume.getData(); final Volume.Type type = volume.getType(); if (type == Volume.Type.ISO) { - final TemplateObjectTO iso = (TemplateObjectTO) data; + final TemplateObjectTO iso = (TemplateObjectTO)data; final DataStoreTO store = iso.getDataStore(); if (store == null) { @@ -3900,7 +3889,7 @@ protected VDI mount(final Connection conn, final String vmName, final DiskTO vol final String templateName = iso.getName(); if (templateName.startsWith("xs-tools")) { try { - final String actualTemplateName = actualIsoTemplate(conn); + final String actualTemplateName = getActualIsoTemplate(conn); final Set vdis = VDI.getByNameLabel(conn, actualTemplateName); if (vdis.isEmpty()) { throw new CloudRuntimeException("Could not find ISO with URL: " + actualTemplateName); @@ -3916,7 +3905,7 @@ protected VDI mount(final Connection conn, final String vmName, final DiskTO vol if (!(store instanceof NfsTO)) { throw new CloudRuntimeException("only support mount iso on nfs"); } - final NfsTO nfsStore = (NfsTO) store; + final NfsTO nfsStore = (NfsTO)store; final String isoPath = nfsStore.getUrl() + File.separator + iso.getPath(); final int index = isoPath.lastIndexOf("/"); @@ -3938,7 +3927,7 @@ protected VDI mount(final Connection conn, final String vmName, final DiskTO vol } return isoVdi; } else { - final VolumeObjectTO vol = (VolumeObjectTO) data; + final VolumeObjectTO vol = (VolumeObjectTO)data; return VDI.getByUuid(conn, vol.getPath()); } } @@ -4057,8 +4046,8 @@ protected void plugDom0Vif(final Connection conn, final VIF dom0Vif) throws XmlR } } - protected boolean postCreatePrivateTemplate(final Connection conn, final String templatePath, final String tmpltFilename, final String templateName, - String templateDescription, String checksum, final long size, final long virtualSize, final long templateId) { + protected boolean postCreatePrivateTemplate(final Connection conn, final String templatePath, final String tmpltFilename, final String templateName, String templateDescription, String checksum, + final long size, final long virtualSize, final long templateId) { if (templateDescription == null) { templateDescription = ""; @@ -4068,9 +4057,8 @@ protected boolean postCreatePrivateTemplate(final Connection conn, final String checksum = ""; } - final String result = callHostPlugin(conn, "vmopsSnapshot", "post_create_private_template", "templatePath", templatePath, "templateFilename", tmpltFilename, - "templateName", templateName, "templateDescription", templateDescription, "checksum", checksum, "size", String.valueOf(size), "virtualSize", - String.valueOf(virtualSize), "templateId", String.valueOf(templateId)); + final String result = callHostPlugin(conn, "vmopsSnapshot", "post_create_private_template", "templatePath", templatePath, "templateFilename", tmpltFilename, "templateName", templateName, + "templateDescription", templateDescription, "checksum", checksum, "size", String.valueOf(size), "virtualSize", String.valueOf(virtualSize), "templateId", String.valueOf(templateId)); boolean success = false; if (result != null && !result.isEmpty()) { @@ -4094,20 +4082,20 @@ public ExecutionResult prepareCommand(final NetworkElementCommand cmd) { assert cmd.getRouterAccessIp() != null; if (cmd instanceof IpAssocVpcCommand) { - return prepareNetworkElementCommand((IpAssocVpcCommand) cmd); + return prepareNetworkElementCommand((IpAssocVpcCommand)cmd); } else if (cmd instanceof IpAssocCommand) { - return prepareNetworkElementCommand((IpAssocCommand) cmd); + return prepareNetworkElementCommand((IpAssocCommand)cmd); } else if (cmd instanceof SetupGuestNetworkCommand) { - return prepareNetworkElementCommand((SetupGuestNetworkCommand) cmd); + return prepareNetworkElementCommand((SetupGuestNetworkCommand)cmd); } else if (cmd instanceof SetSourceNatCommand) { - return prepareNetworkElementCommand((SetSourceNatCommand) cmd); + return prepareNetworkElementCommand((SetSourceNatCommand)cmd); } else if (cmd instanceof SetNetworkACLCommand) { - return prepareNetworkElementCommand((SetNetworkACLCommand) cmd); + return prepareNetworkElementCommand((SetNetworkACLCommand)cmd); } return new ExecutionResult(true, null); } - public void prepareISO(final Connection conn, final String vmName, List vmDataList, String configDriveLabel) throws XmlRpcException, XenAPIException { + public void prepareISO(final Connection conn, final String vmName, List vmDataList, String configDriveLabel) throws XmlRpcException, XenAPIException { final Set vms = VM.getByNameLabel(conn, vmName); if (vms == null || vms.size() != 1) { @@ -4117,7 +4105,7 @@ public void prepareISO(final Connection conn, final String vmName, List d return getNfsSR(conn, poolid, namelable, storageHost, mountpoint, volumedesc); } else { - return getIscsiSR(conn, iScsiName, storageHost, iScsiName, - chapInitiatorUsername, chapInitiatorSecret, false, SRType.LVMOISCSI.toString(), true); + return getIscsiSR(conn, iScsiName, storageHost, iScsiName, chapInitiatorUsername, chapInitiatorSecret, false, SRType.LVMOISCSI.toString(), true); } } @@ -4590,8 +4577,8 @@ protected String removeSRSync(final Connection conn, final SR sr) { public String revertToSnapshot(final Connection conn, final VM vmSnapshot, final String vmName, final String oldVmUuid, final Boolean snapshotMemory, final String hostUUID) throws XenAPIException, XmlRpcException { - final String results = callHostPluginAsync(conn, "vmopsSnapshot", "revert_memory_snapshot", 10 * 60 * 1000, "snapshotUUID", vmSnapshot.getUuid(conn), "vmName", vmName, - "oldVmUuid", oldVmUuid, "snapshotMemory", snapshotMemory.toString(), "hostUUID", hostUUID); + final String results = callHostPluginAsync(conn, "vmopsSnapshot", "revert_memory_snapshot", 10 * 60 * 1000, "snapshotUUID", vmSnapshot.getUuid(conn), "vmName", vmName, "oldVmUuid", oldVmUuid, + "snapshotMemory", snapshotMemory.toString(), "hostUUID", hostUUID); String errMsg = null; if (results == null || results.isEmpty()) { errMsg = "revert_memory_snapshot return null"; @@ -4613,12 +4600,12 @@ public void scaleVM(final Connection conn, final VM vm, final VirtualMachineTO v final Long newDynamicMemoryMin = vmSpec.getMinRam(); final Long newDynamicMemoryMax = vmSpec.getMaxRam(); if (staticMemoryMin > newDynamicMemoryMin || newDynamicMemoryMax > staticMemoryMax) { - throw new CloudRuntimeException("Cannot scale up the vm because of memory constraint violation: " + "0 <= memory-static-min(" + staticMemoryMin - + ") <= memory-dynamic-min(" + newDynamicMemoryMin + ") <= memory-dynamic-max(" + newDynamicMemoryMax + ") <= memory-static-max(" + staticMemoryMax + ")"); + throw new CloudRuntimeException("Cannot scale up the vm because of memory constraint violation: " + "0 <= memory-static-min(" + staticMemoryMin + ") <= memory-dynamic-min(" + + newDynamicMemoryMin + ") <= memory-dynamic-max(" + newDynamicMemoryMax + ") <= memory-static-max(" + staticMemoryMax + ")"); } vm.setMemoryDynamicRange(conn, newDynamicMemoryMin, newDynamicMemoryMax); - vm.setVCPUsNumberLive(conn, (long) vmSpec.getCpus()); + vm.setVCPUsNumberLive(conn, (long)vmSpec.getCpus()); final Integer speed = vmSpec.getMinSpeed(); if (speed != null) { @@ -4627,14 +4614,14 @@ public void scaleVM(final Connection conn, final VM vm, final VirtualMachineTO v // weight based allocation - cpuWeight = (int) (speed * 0.99 / _host.getSpeed() * _maxWeight); + cpuWeight = (int)(speed * 0.99 / _host.getSpeed() * _maxWeight); if (cpuWeight > _maxWeight) { cpuWeight = _maxWeight; } if (vmSpec.getLimitCpuUse()) { long utilization = 0; // max CPU cap, default is unlimited - utilization = (int) (vmSpec.getMaxSpeed() * 0.99 * vmSpec.getCpus() / _host.getSpeed() * 100); + utilization = (int)(vmSpec.getMaxSpeed() * 0.99 * vmSpec.getCpus() / _host.getSpeed() * 100); // vm.addToVCPUsParamsLive(conn, "cap", // Long.toString(utilization)); currently xenserver doesnot // support Xapi to add VCPUs params live. @@ -4691,8 +4678,8 @@ protected void setMemory(final Connection conn, final VM vm, final long minMemsi public void setName(final String name) { } - protected void setNicDevIdIfCorrectVifIsNotNull(final Connection conn, final IpAddressTO ip, final VIF correctVif) throws InternalErrorException, BadServerResponse, - XenAPIException, XmlRpcException { + protected void setNicDevIdIfCorrectVifIsNotNull(final Connection conn, final IpAddressTO ip, final VIF correctVif) + throws InternalErrorException, BadServerResponse, XenAPIException, XmlRpcException { if (correctVif == null) { if (ip.isAdd()) { throw new InternalErrorException("Failed to find DomR VIF to associate IP with."); @@ -4870,8 +4857,8 @@ public boolean setupServer(final Connection conn, final Host host) { final Properties props = PropertiesUtil.loadFromFile(file); for (final Map.Entry entry : props.entrySet()) { - final String k = (String) entry.getKey(); - final String v = (String) entry.getValue(); + final String k = (String)entry.getKey(); + final String v = (String)entry.getValue(); assert k != null && k.length() > 0 && v != null && v.length() > 0 : "Problems with " + k + "=" + v; @@ -5211,8 +5198,7 @@ public String upgradeSnapshot(final Connection conn, final String templatePath, public void waitForTask(final Connection c, final Task task, final long pollInterval, final long timeout) throws XenAPIException, XmlRpcException, TimeoutException { final long beginTime = System.currentTimeMillis(); if (s_logger.isTraceEnabled()) { - s_logger.trace("Task " + task.getNameLabel(c) + " (" + task.getUuid(c) + ") sent to " + c.getSessionReference() + " is pending completion with a " + timeout - + "ms timeout"); + s_logger.trace("Task " + task.getNameLabel(c) + " (" + task.getUuid(c) + ") sent to " + c.getSessionReference() + " is pending completion with a " + timeout + "ms timeout"); } while (task.getStatus(c) == Types.TaskStatusType.PENDING) { try { @@ -5237,16 +5223,16 @@ public boolean createAndAttachConfigDriveIsoForVM(final Connection conn, final V final String vmName = vm.getNameLabel(conn); // create SR - final SR sr = createLocalIsoSR(conn, _configDriveSRName+_host.getIp()); + final SR sr = createLocalIsoSR(conn, _configDriveSRName + _host.getIp()); if (sr == null) { s_logger.debug("Failed to create local SR for the config drive"); return false; } - s_logger.debug("Creating vm data files in config drive for vm "+vmName); + s_logger.debug("Creating vm data files in config drive for vm " + vmName); // 1. create vm data files if (!createVmdataFiles(vmName, vmDataList, configDriveLabel)) { - s_logger.debug("Failed to create vm data files in config drive for vm "+vmName); + s_logger.debug("Failed to create vm data files in config drive for vm " + vmName); return false; } @@ -5266,7 +5252,7 @@ public boolean createAndAttachConfigDriveIsoForVM(final Connection conn, final V public boolean createVmdataFiles(final String vmName, final List vmDataList, final String configDriveLabel) { // add vm iso to the isolibrary - final String isoPath = "/tmp/"+vmName+"/configDrive/"; + final String isoPath = "/tmp/" + vmName + "/configDrive/"; final String configDriveName = "cloudstack/"; //create folder for the VM @@ -5275,12 +5261,11 @@ public boolean createVmdataFiles(final String vmName, final List vmDat try { deleteLocalFolder("/tmp/" + isoPath); } catch (final IOException e) { - s_logger.debug("Failed to delete the exiting config drive for vm "+vmName+ " "+ e.getMessage()); + s_logger.debug("Failed to delete the exiting config drive for vm " + vmName + " " + e.getMessage()); } catch (final Exception e) { - s_logger.debug("Failed to delete the exiting config drive for vm "+vmName+ " "+ e.getMessage()); + s_logger.debug("Failed to delete the exiting config drive for vm " + vmName + " " + e.getMessage()); } - if (vmDataList != null) { for (final String[] item : vmDataList) { final String dataType = item[0]; @@ -5291,7 +5276,7 @@ public boolean createVmdataFiles(final String vmName, final List vmDat if (dataType != null && !dataType.isEmpty()) { //create folder - final String folder = isoPath+configDriveName+dataType; + final String folder = isoPath + configDriveName + dataType; if (folder != null && !folder.isEmpty()) { final File dir = new File(folder); final boolean result = true; @@ -5300,40 +5285,37 @@ public boolean createVmdataFiles(final String vmName, final List vmDat if (!dir.exists()) { dir.mkdirs(); } - }catch (final SecurityException ex) { - s_logger.debug("Failed to create dir "+ ex.getMessage()); + } catch (final SecurityException ex) { + s_logger.debug("Failed to create dir " + ex.getMessage()); return false; } if (result && content != null && !content.isEmpty()) { - File file = new File(folder+"/"+fileName+".txt"); - try (OutputStreamWriter fw = new OutputStreamWriter(new FileOutputStream(file.getAbsoluteFile()),"UTF-8"); - BufferedWriter bw = new BufferedWriter(fw); - ) { + File file = new File(folder + "/" + fileName + ".txt"); + try (OutputStreamWriter fw = new OutputStreamWriter(new FileOutputStream(file.getAbsoluteFile()), "UTF-8"); + BufferedWriter bw = new BufferedWriter(fw);) { bw.write(content); - s_logger.debug("created file: "+ file + " in folder:"+folder); + s_logger.debug("created file: " + file + " in folder:" + folder); } catch (final IOException ex) { - s_logger.debug("Failed to create file "+ ex.getMessage()); + s_logger.debug("Failed to create file " + ex.getMessage()); return false; } } } } } - s_logger.debug("Created the vm data in "+ isoPath); + s_logger.debug("Created the vm data in " + isoPath); } String s = null; try { - final String cmd = "mkisofs -iso-level 3 -V "+ configDriveLabel +" -o "+ isoPath+vmName +".iso " + isoPath; + final String cmd = "mkisofs -iso-level 3 -V " + configDriveLabel + " -o " + isoPath + vmName + ".iso " + isoPath; final Process p = Runtime.getRuntime().exec(cmd); - final BufferedReader stdInput = new BufferedReader(new - InputStreamReader(p.getInputStream(),Charset.defaultCharset())); + final BufferedReader stdInput = new BufferedReader(new InputStreamReader(p.getInputStream(), Charset.defaultCharset())); - final BufferedReader stdError = new BufferedReader(new - InputStreamReader(p.getErrorStream(),Charset.defaultCharset())); + final BufferedReader stdError = new BufferedReader(new InputStreamReader(p.getErrorStream(), Charset.defaultCharset())); // read the output from the command while ((s = stdInput.readLine()) != null) { @@ -5344,7 +5326,7 @@ public boolean createVmdataFiles(final String vmName, final List vmDat while ((s = stdError.readLine()) != null) { s_logger.debug(s); } - s_logger.debug(" Created config drive ISO using the command " + cmd +" in the host "+ _host.getIp()); + s_logger.debug(" Created config drive ISO using the command " + cmd + " in the host " + _host.getIp()); } catch (final IOException e) { s_logger.debug(e.getMessage()); return false; @@ -5355,7 +5337,7 @@ public boolean createVmdataFiles(final String vmName, final List vmDat public boolean copyConfigDriveIsoToHost(final Connection conn, final SR sr, final String vmName) { - final String vmIso = "/tmp/"+vmName+"/configDrive/"+vmName+".iso"; + final String vmIso = "/tmp/" + vmName + "/configDrive/" + vmName + ".iso"; //scp file into the host final com.trilead.ssh2.Connection sshConnection = new com.trilead.ssh2.Connection(_host.getIp(), 22); @@ -5365,7 +5347,7 @@ public boolean copyConfigDriveIsoToHost(final Connection conn, final SR sr, fina throw new CloudRuntimeException("Unable to authenticate"); } - s_logger.debug("scp config drive iso file "+vmIso +" to host " + _host.getIp() +" path "+_configDriveIsopath); + s_logger.debug("scp config drive iso file " + vmIso + " to host " + _host.getIp() + " path " + _configDriveIsopath); final SCPClient scp = new SCPClient(sshConnection); final String p = "0755"; @@ -5376,20 +5358,18 @@ public boolean copyConfigDriveIsoToHost(final Connection conn, final SR sr, fina s_logger.debug("failed to copy configdrive iso " + vmIso + " to host " + _host, e); return false; } catch (final XmlRpcException e) { - s_logger.debug("Failed to scan config drive iso SR "+ _configDriveSRName+_host.getIp() + " in host "+ _host, e); + s_logger.debug("Failed to scan config drive iso SR " + _configDriveSRName + _host.getIp() + " in host " + _host, e); return false; } finally { sshConnection.close(); //clean up the config drive files - final String configDir = "/tmp/"+vmName; + final String configDir = "/tmp/" + vmName; try { deleteLocalFolder(configDir); - s_logger.debug("Successfully cleaned up config drive directory " + configDir - + " after copying it to host "); + s_logger.debug("Successfully cleaned up config drive directory " + configDir + " after copying it to host "); } catch (final Exception e) { - s_logger.debug("Failed to delete config drive folder :" + configDir + " for VM " + vmName + " " - + e.getMessage()); + s_logger.debug("Failed to delete config drive folder :" + configDir + " for VM " + vmName + " " + e.getMessage()); } } @@ -5399,7 +5379,7 @@ public boolean copyConfigDriveIsoToHost(final Connection conn, final SR sr, fina public boolean attachConfigDriveIsoToVm(final Connection conn, final VM vm) throws XenAPIException, XmlRpcException { final String vmName = vm.getNameLabel(conn); - final String isoURL = _configDriveIsopath + vmName+".iso"; + final String isoURL = _configDriveIsopath + vmName + ".iso"; VDI srVdi; //1. find the vdi of the iso @@ -5407,11 +5387,11 @@ public boolean attachConfigDriveIsoToVm(final Connection conn, final VM vm) thro //3. attach iso to vm try { - final Set vdis = VDI.getByNameLabel(conn, vmName+".iso"); + final Set vdis = VDI.getByNameLabel(conn, vmName + ".iso"); if (vdis.isEmpty()) { throw new CloudRuntimeException("Could not find ISO with URL: " + isoURL); } - srVdi = vdis.iterator().next(); + srVdi = vdis.iterator().next(); } catch (final XenAPIException e) { s_logger.debug("Unable to get config drive iso: " + isoURL + " due to " + e.toString()); @@ -5462,7 +5442,7 @@ public boolean attachConfigDriveIsoToVm(final Connection conn, final VM vm) thro // Insert the new ISO isoVBD.insert(conn, srVdi); s_logger.debug("Attached config drive iso to vm " + vmName); - }catch (final XmlRpcException ex) { + } catch (final XmlRpcException ex) { s_logger.debug("Failed to attach config drive iso to vm " + vmName); return false; } @@ -5474,14 +5454,14 @@ public boolean attachConfigDriveIsoToVm(final Connection conn, final VM vm) thro public SR createLocalIsoSR(final Connection conn, final String srName) throws XenAPIException, XmlRpcException { // if config drive sr already exists then return - SR sr = getSRByNameLabelandHost(conn, _configDriveSRName+_host.getIp()); + SR sr = getSRByNameLabelandHost(conn, _configDriveSRName + _host.getIp()); if (sr != null) { s_logger.debug("Config drive SR already exist, returing it"); return sr; } - try{ + try { final Map deviceConfig = new HashMap(); final com.trilead.ssh2.Connection sshConnection = new com.trilead.ssh2.Connection(_host.getIp(), 22); @@ -5500,19 +5480,19 @@ public SR createLocalIsoSR(final Connection conn, final String srName) throws Xe } finally { sshConnection.close(); } - s_logger.debug("Created the config drive SR " + srName +" folder path "+ _configDriveIsopath); + s_logger.debug("Created the config drive SR " + srName + " folder path " + _configDriveIsopath); - deviceConfig.put("location", _configDriveIsopath); + deviceConfig.put("location", _configDriveIsopath); deviceConfig.put("legacy_mode", "true"); final Host host = Host.getByUuid(conn, _host.getUuid()); final String type = SRType.ISO.toString(); - sr = SR.create(conn, host, deviceConfig, new Long(0), _configDriveIsopath, "iso", type, "iso", false, new HashMap()); + sr = SR.create(conn, host, deviceConfig, new Long(0), _configDriveIsopath, "iso", type, "iso", false, new HashMap()); sr.setNameLabel(conn, srName); sr.setNameDescription(conn, deviceConfig.get("location")); sr.scan(conn); - s_logger.debug("Config drive ISO SR at the path " + _configDriveIsopath +" got created in host " + _host); + s_logger.debug("Config drive ISO SR at the path " + _configDriveIsopath + " got created in host " + _host); return sr; } catch (final XenAPIException e) { final String msg = "createLocalIsoSR failed! mountpoint " + e.toString(); @@ -5559,13 +5539,12 @@ protected SR getSRByNameLabel(Connection conn, String name) throws BadServerResp return ressr; } - public boolean attachConfigDriveToMigratedVm(Connection conn, String vmName, String ipAddr) { // attach the config drive in destination host try { - s_logger.debug("Attaching config drive iso device for the VM "+ vmName + " In host "+ ipAddr); + s_logger.debug("Attaching config drive iso device for the VM " + vmName + " In host " + ipAddr); Set vms = VM.getByNameLabel(conn, vmName); SR sr = getSRByNameLabel(conn, _configDriveSRName + ipAddr); @@ -5618,13 +5597,13 @@ public boolean attachConfigDriveToMigratedVm(Connection conn, String vmName, Str return true; } catch (BadServerResponse e) { - s_logger.warn("Failed to attach config drive ISO to the VM "+ vmName + " In host " + ipAddr + " due to a bad server response.", e); + s_logger.warn("Failed to attach config drive ISO to the VM " + vmName + " In host " + ipAddr + " due to a bad server response.", e); return false; } catch (XenAPIException e) { - s_logger.warn("Failed to attach config drive ISO to the VM "+ vmName + " In host " + ipAddr + " due to a xapi problem.", e); + s_logger.warn("Failed to attach config drive ISO to the VM " + vmName + " In host " + ipAddr + " due to a xapi problem.", e); return false; } catch (XmlRpcException e) { - s_logger.warn("Failed to attach config drive ISO to the VM "+ vmName + " In host " + ipAddr + " due to a problem in a remote call.", e); + s_logger.warn("Failed to attach config drive ISO to the VM " + vmName + " In host " + ipAddr + " due to a problem in a remote call.", e); return false; } diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscovererTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscovererTest.java new file mode 100644 index 000000000000..a3082c609877 --- /dev/null +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscovererTest.java @@ -0,0 +1,72 @@ +// 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.hypervisor.xenserver.discoverer; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InOrder; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.Spy; +import org.mockito.runners.MockitoJUnitRunner; + +import com.cloud.storage.Storage.TemplateType; +import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.dao.VMTemplateDao; + +@RunWith(MockitoJUnitRunner.class) +public class XcpServerDiscovererTest { + + @Spy + @InjectMocks + private XcpServerDiscoverer xcpServerDiscoverer; + + @Mock + private VMTemplateDao vmTemplateDao; + + @Test + public void createXenServerToolsIsoEntryInDatabaseTestNoEntryFound() { + Mockito.when(vmTemplateDao.findByTemplateName("xs-tools.iso")).thenReturn(null); + Mockito.when(vmTemplateDao.getNextInSequence(Long.class, "id")).thenReturn(1L); + + xcpServerDiscoverer.createXenServerToolsIsoEntryInDatabase(); + + InOrder inOrder = Mockito.inOrder(vmTemplateDao); + inOrder.verify(vmTemplateDao).findByTemplateName("xs-tools.iso"); + inOrder.verify(vmTemplateDao).getNextInSequence(Long.class, "id"); + inOrder.verify(vmTemplateDao).persist(Mockito.any(VMTemplateVO.class)); + } + + @Test + public void createXenServerToolsIsoEntryInDatabaseTestEntryAlreadyExist() { + VMTemplateVO vmTemplateVOMock = Mockito.mock(VMTemplateVO.class); + Mockito.when(vmTemplateDao.findByTemplateName("xs-tools.iso")).thenReturn(vmTemplateVOMock); + Mockito.when(vmTemplateVOMock.getId()).thenReturn(1L); + + xcpServerDiscoverer.createXenServerToolsIsoEntryInDatabase(); + + InOrder inOrder = Mockito.inOrder(vmTemplateDao, vmTemplateVOMock); + inOrder.verify(vmTemplateDao).findByTemplateName("xs-tools.iso"); + inOrder.verify(vmTemplateDao, Mockito.times(0)).getNextInSequence(Long.class, "id"); + inOrder.verify(vmTemplateVOMock).setTemplateType(TemplateType.PERHOST); + inOrder.verify(vmTemplateVOMock).setUrl(null); + inOrder.verify(vmTemplateVOMock).setDisplayText("XenServer Tools Installer ISO (xen-pv-drv-iso)"); + inOrder.verify(vmTemplateDao).update(1L, vmTemplateVOMock); + } +} diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java index 67fce927951e..dfdc127fab18 100644 --- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java @@ -16,17 +16,32 @@ package com.cloud.hypervisor.xenserver.resource; import java.io.File; +import java.util.HashMap; import java.util.List; +import org.apache.xmlrpc.XmlRpcException; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; import org.mockito.Mockito; +import org.mockito.Spy; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; import com.cloud.utils.script.Script; +import com.xensource.xenapi.Connection; +import com.xensource.xenapi.Host; +import com.xensource.xenapi.Host.Record; +import com.xensource.xenapi.Types.XenAPIException; +@RunWith(PowerMockRunner.class) +@PrepareForTest({Host.class, Script.class}) public class CitrixResourceBaseTest { + @Spy protected CitrixResourceBase citrixResourceBase = new CitrixResourceBase() { @Override protected String getPatchFilePath() { @@ -34,6 +49,27 @@ protected String getPatchFilePath() { } }; + @Mock + private Connection connectionMock; + @Mock + private Host hostMock; + @Mock + private Record hostRecordMock; + + private String hostUuidMock = "hostUuidMock"; + + @Before + public void beforeTest() throws XenAPIException, XmlRpcException { + citrixResourceBase._host.setUuid(hostUuidMock); + + PowerMockito.mockStatic(Host.class); + PowerMockito.when(Host.getByUuid(connectionMock, hostUuidMock)).thenReturn(hostMock); + + hostRecordMock.softwareVersion = new HashMap<>(); + Mockito.when(hostMock.getRecord(connectionMock)).thenReturn(hostRecordMock); + + } + public void testGetPathFilesExeption() { String patch = citrixResourceBase.getPatchFilePath(); @@ -92,4 +128,44 @@ public void testGetGuestOsTypeOther() { String guestOsType = citrixResourceBase.getGuestOsType(platformEmulator); Assert.assertEquals(platformEmulator, guestOsType); } + + @Test + public void actualIsoTemplateTestXcpHots() throws XenAPIException, XmlRpcException { + hostRecordMock.softwareVersion.put("product_brand", "XCP"); + hostRecordMock.softwareVersion.put("product_version", "1.0"); + + String returnedIsoTemplateName = citrixResourceBase.getActualIsoTemplate(connectionMock); + + Assert.assertEquals("xs-tools.iso", returnedIsoTemplateName); + } + + @Test + public void actualIsoTemplateTestXenServerBefore70() throws XenAPIException, XmlRpcException { + hostRecordMock.softwareVersion.put("product_brand", "XenServer"); + hostRecordMock.softwareVersion.put("product_version", "6.0"); + + String returnedIsoTemplateName = citrixResourceBase.getActualIsoTemplate(connectionMock); + + Assert.assertEquals("xs-tools.iso", returnedIsoTemplateName); + } + + @Test + public void actualIsoTemplateTestXenServer70() throws XenAPIException, XmlRpcException { + hostRecordMock.softwareVersion.put("product_brand", "XenServer"); + hostRecordMock.softwareVersion.put("product_version", "7.0"); + + String returnedIsoTemplateName = citrixResourceBase.getActualIsoTemplate(connectionMock); + + Assert.assertEquals("guest-tools.iso", returnedIsoTemplateName); + } + + @Test + public void actualIsoTemplateTestXenServer71() throws XenAPIException, XmlRpcException { + hostRecordMock.softwareVersion.put("product_brand", "XenServer"); + hostRecordMock.softwareVersion.put("product_version", "7.1"); + + String returnedIsoTemplateName = citrixResourceBase.getActualIsoTemplate(connectionMock); + + Assert.assertEquals("guest-tools.iso", returnedIsoTemplateName); + } } diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpOssResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpOssResourceTest.java index 9266bf915f8e..15bd88b0db70 100644 --- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpOssResourceTest.java +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpOssResourceTest.java @@ -15,21 +15,21 @@ */ package com.cloud.hypervisor.xenserver.resource; +import org.apache.xmlrpc.XmlRpcException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.script.Script; -@RunWith(PowerMockRunner.class) -public class XcpOssResourceTest extends CitrixResourceBaseTest{ +import com.xensource.xenapi.Types.XenAPIException; + +public class XcpOssResourceTest extends CitrixResourceBaseTest { @Before - public void beforeTest() { + @Override + public void beforeTest() throws XenAPIException, XmlRpcException { super.citrixResourceBase = new XcpOssResource(); + super.beforeTest(); } @Test @@ -41,13 +41,11 @@ public void testPatchFilePath() { } @Test(expected = CloudRuntimeException.class) - @PrepareForTest(Script.class ) public void testGetFiles(){ testGetPathFilesExeption(); } @Test - @PrepareForTest(Script.class ) public void testGetFilesListReturned(){ testGetPathFilesListReturned(); } diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpServerResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpServerResourceTest.java index 5b80a1dc08ed..6a90f234c500 100644 --- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpServerResourceTest.java +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpServerResourceTest.java @@ -15,22 +15,21 @@ */ package com.cloud.hypervisor.xenserver.resource; +import org.apache.xmlrpc.XmlRpcException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.script.Script; +import com.xensource.xenapi.Types.XenAPIException; -@RunWith(PowerMockRunner.class) -public class XcpServerResourceTest extends CitrixResourceBaseTest{ +public class XcpServerResourceTest extends CitrixResourceBaseTest { @Before - public void beforeTest() { + @Override + public void beforeTest() throws XenAPIException, XmlRpcException { super.citrixResourceBase = new XcpServerResource(); + super.beforeTest(); } @Test @@ -42,13 +41,11 @@ public void testPatchFilePath() { } @Test(expected = CloudRuntimeException.class) - @PrepareForTest(Script.class ) public void testGetFilesExeption(){ testGetPathFilesExeption(); } @Test - @PrepareForTest(Script.class ) public void testGetFilesListReturned(){ testGetPathFilesListReturned(); } diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56FP1ResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56FP1ResourceTest.java index d2edbd4db9de..84df3c69f1c1 100644 --- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56FP1ResourceTest.java +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56FP1ResourceTest.java @@ -15,22 +15,21 @@ */ package com.cloud.hypervisor.xenserver.resource; +import org.apache.xmlrpc.XmlRpcException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.script.Script; +import com.xensource.xenapi.Types.XenAPIException; -@RunWith(PowerMockRunner.class) -public class XenServer56FP1ResourceTest extends CitrixResourceBaseTest{ +public class XenServer56FP1ResourceTest extends CitrixResourceBaseTest { @Before - public void beforeTest() { + @Override + public void beforeTest() throws XenAPIException, XmlRpcException { super.citrixResourceBase = new XenServer56FP1Resource(); + super.beforeTest(); } @Test @@ -42,13 +41,11 @@ public void testPatchFilePath() { } @Test(expected = CloudRuntimeException.class) - @PrepareForTest(Script.class ) public void testGetFiles(){ testGetPathFilesExeption(); } @Test - @PrepareForTest(Script.class ) public void testGetFilesListReturned(){ testGetPathFilesListReturned(); } diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56ResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56ResourceTest.java index dccdb28175a0..4f6c2b3f65a3 100644 --- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56ResourceTest.java +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56ResourceTest.java @@ -15,21 +15,21 @@ */ package com.cloud.hypervisor.xenserver.resource; +import org.apache.xmlrpc.XmlRpcException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.script.Script; -@RunWith(PowerMockRunner.class) +import com.xensource.xenapi.Types.XenAPIException; + public class XenServer56ResourceTest extends CitrixResourceBaseTest { + @Override @Before - public void beforeTest() { + public void beforeTest() throws XenAPIException, XmlRpcException { super.citrixResourceBase = new XenServer56Resource(); + super.beforeTest(); } @Test @@ -41,13 +41,11 @@ public void testPatchFilePath() { } @Test(expected = CloudRuntimeException.class) - @PrepareForTest(Script.class ) public void testGetFiles(){ testGetPathFilesExeption(); } @Test - @PrepareForTest(Script.class ) public void testGetFilesListReturned(){ testGetPathFilesListReturned(); } diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56SP2ResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56SP2ResourceTest.java index 4cc947053868..f34c89baa8dd 100644 --- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56SP2ResourceTest.java +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56SP2ResourceTest.java @@ -15,21 +15,21 @@ */ package com.cloud.hypervisor.xenserver.resource; +import org.apache.xmlrpc.XmlRpcException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.script.Script; -@RunWith(PowerMockRunner.class) -public class XenServer56SP2ResourceTest extends CitrixResourceBaseTest{ +import com.xensource.xenapi.Types.XenAPIException; +public class XenServer56SP2ResourceTest extends CitrixResourceBaseTest { + + @Override @Before - public void beforeTest() { + public void beforeTest() throws XenAPIException, XmlRpcException { super.citrixResourceBase = new XenServer56SP2Resource(); + super.beforeTest(); } @Test @@ -41,14 +41,12 @@ public void testPatchFilePath() { } @Test(expected = CloudRuntimeException.class) - @PrepareForTest(Script.class ) - public void testGetFiles(){ + public void testGetFiles() { testGetPathFilesExeption(); } @Test - @PrepareForTest(Script.class ) - public void testGetFilesListReturned(){ + public void testGetFilesListReturned() { testGetPathFilesListReturned(); } } diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer600ResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer600ResourceTest.java index d5eba2af38b0..83c2a696a599 100644 --- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer600ResourceTest.java +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer600ResourceTest.java @@ -15,24 +15,23 @@ */ package com.cloud.hypervisor.xenserver.resource; +import org.apache.xmlrpc.XmlRpcException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.script.Script; -@RunWith(PowerMockRunner.class) -public class XenServer600ResourceTest extends CitrixResourceBaseTest{ +import com.xensource.xenapi.Types.XenAPIException; + +public class XenServer600ResourceTest extends CitrixResourceBaseTest { @Before - public void beforeTest() { + @Override + public void beforeTest() throws XenAPIException, XmlRpcException { super.citrixResourceBase = new XenServer600Resource(); + super.beforeTest(); } - @Test public void testPatchFilePath() { String patchFilePath = citrixResourceBase.getPatchFilePath(); @@ -42,14 +41,12 @@ public void testPatchFilePath() { } @Test(expected = CloudRuntimeException.class) - @PrepareForTest(Script.class ) - public void testGetFiles(){ + public void testGetFiles() { testGetPathFilesExeption(); } @Test - @PrepareForTest(Script.class ) - public void testGetFilesListReturned(){ + public void testGetFilesListReturned() { testGetPathFilesListReturned(); } } diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer625ResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer625ResourceTest.java index 9998c2f02b9c..317562c90897 100644 --- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer625ResourceTest.java +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer625ResourceTest.java @@ -15,22 +15,21 @@ */ package com.cloud.hypervisor.xenserver.resource; +import org.apache.xmlrpc.XmlRpcException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.script.Script; +import com.xensource.xenapi.Types.XenAPIException; -@RunWith(PowerMockRunner.class) public class XenServer625ResourceTest extends CitrixResourceBaseTest { @Before - public void beforeTest() { + @Override + public void beforeTest() throws XenAPIException, XmlRpcException { super.citrixResourceBase = new Xenserver625Resource(); + super.beforeTest(); } @Test @@ -42,13 +41,11 @@ public void testPatchFilePath() { } @Test(expected = CloudRuntimeException.class) - @PrepareForTest(Script.class) public void testGetFiles() { testGetPathFilesExeption(); } @Test - @PrepareForTest(Script.class) public void testGetFilesListReturned() { testGetPathFilesListReturned(); } diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer650ResourceTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer650ResourceTest.java index 5195025de37b..e5773afc534f 100644 --- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer650ResourceTest.java +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer650ResourceTest.java @@ -15,21 +15,21 @@ */ package com.cloud.hypervisor.xenserver.resource; +import org.apache.xmlrpc.XmlRpcException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.script.Script; -@RunWith(PowerMockRunner.class) -public class XenServer650ResourceTest extends CitrixResourceBaseTest{ +import com.xensource.xenapi.Types.XenAPIException; +public class XenServer650ResourceTest extends CitrixResourceBaseTest { + + @Override @Before - public void beforeTest() { + public void beforeTest() throws XenAPIException, XmlRpcException { super.citrixResourceBase = new XenServer650Resource(); + super.beforeTest(); } @Test @@ -41,14 +41,12 @@ public void testPatchFilePath() { } @Test(expected = CloudRuntimeException.class) - @PrepareForTest(Script.class ) - public void testGetFiles(){ + public void testGetFiles() { testGetPathFilesExeption(); } @Test - @PrepareForTest(Script.class ) - public void testGetFilesListReturned(){ + public void testGetFilesListReturned() { testGetPathFilesListReturned(); } } From 7efdaa65f7cef4cc27441fff36165d0042422b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Tue, 13 Mar 2018 11:07:35 -0300 Subject: [PATCH 023/145] [CLOUDSTACK-10314] Add Text-Field to each ACL Rule (#2475) * [CLOUDSTACK-10314] Add Text-Field to each ACL Rule It is interesting to have a text field (e.g. CHAR-256) added to each ACL rule, which allows to enter a "reason" for each FW Rule created. This is valuable for customer documentation, as well as best practice for an evidence towards auditing the system * Formatting to make check style happy and code clean ups --- .../com/cloud/network/vpc/NetworkACLItem.java | 7 +- .../cloud/network/vpc/NetworkACLService.java | 48 +- .../apache/cloudstack/api/ApiConstants.java | 1 + .../user/network/CreateNetworkACLCmd.java | 41 +- .../user/network/UpdateNetworkACLItemCmd.java | 38 +- .../api/response/NetworkACLItemResponse.java | 12 + .../cloud/network/vpc/NetworkACLManager.java | 71 +- .../cloud/network/vpc/NetworkACLItemVO.java | 36 +- .../META-INF/db/schema-41100to41200.sql | 5 +- .../java/com/cloud/api/ApiResponseHelper.java | 2 +- .../network/vpc/NetworkACLManagerImpl.java | 163 +--- .../network/vpc/NetworkACLServiceImpl.java | 584 +++++++++---- .../vpc/NetworkACLManagerImplTest.java | 81 ++ .../vpc/NetworkACLServiceImplTest.java | 774 ++++++++++++++++++ .../com/cloud/vpc/NetworkACLManagerTest.java | 35 +- .../com/cloud/vpc/NetworkACLServiceTest.java | 98 +-- ui/css/cloudstack3.css | 27 +- ui/l10n/ar.js | 2 + ui/l10n/ca.js | 2 + ui/l10n/de_DE.js | 2 + ui/l10n/en.js | 2 + ui/l10n/es.js | 2 + ui/l10n/fr_FR.js | 2 + ui/l10n/hu.js | 2 + ui/l10n/it_IT.js | 2 + ui/l10n/ja_JP.js | 2 + ui/l10n/ko_KR.js | 2 + ui/l10n/nb_NO.js | 2 + ui/l10n/nl_NL.js | 2 + ui/l10n/pl.js | 2 + ui/l10n/pt_BR.js | 2 + ui/l10n/ru_RU.js | 2 + ui/l10n/zh_CN.js | 2 + ui/scripts/vpc.js | 13 +- 34 files changed, 1484 insertions(+), 584 deletions(-) create mode 100644 server/src/test/java/com/cloud/network/vpc/NetworkACLManagerImplTest.java create mode 100644 server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java diff --git a/api/src/main/java/com/cloud/network/vpc/NetworkACLItem.java b/api/src/main/java/com/cloud/network/vpc/NetworkACLItem.java index 75153fd7c5a1..eeca375c46fb 100644 --- a/api/src/main/java/com/cloud/network/vpc/NetworkACLItem.java +++ b/api/src/main/java/com/cloud/network/vpc/NetworkACLItem.java @@ -24,6 +24,7 @@ public interface NetworkACLItem extends InternalIdentity, Identity, Displayable { + @Override String getUuid(); Action getAction(); @@ -51,7 +52,7 @@ enum Action { Integer getSourcePortStart(); /** - * @return last port of the source prot range. If this is null, that means only one port is mapped. + * @return last port of the source port range. If this is null, that means only one port is mapped. */ Integer getSourcePortEnd(); @@ -70,12 +71,10 @@ enum Action { List getSourceCidrList(); - /** - * @return - */ TrafficType getTrafficType(); @Override boolean isDisplay(); + String getReason(); } diff --git a/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java b/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java index f08fff5425dd..dd7c862d46b2 100644 --- a/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java +++ b/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java @@ -21,6 +21,7 @@ import org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd; import org.apache.cloudstack.api.command.user.network.ListNetworkACLListsCmd; import org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd; +import org.apache.cloudstack.api.command.user.network.UpdateNetworkACLItemCmd; import com.cloud.exception.ResourceUnavailableException; import com.cloud.utils.Pair; @@ -28,106 +29,61 @@ public interface NetworkACLService { /** * Creates Network ACL for the specified VPC - * @param name - * @param description - * @param vpcId - * @param forDisplay TODO - * @return */ NetworkACL createNetworkACL(String name, String description, long vpcId, Boolean forDisplay); /** * Get Network ACL with specified Id - * @param id - * @return */ NetworkACL getNetworkACL(long id); /** * List NetworkACLs by Id/Name/Network or Vpc it belongs to - * @param cmd - * @return */ Pair, Integer> listNetworkACLs(ListNetworkACLListsCmd cmd); /** * Delete specified network ACL. Deletion fails if the list is not empty - * @param id - * @return */ boolean deleteNetworkACL(long id); /** * Associates ACL with specified Network - * @param aclId - * @param networkId - * @return - * @throws ResourceUnavailableException */ boolean replaceNetworkACL(long aclId, long networkId) throws ResourceUnavailableException; /** * Applied ACL to associated networks - * @param aclId - * @return - * @throws ResourceUnavailableException */ boolean applyNetworkACL(long aclId) throws ResourceUnavailableException; /** * Creates a Network ACL Item within an ACL and applies the ACL to associated networks - * @param createNetworkACLCmd - * @return */ NetworkACLItem createNetworkACLItem(CreateNetworkACLCmd aclItemCmd); /** * Return ACL item with specified Id - * @param ruleId - * @return */ NetworkACLItem getNetworkACLItem(long ruleId); /** * Lists Network ACL Items by Id, Network, ACLId, Traffic Type, protocol - * @param listNetworkACLsCmd - * @return */ Pair, Integer> listNetworkACLItems(ListNetworkACLsCmd cmd); /** * Revoke ACL Item with specified Id - * @param ruleId - * @return */ boolean revokeNetworkACLItem(long ruleId); /** * Updates existing aclItem applies to associated networks - * @param id - * @param protocol - * @param sourceCidrList - * @param trafficType - * @param action - * @param number - * @param sourcePortStart - * @param sourcePortEnd - * @param icmpCode - * @param icmpType - * @param newUUID TODO - * @param forDisplay TODO - * @return - * @throws ResourceUnavailableException */ - NetworkACLItem updateNetworkACLItem(Long id, String protocol, List sourceCidrList, NetworkACLItem.TrafficType trafficType, String action, Integer number, - Integer sourcePortStart, Integer sourcePortEnd, Integer icmpCode, Integer icmpType, String newUUID, Boolean forDisplay) throws ResourceUnavailableException; + NetworkACLItem updateNetworkACLItem(UpdateNetworkACLItemCmd updateNetworkACLItemCmd) throws ResourceUnavailableException; /** * Associates ACL with specified Network - * @param aclId - * @param privateGatewayId - * @return - * @throws ResourceUnavailableException */ boolean replaceNetworkACLonPrivateGw(long aclId, long privateGatewayId) throws ResourceUnavailableException; diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java index d9090b892174..ac9406fee993 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -452,6 +452,7 @@ public class ApiConstants { public static final String SUPPORTED_SERVICES = "supportedservices"; public static final String NSP_ID = "nspid"; public static final String ACL_TYPE = "acltype"; + public static final String ACL_REASON = "reason"; public static final String SUBDOMAIN_ACCESS = "subdomainaccess"; public static final String LOAD_BALANCER_DEVICE_ID = "lbdeviceid"; public static final String LOAD_BALANCER_DEVICE_NAME = "lbdevicename"; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java index 4b6a836f32a8..00c81a7b05b7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java @@ -40,11 +40,7 @@ import com.cloud.user.Account; import com.cloud.utils.net.NetUtils; -@APICommand(name = "createNetworkACL", - description = "Creates a ACL rule in the given network (the network has to belong to VPC)", - responseObject = NetworkACLItemResponse.class, - requestHasSensitiveInfo = false, - responseHasSensitiveInfo = false) +@APICommand(name = "createNetworkACL", description = "Creates a ACL rule in the given network (the network has to belong to VPC)", responseObject = NetworkACLItemResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateNetworkACLCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateNetworkACLCmd.class.getName()); @@ -54,10 +50,7 @@ public class CreateNetworkACLCmd extends BaseAsyncCreateCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.PROTOCOL, - type = CommandType.STRING, - required = true, - description = "the protocol for the ACL rule. Valid values are TCP/UDP/ICMP/ALL or valid protocol number") + @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, required = true, description = "the protocol for the ACL rule. Valid values are TCP/UDP/ICMP/ALL or valid protocol number") private String protocol; @Parameter(name = ApiConstants.START_PORT, type = CommandType.INTEGER, description = "the starting port of ACL") @@ -75,20 +68,13 @@ public class CreateNetworkACLCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.ICMP_CODE, type = CommandType.INTEGER, description = "error code for this ICMP message") private Integer icmpCode; - @Parameter(name = ApiConstants.NETWORK_ID, - type = CommandType.UUID, - entityType = NetworkResponse.class, - description = "The network of the VM the ACL will be created for") + @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "The network of the VM the ACL will be created for") private Long networkId; - @Parameter(name = ApiConstants.ACL_ID, - type = CommandType.UUID, - entityType = NetworkACLResponse.class, - description = "The network of the VM the ACL will be created for") + @Parameter(name = ApiConstants.ACL_ID, type = CommandType.UUID, entityType = NetworkACLResponse.class, description = "The network of the VM the ACL will be created for") private Long aclId; - @Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "the traffic type for the ACL," - + "can be ingress or egress, defaulted to ingress if not specified") + @Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "the traffic type for the ACL," + "can be ingress or egress, defaulted to ingress if not specified") private String trafficType; @Parameter(name = ApiConstants.NUMBER, type = CommandType.INTEGER, description = "The network of the VM the ACL will be created for") @@ -97,16 +83,16 @@ public class CreateNetworkACLCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.ACTION, type = CommandType.STRING, description = "scl entry action, allow or deny") private String action; - @Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the rule to the end user or not", since = "4.4", authorized = {RoleType.Admin}) + @Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the rule to the end user or not", since = "4.4", authorized = { + RoleType.Admin}) private Boolean display; + @Parameter(name = ApiConstants.ACL_REASON, type = CommandType.STRING, description = "A description indicating why the ACL rule is required.") + private String reason; + // /////////////////////////////////////////////////// // ///////////////// Accessors /////////////////////// // /////////////////////////////////////////////////// - @Deprecated - public Boolean getDisplay() { - return display; - } @Override public boolean isDisplay() { @@ -227,6 +213,10 @@ public Long getACLId() { return aclId; } + public String getReason() { + return reason; + } + @Override public void create() { NetworkACLItem result = _networkACLService.createNetworkACLItem(this); @@ -257,5 +247,4 @@ public void execute() throws ResourceUnavailableException { } } } - -} +} \ No newline at end of file diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java index acc2ae864200..1530239fd125 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java @@ -21,10 +21,8 @@ import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCustomIdCmd; import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.NetworkACLItemResponse; import org.apache.cloudstack.context.CallContext; import org.apache.log4j.Logger; @@ -34,8 +32,7 @@ import com.cloud.network.vpc.NetworkACLItem; import com.cloud.user.Account; -@APICommand(name = "updateNetworkACLItem", description = "Updates ACL item with specified ID", responseObject = NetworkACLItemResponse.class, - requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) +@APICommand(name = "updateNetworkACLItem", description = "Updates ACL item with specified ID", responseObject = NetworkACLItemResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateNetworkACLItemCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateNetworkACLItemCmd.class.getName()); @@ -45,16 +42,10 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCustomIdCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, - type = CommandType.UUID, - entityType = NetworkACLItemResponse.class, - required = true, - description = "the ID of the network ACL item") + @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetworkACLItemResponse.class, required = true, description = "the ID of the network ACL item") private Long id; - @Parameter(name = ApiConstants.PROTOCOL, - type = CommandType.STRING, - description = "the protocol for the ACL rule. Valid values are TCP/UDP/ICMP/ALL or valid protocol number") + @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, description = "the protocol for the ACL rule. Valid values are TCP/UDP/ICMP/ALL or valid protocol number") private String protocol; @Parameter(name = ApiConstants.START_PORT, type = CommandType.INTEGER, description = "the starting port of ACL") @@ -72,8 +63,7 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCustomIdCmd { @Parameter(name = ApiConstants.ICMP_CODE, type = CommandType.INTEGER, description = "error code for this ICMP message") private Integer icmpCode; - @Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "the traffic type for the ACL," - + "can be Ingress or Egress, defaulted to Ingress if not specified") + @Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "the traffic type for the ACL, can be Ingress or Egress, defaulted to Ingress if not specified") private String trafficType; @Parameter(name = ApiConstants.NUMBER, type = CommandType.INTEGER, description = "The network of the vm the ACL will be created for") @@ -82,9 +72,13 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCustomIdCmd { @Parameter(name = ApiConstants.ACTION, type = CommandType.STRING, description = "scl entry action, allow or deny") private String action; - @Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the rule to the end user or not", since = "4.4", authorized = {RoleType.Admin}) + @Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the rule to the end user or not", since = "4.4", authorized = { + RoleType.Admin}) private Boolean display; + @Parameter(name = ApiConstants.ACL_REASON, type = CommandType.STRING, description = "A description indicating why the ACL rule is required.") + private String reason; + // /////////////////////////////////////////////////// // ///////////////// Accessors /////////////////////// // /////////////////////////////////////////////////// @@ -105,8 +99,9 @@ public Long getId() { public String getProtocol() { if (protocol != null) { return protocol.trim(); - } else + } else { return null; + } } public List getSourceCidrList() { @@ -173,15 +168,14 @@ public Integer getIcmpType() { return icmpType; } + public String getReason() { + return reason; + } + @Override public void execute() throws ResourceUnavailableException { CallContext.current().setEventDetails("Rule Id: " + getId()); - NetworkACLItem aclItem = - _networkACLService.updateNetworkACLItem(getId(), getProtocol(), getSourceCidrList(), getTrafficType(), getAction(), getNumber(), getSourcePortStart(), - getSourcePortEnd(), getIcmpCode(), getIcmpType(), this.getCustomId(), this.isDisplay()); - if (aclItem == null) { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update network ACL item"); - } + NetworkACLItem aclItem = _networkACLService.updateNetworkACLItem(this); NetworkACLItemResponse aclResponse = _responseGenerator.createNetworkACLItemResponse(aclItem); setResponseObject(aclResponse); aclResponse.setResponseName(getCommandName()); diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkACLItemResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkACLItemResponse.java index 01012957978e..97f5042bc9fa 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/NetworkACLItemResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/NetworkACLItemResponse.java @@ -85,6 +85,10 @@ public class NetworkACLItemResponse extends BaseResponse { @Param(description = "is rule for display to the regular user", since = "4.4", authorized = {RoleType.Admin}) private Boolean forDisplay; + @SerializedName(ApiConstants.ACL_REASON) + @Param(description = "an explanation on why this ACL rule is being applied", since = "4.12") + private String reason; + public void setId(String id) { this.id = id; } @@ -140,4 +144,12 @@ public void setAction(String action) { public void setForDisplay(Boolean forDisplay) { this.forDisplay = forDisplay; } + + public void setReason(String reason) { + this.reason = reason; + } + + public String getReason() { + return reason; + } } diff --git a/engine/components-api/src/main/java/com/cloud/network/vpc/NetworkACLManager.java b/engine/components-api/src/main/java/com/cloud/network/vpc/NetworkACLManager.java index 0377c5f74d86..4200ea8c6019 100644 --- a/engine/components-api/src/main/java/com/cloud/network/vpc/NetworkACLManager.java +++ b/engine/components-api/src/main/java/com/cloud/network/vpc/NetworkACLManager.java @@ -25,128 +25,67 @@ public interface NetworkACLManager { /** * Creates Network ACL for the specified VPC - * @param name - * @param description - * @param vpcId - * @param forDisplay TODO - * @return */ NetworkACL createNetworkACL(String name, String description, long vpcId, Boolean forDisplay); /** * Fetches Network ACL with specified Id - * @param id - * @return */ NetworkACL getNetworkACL(long id); /** * Applies the items in the ACL to all associated networks - * @param aclId - * @return - * @throws ResourceUnavailableException */ boolean applyNetworkACL(long aclId) throws ResourceUnavailableException; /** * Deletes the specified Network ACL - * @param id - * @return */ boolean deleteNetworkACL(NetworkACL acl); /** - * Associates acl with a network and applies the ACLItems - * @param acl - * @param network - * @return + * Associates ACL with a network and applies the ACLItems */ boolean replaceNetworkACL(NetworkACL acl, NetworkVO network) throws ResourceUnavailableException; /** * Creates a Network ACL Item within an ACL and applies it to associated networks - * @param sourcePortStart - * @param sourcePortEnd - * @param protocol - * @param sourceCidrList - * @param icmpCode - * @param icmpType - * @param trafficType - * @param aclId - * @param action - * @param number - * @param forDisplay TODO - * @return */ - NetworkACLItem createNetworkACLItem(Integer sourcePortStart, Integer sourcePortEnd, String protocol, List sourceCidrList, Integer icmpCode, Integer icmpType, - NetworkACLItem.TrafficType trafficType, Long aclId, String action, Integer number, Boolean forDisplay); + NetworkACLItem createNetworkACLItem(NetworkACLItemVO networkACLItemVO); /** * Returns Network ACL Item with specified Id - * @param ruleId - * @return */ NetworkACLItem getNetworkACLItem(long ruleId); /** * Revoke ACL Item and apply changes - * @param ruleId - * @return */ boolean revokeNetworkACLItem(long ruleId); /** * Revoke ACL Items for network and remove them in back-end. Db is not updated - * @param networkId - * @param userId - * @param caller - * @return - * @throws ResourceUnavailableException */ boolean revokeACLItemsForNetwork(long networkId) throws ResourceUnavailableException; /** * List network ACL items by network - * @param guestNtwkId - * @return */ List listNetworkACLItems(long guestNtwkId); /** - * Applies asscociated ACL to specified network - * @param networkId - * @return - * @throws ResourceUnavailableException + * Applies associated ACL to specified network */ boolean applyACLToNetwork(long networkId) throws ResourceUnavailableException; /** * Updates and existing network ACL Item - * @param id - * @param protocol - * @param sourceCidrList - * @param trafficType - * @param action - * @param number - * @param sourcePortStart - * @param sourcePortEnd - * @param icmpCode - * @param icmpType - * @param customId TODO - * @param forDisplay TODO - * @return - * @throws ResourceUnavailableException */ - NetworkACLItem updateNetworkACLItem(Long id, String protocol, List sourceCidrList, NetworkACLItem.TrafficType trafficType, String action, Integer number, - Integer sourcePortStart, Integer sourcePortEnd, Integer icmpCode, Integer icmpType, String customId, Boolean forDisplay) throws ResourceUnavailableException; + NetworkACLItem updateNetworkACLItem(NetworkACLItemVO networkACLItemVO) throws ResourceUnavailableException; /** - * Associates acl with a network and applies the ACLItems - * @param acl - * @param gateway - * @return + * Associates ACL with a network and applies the ACLItems */ - boolean replaceNetworkACLForPrivateGw(NetworkACL acl, PrivateGateway gateway) throws ResourceUnavailableException; boolean revokeACLItemsForPrivateGw(PrivateGateway gateway) throws ResourceUnavailableException; diff --git a/engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLItemVO.java b/engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLItemVO.java index 6eb9cb0e991c..f28b3125a09d 100644 --- a/engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLItemVO.java +++ b/engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLItemVO.java @@ -33,15 +33,13 @@ import javax.persistence.Transient; import com.cloud.utils.db.GenericDao; +import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; @Entity @Table(name = "network_acl_item") -public class NetworkACLItemVO implements NetworkACLItem { +public class NetworkACLItemVO implements NetworkACLItem, Cloneable { - /** - * - */ private static final long serialVersionUID = 2790623532888742060L; @Id @@ -97,12 +95,15 @@ public class NetworkACLItemVO implements NetworkACLItem { @Column(name = "display", updatable = true, nullable = false) protected boolean display = true; + @Column(name = "reason", length = 2500) + private String reason; + public NetworkACLItemVO() { uuid = UUID.randomUUID().toString(); } - public NetworkACLItemVO(Integer portStart, Integer portEnd, String protocol, long aclId, List sourceCidrs, Integer icmpCode, Integer icmpType, - TrafficType trafficType, Action action, int number) { + public NetworkACLItemVO(Integer portStart, Integer portEnd, String protocol, long aclId, List sourceCidrs, Integer icmpCode, Integer icmpType, TrafficType trafficType, Action action, + int number, String reason) { sourcePortStart = portStart; sourcePortEnd = portEnd; this.protocol = protocol; @@ -115,6 +116,7 @@ public NetworkACLItemVO(Integer portStart, Integer portEnd, String protocol, lon this.trafficType = trafficType; this.action = action; this.number = number; + this.reason = reason; } public void setSourceCidrList(List sourceCidrs) { @@ -225,8 +227,8 @@ public void setTrafficType(TrafficType trafficType) { public void setSourceCidrs(String sourceCidrs) { List srcCidrs = new LinkedList(); - StringTokenizer st = new StringTokenizer(sourceCidrs,",;"); - while(st.hasMoreTokens()) { + StringTokenizer st = new StringTokenizer(sourceCidrs, ",;"); + while (st.hasMoreTokens()) { srcCidrs.add(st.nextToken()); } this.sourceCidrs = srcCidrs; @@ -252,4 +254,22 @@ public void setDisplay(boolean display) { public boolean isDisplay() { return display; } + + @Override + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } + + @Override + protected NetworkACLItemVO clone() { + try { + return (NetworkACLItemVO)super.clone(); + } catch (CloneNotSupportedException e) { + throw new CloudRuntimeException(e); + } + } } diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql b/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql index b6fd45f94a49..5667c5b3dab0 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql @@ -17,4 +17,7 @@ --; -- Schema upgrade from 4.11.0.0 to 4.12.0.0 ---; \ No newline at end of file +--; + +-- [CLOUDSTACK-10314] Add reason column to ACL rule table +ALTER TABLE `cloud`.`network_acl_item` ADD COLUMN `reason` VARCHAR(2500) AFTER `display`; \ No newline at end of file diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java index 88da6342b81c..bd9b543c58fe 100644 --- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java +++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java @@ -2363,7 +2363,7 @@ public NetworkACLItemResponse createNetworkACLItemResponse(NetworkACLItem aclIte CollectionUtils.addIgnoreNull(tagResponses, tagResponse); } response.setTags(tagResponses); - + response.setReason(aclItem.getReason()); response.setObjectName("networkacl"); return response; } diff --git a/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java index c64a36b7c9fa..d5f31d62753c 100644 --- a/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java @@ -21,7 +21,11 @@ import javax.inject.Inject; -import com.cloud.configuration.ConfigurationManager; +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.framework.messagebus.MessageBus; +import org.apache.cloudstack.framework.messagebus.PublishScope; +import org.apache.log4j.Logger; + import com.cloud.event.ActionEvent; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; @@ -37,8 +41,6 @@ import com.cloud.network.vpc.dao.NetworkACLDao; import com.cloud.network.vpc.dao.VpcGatewayDao; import com.cloud.offering.NetworkOffering; -import com.cloud.tags.dao.ResourceTagDao; -import com.cloud.user.AccountManager; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.DB; import com.cloud.utils.db.EntityManager; @@ -47,43 +49,31 @@ import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.framework.messagebus.MessageBus; -import org.apache.cloudstack.framework.messagebus.PublishScope; -import org.apache.log4j.Logger; - public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLManager { private static final Logger s_logger = Logger.getLogger(NetworkACLManagerImpl.class); @Inject - AccountManager _accountMgr; - @Inject - NetworkModel _networkMgr; - @Inject - VpcManager _vpcMgr; - @Inject - ResourceTagDao _resourceTagDao; + private NetworkModel _networkMgr; @Inject - NetworkACLDao _networkACLDao; + private NetworkACLDao _networkACLDao; @Inject - NetworkACLItemDao _networkACLItemDao; - List _networkAclElements; + private NetworkACLItemDao _networkACLItemDao; @Inject - NetworkModel _networkModel; + private NetworkModel _networkModel; @Inject - NetworkDao _networkDao; + private NetworkDao _networkDao; @Inject - VpcGatewayDao _vpcGatewayDao; + private VpcGatewayDao _vpcGatewayDao; @Inject - NetworkModel _ntwkModel; + private NetworkModel _ntwkModel; @Inject - ConfigurationManager _configMgr; + private EntityManager _entityMgr; @Inject - EntityManager _entityMgr; + private VpcService _vpcSvc; @Inject - VpcService _vpcSvc; - @Inject - MessageBus _messageBus; + private MessageBus _messageBus; + + private List _networkAclElements; @Override public NetworkACL createNetworkACL(final String name, final String description, final long vpcId, final Boolean forDisplay) { @@ -224,40 +214,21 @@ public boolean replaceNetworkACL(final NetworkACL acl, final NetworkVO network) return false; } - @Override @DB + @Override @ActionEvent(eventType = EventTypes.EVENT_NETWORK_ACL_ITEM_CREATE, eventDescription = "creating network ACL Item", create = true) - public NetworkACLItem createNetworkACLItem(final Integer portStart, final Integer portEnd, final String protocol, final List sourceCidrList, final Integer icmpCode, - final Integer icmpType, final NetworkACLItem.TrafficType trafficType, final Long aclId, final String action, Integer number, final Boolean forDisplay) { - // If number is null, set it to currentMax + 1 (for backward compatibility) - if (number == null) { - number = _networkACLItemDao.getMaxNumberByACL(aclId) + 1; - } - - final Integer numberFinal = number; - final NetworkACLItemVO newRule = Transaction.execute(new TransactionCallback() { + public NetworkACLItem createNetworkACLItem(NetworkACLItemVO networkACLItemVO) { + NetworkACLItemVO newRule = Transaction.execute(new TransactionCallback() { @Override public NetworkACLItemVO doInTransaction(final TransactionStatus status) { - NetworkACLItem.Action ruleAction = NetworkACLItem.Action.Allow; - if ("deny".equalsIgnoreCase(action)) { - ruleAction = NetworkACLItem.Action.Deny; - } + NetworkACLItemVO networkACLItemVOFromDatabase = _networkACLItemDao.persist(networkACLItemVO); - NetworkACLItemVO newRule = - new NetworkACLItemVO(portStart, portEnd, protocol.toLowerCase(), aclId, sourceCidrList, icmpCode, icmpType, trafficType, ruleAction, numberFinal); - - if (forDisplay != null) { - newRule.setDisplay(forDisplay); - } - - newRule = _networkACLItemDao.persist(newRule); - - if (!_networkACLItemDao.setStateToAdd(newRule)) { - throw new CloudRuntimeException("Unable to update the state to add for " + newRule); + if (!_networkACLItemDao.setStateToAdd(networkACLItemVOFromDatabase)) { + throw new CloudRuntimeException("Unable to update the state to add for " + networkACLItemVOFromDatabase); } - CallContext.current().setEventDetails("ACL Item Id: " + newRule.getId()); + CallContext.current().setEventDetails("ACL Item Id: " + networkACLItemVOFromDatabase.getId()); - return newRule; + return networkACLItemVOFromDatabase; } }); @@ -265,7 +236,7 @@ public NetworkACLItemVO doInTransaction(final TransactionStatus status) { } @Override - public NetworkACLItem getNetworkACLItem(final long ruleId) { + public NetworkACLItem getNetworkACLItem(long ruleId) { return _networkACLItemDao.findById(ruleId); } @@ -372,7 +343,6 @@ public List listNetworkACLItems(final long guestNtwkId) { } private void removeRule(final NetworkACLItem rule) { - //remove the rule _networkACLItemDao.remove(rule.getId()); } @@ -384,19 +354,14 @@ public boolean applyACLToPrivateGw(final PrivateGateway gateway) throws Resource } private boolean applyACLToPrivateGw(final PrivateGateway gateway, final List rules) throws ResourceUnavailableException { - List vpcElements = null; - vpcElements = new ArrayList(); + List vpcElements = new ArrayList(); vpcElements.add((VpcProvider)_ntwkModel.getElementImplementingProvider(Network.Provider.VPCVirtualRouter.getName())); - if (vpcElements == null) { - throw new CloudRuntimeException("Failed to initialize vpc elements"); - } - - try{ + try { for (final VpcProvider provider : vpcElements) { return provider.applyACLItemsToPrivateGw(gateway, rules); } - } catch(final Exception ex) { + } catch (final Exception ex) { s_logger.debug("Failed to apply acl to private gateway " + gateway); } return false; @@ -412,68 +377,24 @@ public boolean applyACLToNetwork(final long networkId) throws ResourceUnavailabl return applyACLItemsToNetwork(networkId, rules); } + /** + * Updates and applies the network ACL rule ({@link NetworkACLItemVO}). + * We will first try to update the ACL rule in the database using {@link NetworkACLItemDao#update(Long, NetworkACLItemVO)}. If it does not work, a {@link CloudRuntimeException} is thrown. + * If we manage to update the ACL rule in the database, we proceed to apply it using {@link #applyNetworkACL(long)}. If this does not work we throw a {@link CloudRuntimeException}. + * If all is working we return the {@link NetworkACLItemVO} given as parameter. We wil set the state of the rule to {@link com.cloud.network.vpc.NetworkACLItem.State#Add}. + */ @Override - public NetworkACLItem updateNetworkACLItem(final Long id, final String protocol, final List sourceCidrList, final NetworkACLItem.TrafficType trafficType, final String action, - final Integer number, final Integer sourcePortStart, final Integer sourcePortEnd, final Integer icmpCode, final Integer icmpType, final String customId, final Boolean forDisplay) throws ResourceUnavailableException { - final NetworkACLItemVO aclItem = _networkACLItemDao.findById(id); - aclItem.setState(State.Add); - - if (protocol != null) { - aclItem.setProtocol(protocol); - } - - if (sourceCidrList != null) { - aclItem.setSourceCidrList(sourceCidrList); - } - - if (trafficType != null) { - aclItem.setTrafficType(trafficType); - } - - if (action != null) { - NetworkACLItem.Action ruleAction = NetworkACLItem.Action.Allow; - if ("deny".equalsIgnoreCase(action)) { - ruleAction = NetworkACLItem.Action.Deny; - } - aclItem.setAction(ruleAction); - } - - if (number != null) { - aclItem.setNumber(number); - } - - if (sourcePortStart != null) { - aclItem.setSourcePortStart(sourcePortStart); - } - - if (sourcePortEnd != null) { - aclItem.setSourcePortEnd(sourcePortEnd); - } - - if (icmpCode != null) { - aclItem.setIcmpCode(icmpCode); - } - - if (icmpType != null) { - aclItem.setIcmpType(icmpType); - } - - if (customId != null) { - aclItem.setUuid(customId); - } - - if (forDisplay != null) { - aclItem.setDisplay(forDisplay); - } + public NetworkACLItem updateNetworkACLItem(NetworkACLItemVO networkACLItemVO) throws ResourceUnavailableException { + networkACLItemVO.setState(State.Add); - if (_networkACLItemDao.update(id, aclItem)) { - if (applyNetworkACL(aclItem.getAclId())) { - return aclItem; + if (_networkACLItemDao.update(networkACLItemVO.getId(), networkACLItemVO)) { + if (applyNetworkACL(networkACLItemVO.getAclId())) { + return networkACLItemVO; } else { - throw new CloudRuntimeException("Failed to apply Network ACL Item: " + aclItem.getUuid()); + throw new CloudRuntimeException("Failed to apply Network ACL rule: " + networkACLItemVO.getUuid()); } } - return null; + throw new CloudRuntimeException(String.format("Network ACL rule [id=%s] acl rule list [id=%s] could not be updated.", networkACLItemVO.getUuid(), networkACLItemVO.getAclId())); } public boolean applyACLItemsToNetwork(final long networkId, final List rules) throws ResourceUnavailableException { diff --git a/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java index 1743f5c322e4..bfa842807f95 100644 --- a/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java @@ -27,7 +27,9 @@ import org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd; import org.apache.cloudstack.api.command.user.network.ListNetworkACLListsCmd; import org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd; +import org.apache.cloudstack.api.command.user.network.UpdateNetworkACLItemCmd; import org.apache.cloudstack.context.CallContext; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -41,6 +43,8 @@ import com.cloud.network.Networks; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkVO; +import com.cloud.network.vpc.NetworkACLItem.Action; +import com.cloud.network.vpc.NetworkACLItem.TrafficType; import com.cloud.network.vpc.dao.NetworkACLDao; import com.cloud.network.vpc.dao.VpcDao; import com.cloud.network.vpc.dao.VpcGatewayDao; @@ -67,31 +71,29 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ private static final Logger s_logger = Logger.getLogger(NetworkACLServiceImpl.class); @Inject - AccountManager _accountMgr; + private AccountManager _accountMgr; @Inject - NetworkModel _networkMgr; + private ResourceTagDao _resourceTagDao; @Inject - ResourceTagDao _resourceTagDao; + private NetworkACLDao _networkACLDao; @Inject - NetworkACLDao _networkACLDao; + private NetworkACLItemDao _networkACLItemDao; @Inject - NetworkACLItemDao _networkACLItemDao; + private NetworkModel networkModel; @Inject - NetworkModel _networkModel; + private NetworkDao _networkDao; @Inject - NetworkDao _networkDao; + private NetworkACLManager _networkAclMgr; @Inject - NetworkACLManager _networkAclMgr; + private VpcGatewayDao _vpcGatewayDao; @Inject - VpcGatewayDao _vpcGatewayDao; + private EntityManager _entityMgr; @Inject - VpcManager _vpcMgr; + private VpcDao _vpcDao; @Inject - EntityManager _entityMgr; - @Inject - VpcDao _vpcDao; - @Inject - VpcService _vpcSvc; + private VpcService _vpcSvc; + + private String supportedProtocolsForAclRules = "tcp,udp,icmp,all"; @Override public NetworkACL createNetworkACL(final String name, final String description, final long vpcId, final Boolean forDisplay) { @@ -133,7 +135,7 @@ public Pair, Integer> listNetworkACLs(final ListNetwo sb.join("networkJoin", network, sb.entity().getId(), network.entity().getNetworkACLId(), JoinBuilder.JoinType.INNER); } - final SearchCriteria sc = sb.create(); + SearchCriteria sc = sb.create(); if (keyword != null) { final SearchCriteria ssc = _networkACLDao.createSearchCriteria(); @@ -146,7 +148,7 @@ public Pair, Integer> listNetworkACLs(final ListNetwo sc.setParameters("display", display); } - if(id != null){ + if (id != null) { sc.setParameters("id", id); } @@ -173,10 +175,8 @@ public Pair, Integer> listNetworkACLs(final ListNetwo final String accountName = cmd.getAccountName(); final Long projectId = cmd.getProjectId(); final boolean listAll = cmd.listAll(); - final Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, null); - _accountMgr.buildACLSearchParameters(caller, id, accountName, projectId, permittedAccounts, domainIdRecursiveListProject, - listAll, false); + final Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, null); + _accountMgr.buildACLSearchParameters(caller, id, accountName, projectId, permittedAccounts, domainIdRecursiveListProject, listAll, false); domainId = domainIdRecursiveListProject.first(); isRecursive = domainIdRecursiveListProject.second(); final ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third(); @@ -199,7 +199,7 @@ public Pair, Integer> listNetworkACLs(final ListNetwo } final Filter filter = new Filter(NetworkACLVO.class, "id", false, null, null); - final Pair, Integer> acls = _networkACLDao.searchAndCount(sc, filter); + final Pair, Integer> acls = _networkACLDao.searchAndCount(sc, filter); return new Pair, Integer>(acls.first(), acls.second()); } @@ -261,7 +261,7 @@ public boolean replaceNetworkACLonPrivateGw(final long aclId, final long private final PrivateGateway privateGateway = _vpcSvc.getVpcPrivateGateway(gateway.getId()); _accountMgr.checkAccess(caller, null, true, privateGateway); - return _networkAclMgr.replaceNetworkACLForPrivateGw(acl, privateGateway); + return _networkAclMgr.replaceNetworkACLForPrivateGw(acl, privateGateway); } @@ -304,164 +304,342 @@ public boolean replaceNetworkACL(final long aclId, final long networkId) throws return _networkAclMgr.replaceNetworkACL(acl, network); } + /** + * Creates and persists a network ACL rule. The network ACL rule is persisted as a {@link NetworkACLItemVO}. + * If no ACL list ID is informed, we will create one. To check these details, please refer to {@link #createAclListIfNeeded(CreateNetworkACLCmd)}. + * All of the attributes will be validated accordingly using the following methods: + *
    + *
  • {@link #validateAclRuleNumber(CreateNetworkACLCmd, Long, NetworkACL)} to validate the provided ACL rule number; + *
  • {@link #validateNetworkAclList(Long, NetworkACL)} to check if the user has access to the informed ACL list ID and respective VPC; + *
  • {@link #validateAndCreateNetworkAclRuleAction(String)} to validate the ACL rule action; + *
  • {@link #validateNetworkACLItem(NetworkACLItemVO)} to validate general configurations relating to protocol, ports, and ICMP codes and types. + *
+ * + * Moreover, if not ACL rule number is provided we generate one based on the last ACL number used. We will increment +1 in the last ACL rule number used. After all of the validation the ACL rule is persisted using the method {@link NetworkACLManagerImpl#createNetworkACLItem(NetworkACLItemVO)}. + */ @Override - public NetworkACLItem createNetworkACLItem(final CreateNetworkACLCmd aclItemCmd) { - final Account caller = CallContext.current().getCallingAccount(); - Long aclId = aclItemCmd.getACLId(); - if (aclId == null) { - //ACL id is not specified. Get the ACL details from network - if (aclItemCmd.getNetworkId() == null) { - throw new InvalidParameterValueException("Cannot create Network ACL Item. ACL Id or network Id is required"); - } - final Network network = _networkMgr.getNetwork(aclItemCmd.getNetworkId()); - if (network.getVpcId() == null) { - throw new InvalidParameterValueException("Network: " + network.getUuid() + " does not belong to VPC"); - } - aclId = network.getNetworkACLId(); - - if (aclId == null) { - //Network is not associated with any ACL. Create a new ACL and add aclItem in it for backward compatibility - s_logger.debug("Network " + network.getId() + " is not associated with any ACL. Creating an ACL before adding acl item"); + public NetworkACLItem createNetworkACLItem(CreateNetworkACLCmd createNetworkACLCmd) { + Long aclId = createAclListIfNeeded(createNetworkACLCmd); + + Integer sourcePortStart = createNetworkACLCmd.getSourcePortStart(); + Integer sourcePortEnd = createNetworkACLCmd.getSourcePortEnd(); + String protocol = createNetworkACLCmd.getProtocol(); + List sourceCidrList = createNetworkACLCmd.getSourceCidrList(); + Integer icmpCode = createNetworkACLCmd.getIcmpCode(); + Integer icmpType = createNetworkACLCmd.getIcmpType(); + TrafficType trafficType = createNetworkACLCmd.getTrafficType(); + String reason = createNetworkACLCmd.getReason(); + String action = createNetworkACLCmd.getAction(); + + NetworkACL acl = _networkAclMgr.getNetworkACL(aclId); + + validateNetworkAcl(acl); + validateAclRuleNumber(createNetworkACLCmd, acl); + + NetworkACLItem.Action ruleAction = validateAndCreateNetworkAclRuleAction(action); + Integer number = createNetworkACLCmd.getNumber(); + if (number == null) { + number = _networkACLItemDao.getMaxNumberByACL(aclId) + 1; + } + NetworkACLItemVO networkACLItemVO = new NetworkACLItemVO(sourcePortStart, sourcePortEnd, protocol, aclId, sourceCidrList, icmpCode, icmpType, trafficType, ruleAction, number, reason); + networkACLItemVO.setDisplay(createNetworkACLCmd.isDisplay()); + + validateNetworkACLItem(networkACLItemVO); + return _networkAclMgr.createNetworkACLItem(networkACLItemVO); + } - //verify that ACLProvider is supported by network offering - if (!_networkModel.areServicesSupportedByNetworkOffering(network.getNetworkOfferingId(), Network.Service.NetworkACL)) { - throw new InvalidParameterValueException("Network Offering does not support NetworkACL service"); - } + /** + * We first validate the given ACL action as a string using {@link #validateNetworkAclRuleAction(String)}. + * Afterwards, we convert this ACL to an object of {@link NetworkACLItem.Action}. + * If the action as String matches the word 'deny' (ignoring case), we return an instance of {@link NetworkACLItem.Action#Deny}. + * Otherwise, we return {@link NetworkACLItem.Action#Allow}. + */ + protected NetworkACLItem.Action validateAndCreateNetworkAclRuleAction(String action) { + validateNetworkAclRuleAction(action); + NetworkACLItem.Action ruleAction = NetworkACLItem.Action.Allow; + if ("deny".equalsIgnoreCase(action)) { + ruleAction = NetworkACLItem.Action.Deny; + } + return ruleAction; + } - final Vpc vpc = _entityMgr.findById(Vpc.class, network.getVpcId()); - if (vpc == null) { - throw new InvalidParameterValueException("Unable to find Vpc associated with the Network"); - } + /** + * Validates the network ACL rule action given as a {@link String}. + * If the parameter is null, we do not perform any validations. Otherwise, we check if the parameter is equal to 'Allow' or 'Deny' (ignoring the case). + * If the parameter is an invalid action, we throw an {@link InvalidParameterValueException}. + */ + protected void validateNetworkAclRuleAction(String action) { + if (action != null) { + if (!("Allow".equalsIgnoreCase(action) || "Deny".equalsIgnoreCase(action))) { + throw new InvalidParameterValueException(String.format("Invalid action [%s]. Permitted actions are Allow and Deny", action)); + } + } + } - //Create new ACL - final String aclName = "VPC_" + vpc.getName() + "_Tier_" + network.getName() + "_ACL_" + network.getUuid(); - final String description = "ACL for " + aclName; - final NetworkACL acl = _networkAclMgr.createNetworkACL(aclName, description, network.getVpcId(), aclItemCmd.getDisplay()); - if (acl == null) { - throw new CloudRuntimeException("Error while create ACL before adding ACL Item for network " + network.getId()); - } - s_logger.debug("Created ACL: " + aclName + " for network " + network.getId()); - aclId = acl.getId(); - //Apply acl to network - try { - if (!_networkAclMgr.replaceNetworkACL(acl, (NetworkVO)network)) { - throw new CloudRuntimeException("Unable to apply auto created ACL to network " + network.getId()); - } - s_logger.debug("Created ACL is applied to network " + network.getId()); - } catch (final ResourceUnavailableException e) { - throw new CloudRuntimeException("Unable to apply auto created ACL to network " + network.getId(), e); - } + /** + * Validates the ACL rule number field. If the field is null, then we do not have anything to check here. + * If the number is not null, we perform the following checks: + *
    + *
  • If number is less than one, than we throw an {@link InvalidParameterValueException}; + *
  • if there is already an ACL configured with the given number for the network, we also throw an {@link InvalidParameterValueException}. The check is performed using {@link NetworkACLItemDao#findByAclAndNumber(long, int)} method. + *
+ * + * At the end, if not exception is thrown, the number of the ACL rule is valid. + */ + protected void validateAclRuleNumber(CreateNetworkACLCmd createNetworkAclCmd, NetworkACL acl) { + Integer number = createNetworkAclCmd.getNumber(); + if (number != null) { + if (number < 1) { + throw new InvalidParameterValueException(String.format("Invalid number [%d]. Number cannot be < 1", number)); + } + if (_networkACLItemDao.findByAclAndNumber(acl.getId(), createNetworkAclCmd.getNumber()) != null) { + throw new InvalidParameterValueException("ACL item with number " + number + " already exists in ACL: " + acl.getUuid()); } } + } - final NetworkACL acl = _networkAclMgr.getNetworkACL(aclId); + /** + * Validates a given {@link NetworkACL}. The validations are the following: + *
    + *
  • If the parameter is null, we return an {@link InvalidParameterValueException}; + *
  • Default ACLs {@link NetworkACL#DEFAULT_ALLOW} and {@link NetworkACL#DEFAULT_DENY} cannot be modified. Therefore, if any of them is provided we throw a {@link InvalidParameterValueException}; + *
  • If the network does not have a VPC, we will throw an {@link InvalidParameterValueException}. + *
+ * + * After all validations, we check if the user has access to the given network ACL using {@link AccountManager#checkAccess(Account, org.apache.cloudstack.acl.SecurityChecker.AccessType, boolean, org.apache.cloudstack.acl.ControlledEntity...)}. + */ + protected void validateNetworkAcl(NetworkACL acl) { if (acl == null) { - throw new InvalidParameterValueException("Unable to find specified ACL"); + throw new InvalidParameterValueException("Unable to find specified ACL."); } - if (aclId == NetworkACL.DEFAULT_DENY || aclId == NetworkACL.DEFAULT_ALLOW) { + if (acl.getId() == NetworkACL.DEFAULT_DENY || acl.getId() == NetworkACL.DEFAULT_ALLOW) { throw new InvalidParameterValueException("Default ACL cannot be modified"); } - final Vpc vpc = _entityMgr.findById(Vpc.class, acl.getVpcId()); + Vpc vpc = _entityMgr.findById(Vpc.class, acl.getVpcId()); if (vpc == null) { - throw new InvalidParameterValueException("Unable to find Vpc associated with the NetworkACL"); + throw new InvalidParameterValueException(String.format("Unable to find Vpc associated with the NetworkACL [%s]", acl.getUuid())); } + Account caller = CallContext.current().getCallingAccount(); _accountMgr.checkAccess(caller, null, true, vpc); + } - //Ensure that number is unique within the ACL - if (aclItemCmd.getNumber() != null) { - if (_networkACLItemDao.findByAclAndNumber(aclId, aclItemCmd.getNumber()) != null) { - throw new InvalidParameterValueException("ACL item with number " + aclItemCmd.getNumber() + " already exists in ACL: " + acl.getUuid()); - } + /** + * This methods will simply return the ACL rule list ID if it has been provided by the parameter 'createNetworkACLCmd'. + * If no ACL rule List ID has been provided the method behave as follows: + *
    + *
  • If it has not been provided either, we will throw an {@link InvalidParameterValueException}; + *
  • if the network ID has been provided, we will check if the network has a VPC; if it does not have, we will throw an {@link InvalidParameterValueException}; + *
      + *
    • If the VPC already has an ACL rule list, we will return it; + *
    • otherwise, we will create one using {@link #createAclListForNetworkAndReturnAclListId(CreateNetworkACLCmd, Network)} method. This behavior is a legacy thing that has been maintained so far. + *
    + *
+ * + * @return The network ACL list ID + */ + protected Long createAclListIfNeeded(CreateNetworkACLCmd createNetworkACLCmd) { + Long aclId = createNetworkACLCmd.getACLId(); + if (aclId != null) { + return aclId; + } + if (createNetworkACLCmd.getNetworkId() == null) { + throw new InvalidParameterValueException("Cannot create Network ACL Item. ACL Id or network Id is required"); + } + Network network = networkModel.getNetwork(createNetworkACLCmd.getNetworkId()); + if (network.getVpcId() == null) { + throw new InvalidParameterValueException("Network: " + network.getUuid() + " does not belong to VPC"); + } + aclId = network.getNetworkACLId(); + + if (aclId == null) { + aclId = createAclListForNetworkAndReturnAclListId(createNetworkACLCmd, network); } + return aclId; + } - validateNetworkACLItem(aclItemCmd.getSourcePortStart(), aclItemCmd.getSourcePortEnd(), aclItemCmd.getSourceCidrList(), aclItemCmd.getProtocol(), - aclItemCmd.getIcmpCode(), aclItemCmd.getIcmpType(), aclItemCmd.getAction(), aclItemCmd.getNumber()); + /** + * This method will created a network ACL for the provided network. This method will behave as follows: + *
    + *
  • If the network offering does not support ACLs ( {@link NetworkModel#areServicesSupportedByNetworkOffering(long, com.cloud.network.Network.Service...)} ), then it throws an {@link InvalidParameterValueException}; + *
  • If the network does not have any VPC, it throws an {@link InvalidParameterValueException}; + *
  • If everything is OK so far, we try to create the ACL using {@link NetworkACLManagerImpl#createNetworkACL(String, String, long, Boolean)} method. + *
      + *
    • If the ACL is not created we throw a {@link CloudRuntimeException}; + *
    • otherwise, the workflow continues. + *
    + *
  • With the ACL in our hands, we try to apply it. If it does not work we throw a {@link CloudRuntimeException}. + *
+ * + * @return the Id of the network ACL that is created. + */ + protected Long createAclListForNetworkAndReturnAclListId(CreateNetworkACLCmd aclItemCmd, Network network) { + s_logger.debug("Network " + network.getId() + " is not associated with any ACL. Creating an ACL before adding acl item"); + + if (!networkModel.areServicesSupportedByNetworkOffering(network.getNetworkOfferingId(), Network.Service.NetworkACL)) { + throw new InvalidParameterValueException("Network Offering does not support NetworkACL service"); + } + + Vpc vpc = _entityMgr.findById(Vpc.class, network.getVpcId()); + if (vpc == null) { + throw new InvalidParameterValueException("Unable to find Vpc associated with the Network"); + } - return _networkAclMgr.createNetworkACLItem(aclItemCmd.getSourcePortStart(), aclItemCmd.getSourcePortEnd(), aclItemCmd.getProtocol(), - aclItemCmd.getSourceCidrList(), aclItemCmd.getIcmpCode(), aclItemCmd.getIcmpType(), aclItemCmd.getTrafficType(), aclId, aclItemCmd.getAction(), - aclItemCmd.getNumber(), aclItemCmd.getDisplay()); + String aclName = "VPC_" + vpc.getName() + "_Tier_" + network.getName() + "_ACL_" + network.getUuid(); + String description = "ACL for " + aclName; + NetworkACL acl = _networkAclMgr.createNetworkACL(aclName, description, network.getVpcId(), aclItemCmd.isDisplay()); + if (acl == null) { + throw new CloudRuntimeException("Error while create ACL before adding ACL Item for network " + network.getId()); + } + s_logger.debug("Created ACL: " + aclName + " for network " + network.getId()); + Long aclId = acl.getId(); + //Apply acl to network + try { + if (!_networkAclMgr.replaceNetworkACL(acl, (NetworkVO)network)) { + throw new CloudRuntimeException("Unable to apply auto created ACL to network " + network.getId()); + } + s_logger.debug("Created ACL is applied to network " + network.getId()); + } catch (ResourceUnavailableException e) { + throw new CloudRuntimeException("Unable to apply auto created ACL to network " + network.getId(), e); + } + return aclId; } - private void validateNetworkACLItem(final Integer portStart, final Integer portEnd, final List sourceCidrList, final String protocol, final Integer icmpCode, final Integer icmpType, - final String action, final Integer number) { + /** + * Performs all of the validations for the {@link NetworkACLItem}. + * First we validate the sources start and end ports using {@link #validateSourceStartAndEndPorts(NetworkACLItemVO)}; + * then, we validate the source CIDR list using {@link #validateSourceCidrList(NetworkACLItemVO)}; + * afterwards, it is validated the protocol entered in the {@link NetworkACLItemVO} using {@link #validateProtocol(NetworkACLItemVO)}. + */ + protected void validateNetworkACLItem(NetworkACLItemVO networkACLItemVO) { + validateSourceStartAndEndPorts(networkACLItemVO); + validateSourceCidrList(networkACLItemVO); + validateProtocol(networkACLItemVO); + } - if (portStart != null && !NetUtils.isValidPort(portStart)) { - throw new InvalidParameterValueException("publicPort is an invalid value: " + portStart); + /** + * Validated ICMP type and code of {@link NetworkACLItemVO}. The behavior of this method is the following: + *
    + *
  • If no ICMP type is provided, we do not perform validations; + *
  • If the ICMP type is not '-1', we validate it using {@link NetUtils#validateIcmpType(long)}; + *
  • If the ICMP code is null, we do not perform validations; + *
  • If the ICMP code is not '-1', we validate it using {@link NetUtils#validateIcmpCode(long)}; + *
+ * Failing to meet the above conditions, we throw an {@link InvalidParameterValueException}. + */ + protected void validateIcmpTypeAndCode(NetworkACLItemVO networkACLItemVO) { + Integer icmpType = networkACLItemVO.getIcmpType(); + Integer icmpCode = networkACLItemVO.getIcmpCode(); + if (icmpType == null) { + return; + } + if (icmpType.longValue() != -1 && !NetUtils.validateIcmpType(icmpType.longValue())) { + throw new InvalidParameterValueException(String.format("Invalid icmp type [%d]. It should belong to [0-255] range", icmpType)); + } + if (icmpCode != null) { + if (icmpCode.longValue() != -1 && !NetUtils.validateIcmpCode(icmpCode.longValue())) { + throw new InvalidParameterValueException(String.format("Invalid icmp code [%d]. It should belong to [0-15] range and can be defined when icmpType belongs to [0-40] range", icmpCode)); + } } - if (portEnd != null && !NetUtils.isValidPort(portEnd)) { - throw new InvalidParameterValueException("Public port range is an invalid value: " + portEnd); + } + + /** + * Validates the {@link NetworkACLItemVO} protocol. If the protocol is blank, we do not execute any validations. Otherwise, we perform the following checks: + *
    + *
  • If it is a numeric value, the protocol must be bigger or equal to 0 and smaller or equal to 255; + *
  • if it is a {@link String}, it must be one of the following: {@link #supportedProtocolsForAclRules}; + *
+ * Whenever the conditions enumerated above are not met, we throw an {@link InvalidParameterValueException}. + * + * If the parameter passes the protocol type validations, we check the following: + *
    + *
  • If it is not an ICMP type protocol, it cannot have any value in {@link NetworkACLItemVO#getIcmpCode()} and {@link NetworkACLItemVO#getIcmpType()}; + *
  • If it is an ICMP type protocol, it cannot have any value in {@link NetworkACLItemVO#getSourcePortStart()} and {@link NetworkACLItemVO#getSourcePortEnd()}. + *
+ * Failing to meet the above conditions, we throw an {@link InvalidParameterValueException}. + * + * The last check is performed via {@link #validateIcmpTypeAndCode(NetworkACLItemVO)} method. + */ + protected void validateProtocol(NetworkACLItemVO networkACLItemVO) { + String protocol = networkACLItemVO.getProtocol(); + if (StringUtils.isBlank(protocol)) { + return; + } + if (StringUtils.isNumeric(protocol)) { + int protoNumber = Integer.parseInt(protocol); + if (protoNumber < 0 || protoNumber > 255) { + throw new InvalidParameterValueException("Invalid protocol number: " + protoNumber); + } + } else { + if (!supportedProtocolsForAclRules.contains(protocol.toLowerCase())) { + throw new InvalidParameterValueException(String.format("Invalid protocol [%s]. Expected one of: [%s]", protocol, supportedProtocolsForAclRules)); + } } - // start port can't be bigger than end port - if (portStart != null && portEnd != null && portStart > portEnd) { - throw new InvalidParameterValueException("Start port can't be bigger than end port"); + Integer icmpCode = networkACLItemVO.getIcmpCode(); + Integer icmpType = networkACLItemVO.getIcmpType(); + // icmp code and icmp type can't be passed in for any other protocol rather than icmp + boolean isIcmpProtocol = protocol.equalsIgnoreCase(NetUtils.ICMP_PROTO); + if (!isIcmpProtocol && (icmpCode != null || icmpType != null)) { + throw new InvalidParameterValueException("Can specify icmpCode and icmpType for ICMP protocol only"); } - // start port and end port must be null for protocol = 'all' - if ((portStart != null || portEnd != null) && protocol != null && protocol.equalsIgnoreCase("all")) { - throw new InvalidParameterValueException("start port and end port must be null if protocol = 'all'"); + Integer sourcePortStart = networkACLItemVO.getSourcePortStart(); + Integer sourcePortEnd = networkACLItemVO.getSourcePortEnd(); + if (isIcmpProtocol && (sourcePortStart != null || sourcePortEnd != null)) { + throw new InvalidParameterValueException("Can't specify start/end port when protocol is ICMP"); } - if (sourceCidrList != null) { - for (final String cidr : sourceCidrList) { + validateIcmpTypeAndCode(networkACLItemVO); + } + + /** + * Validates all of the CIDRs in the {@link NetworkACLItemVO#getSourceCidrList()}. + * If the list is empty we do not execute any validation. Otherwise, all of the CIDRs are validated using {@link NetUtils#isValidIp4Cidr(String)}. + */ + protected void validateSourceCidrList(NetworkACLItemVO networkACLItemVO) { + List sourceCidrList = networkACLItemVO.getSourceCidrList(); + if (CollectionUtils.isNotEmpty(sourceCidrList)) { + for (String cidr : sourceCidrList) { if (!NetUtils.isValidIp4Cidr(cidr)) { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Source cidrs formatting error " + cidr); } } } + } - //Validate Protocol - if (protocol != null) { - //Check if protocol is a number - if (StringUtils.isNumeric(protocol)) { - final int protoNumber = Integer.parseInt(protocol); - if (protoNumber < 0 || protoNumber > 255) { - throw new InvalidParameterValueException("Invalid protocol number: " + protoNumber); - } - } else { - //Protocol is not number - //Check for valid protocol strings - final String supportedProtocols = "tcp,udp,icmp,all"; - if (!supportedProtocols.contains(protocol.toLowerCase())) { - throw new InvalidParameterValueException("Invalid protocol: " + protocol); - } - } - - // icmp code and icmp type can't be passed in for any other protocol rather than icmp - if (!protocol.equalsIgnoreCase(NetUtils.ICMP_PROTO) && (icmpCode != null || icmpType != null)) { - throw new InvalidParameterValueException("Can specify icmpCode and icmpType for ICMP protocol only"); - } - - if (protocol.equalsIgnoreCase(NetUtils.ICMP_PROTO) && (portStart != null || portEnd != null)) { - throw new InvalidParameterValueException("Can't specify start/end port when protocol is ICMP"); - } + /** + * Validates the source start and end ports for the given network ACL rule. + * If both ports (start and end) are null, we do not execute validations. Otherwise, we check the following: + *
    + *
  • Check if start port is valid using {@link NetUtils#isValidPort(int)}; + *
  • Check if end port is valid using {@link NetUtils#isValidPort(int)}; + *
  • Check if start port is bigger than end port; + *
  • Check if start and end ports were used with protocol 'all' + *
+ * All of the above cases will generate an {@link InvalidParameterValueException}. + */ + protected void validateSourceStartAndEndPorts(NetworkACLItemVO networkACLItemVO) { + Integer sourcePortStart = networkACLItemVO.getSourcePortStart(); + Integer sourcePortEnd = networkACLItemVO.getSourcePortEnd(); + if (sourcePortStart == null && sourcePortEnd == null) { + return; } - //validate icmp code and type - if (icmpType != null) { - if (icmpType.longValue() != -1 && !NetUtils.validateIcmpType(icmpType.longValue())) { - throw new InvalidParameterValueException("Invalid icmp type; should belong to [0-255] range"); - } - if (icmpCode != null) { - if (icmpCode.longValue() != -1 && !NetUtils.validateIcmpCode(icmpCode.longValue())) { - throw new InvalidParameterValueException("Invalid icmp code; should belong to [0-15] range and can" - + " be defined when icmpType belongs to [0-40] range"); - } - } + if (!NetUtils.isValidPort(sourcePortStart)) { + throw new InvalidParameterValueException("Start public port is an invalid value: " + sourcePortStart); } - //Check ofr valid action Allow/Deny - if (action != null) { - if (!("Allow".equalsIgnoreCase(action) || "Deny".equalsIgnoreCase(action))) { - throw new InvalidParameterValueException("Invalid action. Allowed actions are Allow and Deny"); - } + if (!NetUtils.isValidPort(sourcePortEnd)) { + throw new InvalidParameterValueException("End public port is an invalid value: " + sourcePortEnd); } - - //Check for valid number - if (number != null && number < 1) { - throw new InvalidParameterValueException("Invalid number. Number cannot be < 1"); + if (sourcePortStart > sourcePortEnd) { + throw new InvalidParameterValueException(String.format("Start port can't be bigger than end port [startport=%d,endport=%d]", sourcePortStart, sourcePortEnd)); + } + String protocol = networkACLItemVO.getProtocol(); + if ("all".equalsIgnoreCase(protocol)) { + throw new InvalidParameterValueException("start port and end port must be null if protocol = 'all'"); } } @@ -524,7 +702,7 @@ public Pair, Integer> listNetworkACLItems(final L if (networkId != null) { final Network network = _networkDao.findById(networkId); aclId = network.getNetworkACLId(); - if( aclId == null){ + if (aclId == null) { // No aclId associated with the network. //Return empty list return new Pair(new ArrayList(), 0); @@ -549,7 +727,6 @@ public Pair, Integer> listNetworkACLItems(final L } else { //ToDo: Add accountId to network_acl_item table for permission check - // aclId is not specified // List permitted VPCs and filter aclItems final List permittedAccounts = new ArrayList(); @@ -558,10 +735,8 @@ public Pair, Integer> listNetworkACLItems(final L final String accountName = cmd.getAccountName(); final Long projectId = cmd.getProjectId(); final boolean listAll = cmd.listAll(); - final Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, null); - _accountMgr.buildACLSearchParameters(caller, id, accountName, projectId, permittedAccounts, domainIdRecursiveListProject, - listAll, false); + final Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, null); + _accountMgr.buildACLSearchParameters(caller, id, accountName, projectId, permittedAccounts, domainIdRecursiveListProject, listAll, false); domainId = domainIdRecursiveListProject.first(); isRecursive = domainIdRecursiveListProject.second(); final ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third(); @@ -599,7 +774,7 @@ public Pair, Integer> listNetworkACLItems(final L final Pair, Integer> result = _networkACLItemDao.searchAndCount(sc, filter); final List aclItemVOs = result.first(); - for (final NetworkACLItemVO item: aclItemVOs) { + for (final NetworkACLItemVO item : aclItemVOs) { _networkACLItemDao.loadCidrs(item); } return new Pair, Integer>(aclItemVOs, result.second()); @@ -609,12 +784,12 @@ public Pair, Integer> listNetworkACLItems(final L @ActionEvent(eventType = EventTypes.EVENT_NETWORK_ACL_ITEM_DELETE, eventDescription = "Deleting Network ACL Item", async = true) public boolean revokeNetworkACLItem(final long ruleId) { final NetworkACLItemVO aclItem = _networkACLItemDao.findById(ruleId); - if(aclItem != null){ + if (aclItem != null) { final NetworkACL acl = _networkAclMgr.getNetworkACL(aclItem.getAclId()); final Vpc vpc = _entityMgr.findById(Vpc.class, acl.getVpcId()); - if(aclItem.getAclId() == NetworkACL.DEFAULT_ALLOW || aclItem.getAclId() == NetworkACL.DEFAULT_DENY){ + if (aclItem.getAclId() == NetworkACL.DEFAULT_ALLOW || aclItem.getAclId() == NetworkACL.DEFAULT_DENY) { throw new InvalidParameterValueException("ACL Items in default ACL cannot be deleted"); } @@ -626,38 +801,105 @@ public boolean revokeNetworkACLItem(final long ruleId) { return _networkAclMgr.revokeNetworkACLItem(ruleId); } + /** + * Updates a network ACL with the given values found in the {@link UpdateNetworkACLItemCmd} parameter. + * First we will validate the network ACL rule provided in the command using {@link #validateNetworkAclRuleIdAndRetrieveIt(UpdateNetworkACLItemCmd)}. + * Then, we validate the ACL itself using {@link #validateNetworkAcl(NetworkACL)}. If all of the validation is ok, we do the following. + *
    + *
  • Transfer new data to {@link NetworkACLItemVO} that is intended to be updated; + *
  • Validate the ACL rule being updated using {@link #validateNetworkACLItem(NetworkACLItemVO)}. + *
+ * + * After the validations and updating the POJO we execute the update in the database using {@link NetworkACLManagerImpl#updateNetworkACLItem(NetworkACLItemVO)}. + * + */ @Override - public NetworkACLItem updateNetworkACLItem(final Long id, final String protocol, final List sourceCidrList, final NetworkACLItem.TrafficType trafficType, final String action, - final Integer number, final Integer sourcePortStart, final Integer sourcePortEnd, final Integer icmpCode, final Integer icmpType, final String newUUID, final Boolean forDisplay) throws ResourceUnavailableException { - final NetworkACLItemVO aclItem = _networkACLItemDao.findById(id); - if (aclItem == null) { - throw new InvalidParameterValueException("Unable to find ACL Item cannot be found"); - } - - if (aclItem.getAclId() == NetworkACL.DEFAULT_ALLOW || aclItem.getAclId() == NetworkACL.DEFAULT_DENY) { - throw new InvalidParameterValueException("Default ACL Items cannot be updated"); - } - - final NetworkACL acl = _networkAclMgr.getNetworkACL(aclItem.getAclId()); - - final Vpc vpc = _entityMgr.findById(Vpc.class, acl.getVpcId()); + public NetworkACLItem updateNetworkACLItem(UpdateNetworkACLItemCmd updateNetworkACLItemCmd) throws ResourceUnavailableException { + NetworkACLItemVO networkACLItemVo = validateNetworkAclRuleIdAndRetrieveIt(updateNetworkACLItemCmd); - final Account caller = CallContext.current().getCallingAccount(); + NetworkACL acl = _networkAclMgr.getNetworkACL(networkACLItemVo.getAclId()); + validateNetworkAcl(acl); - _accountMgr.checkAccess(caller, null, true, vpc); + transferDataToNetworkAclRulePojo(updateNetworkACLItemCmd, networkACLItemVo, acl); + validateNetworkACLItem(networkACLItemVo); + return _networkAclMgr.updateNetworkACLItem(networkACLItemVo); + } + /** + * We transfer the update information form {@link UpdateNetworkACLItemCmd} to the {@link NetworkACLItemVO} POJO passed as parameter. + * There is one validation performed here, which is regarding the number of the ACL. We will check if there is already an ACL rule with that number, and if this is the case an {@link InvalidParameterValueException} is thrown. + * All of the parameters in {@link UpdateNetworkACLItemCmd} that are not null will be set to their corresponding fields in {@link NetworkACLItemVO}. + * + * We use {@link #validateAndCreateNetworkAclRuleAction(String)} when converting an action as {@link String} to its Enum corresponding value. + */ + protected void transferDataToNetworkAclRulePojo(UpdateNetworkACLItemCmd updateNetworkACLItemCmd, NetworkACLItemVO networkACLItemVo, NetworkACL acl) { + Integer number = updateNetworkACLItemCmd.getNumber(); if (number != null) { - //Check if ACL Item with specified number already exists - final NetworkACLItemVO aclNumber = _networkACLItemDao.findByAclAndNumber(acl.getId(), number); - if (aclNumber != null && aclNumber.getId() != id) { + NetworkACLItemVO aclNumber = _networkACLItemDao.findByAclAndNumber(acl.getId(), number); + if (aclNumber != null && aclNumber.getId() != networkACLItemVo.getId()) { throw new InvalidParameterValueException("ACL item with number " + number + " already exists in ACL: " + acl.getUuid()); } + networkACLItemVo.setNumber(number); } - validateNetworkACLItem(sourcePortStart == null ? aclItem.getSourcePortStart() : sourcePortStart, sourcePortEnd == null ? aclItem.getSourcePortEnd() - : sourcePortEnd, sourceCidrList, protocol, icmpCode, icmpType == null ? aclItem.getIcmpType() : icmpType, action, number); + Integer sourcePortStart = updateNetworkACLItemCmd.getSourcePortStart(); + if (sourcePortStart != null) { + networkACLItemVo.setSourcePortStart(sourcePortStart); + } + Integer sourcePortEnd = updateNetworkACLItemCmd.getSourcePortEnd(); + if (sourcePortEnd != null) { + networkACLItemVo.setSourcePortEnd(sourcePortEnd); + } + List sourceCidrList = updateNetworkACLItemCmd.getSourceCidrList(); + if (CollectionUtils.isNotEmpty(sourceCidrList)) { + networkACLItemVo.setSourceCidrList(sourceCidrList); + } + String protocol = updateNetworkACLItemCmd.getProtocol(); + if (StringUtils.isNotBlank(protocol)) { + networkACLItemVo.setProtocol(protocol); + } + Integer icmpCode = updateNetworkACLItemCmd.getIcmpCode(); + if (icmpCode != null) { + networkACLItemVo.setIcmpCode(icmpCode); + } + Integer icmpType = updateNetworkACLItemCmd.getIcmpType(); + if (icmpType != null) { + networkACLItemVo.setIcmpType(icmpType); + } + String action = updateNetworkACLItemCmd.getAction(); + if (StringUtils.isNotBlank(action)) { + Action aclRuleAction = validateAndCreateNetworkAclRuleAction(action); + networkACLItemVo.setAction(aclRuleAction); + } + TrafficType trafficType = updateNetworkACLItemCmd.getTrafficType(); + if (trafficType != null) { + networkACLItemVo.setTrafficType(trafficType); + } + String customId = updateNetworkACLItemCmd.getCustomId(); + if (StringUtils.isNotBlank(customId)) { + networkACLItemVo.setUuid(customId); + } + boolean display = updateNetworkACLItemCmd.isDisplay(); + if (display != networkACLItemVo.isDisplay()) { + networkACLItemVo.setDisplay(display); + } + String reason = updateNetworkACLItemCmd.getReason(); + if (StringUtils.isNotBlank(reason)) { + networkACLItemVo.setReason(reason); + } + } - return _networkAclMgr.updateNetworkACLItem(id, protocol, sourceCidrList, trafficType, action, number, sourcePortStart, sourcePortEnd, icmpCode, icmpType, newUUID, forDisplay); + /** + * We validate the network ACL rule ID provided. If not ACL rule is found with the given Id an {@link InvalidParameterValueException} is thrown. + * If an ACL rule is found, we return the clone of the rule to avoid messing up with CGlib enhanced objects that might be linked to database entries. + */ + protected NetworkACLItemVO validateNetworkAclRuleIdAndRetrieveIt(UpdateNetworkACLItemCmd updateNetworkACLItemCmd) { + Long id = updateNetworkACLItemCmd.getId(); + NetworkACLItemVO networkACLItemVoFromDatabase = _networkACLItemDao.findById(id); + if (networkACLItemVoFromDatabase == null) { + throw new InvalidParameterValueException(String.format("Unable to find ACL rule with ID [%s]", id)); + } + return networkACLItemVoFromDatabase.clone(); } @Override diff --git a/server/src/test/java/com/cloud/network/vpc/NetworkACLManagerImplTest.java b/server/src/test/java/com/cloud/network/vpc/NetworkACLManagerImplTest.java new file mode 100644 index 000000000000..1d7cdc14e432 --- /dev/null +++ b/server/src/test/java/com/cloud/network/vpc/NetworkACLManagerImplTest.java @@ -0,0 +1,81 @@ +// 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.vpc; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.Spy; +import org.mockito.runners.MockitoJUnitRunner; + +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.vpc.NetworkACLItem.State; +import com.cloud.utils.exception.CloudRuntimeException; + +@RunWith(MockitoJUnitRunner.class) +public class NetworkACLManagerImplTest { + + @Spy + @InjectMocks + private NetworkACLManagerImpl networkACLManagerImpl; + @Mock + private NetworkACLItemDao networkACLItemDaoMock; + + @Test(expected = CloudRuntimeException.class) + public void updateNetworkACLItemTestUpdateDoesNotWork() throws ResourceUnavailableException { + NetworkACLItemVO networkACLItemVOMock = new NetworkACLItemVO(); + networkACLItemVOMock.id = 1L; + + Mockito.doReturn(false).when(networkACLItemDaoMock).update(1L, networkACLItemVOMock); + + networkACLManagerImpl.updateNetworkACLItem(networkACLItemVOMock); + } + + @Test(expected = CloudRuntimeException.class) + public void updateNetworkACLItemTestUpdateWorksButApplyDoesNotWork() throws ResourceUnavailableException { + NetworkACLItemVO networkACLItemVOMock = new NetworkACLItemVO(); + networkACLItemVOMock.id = 1L; + networkACLItemVOMock.aclId = 2L; + + Mockito.doReturn(true).when(networkACLItemDaoMock).update(1L, networkACLItemVOMock); + Mockito.doReturn(false).when(networkACLManagerImpl).applyNetworkACL(2L); + + networkACLManagerImpl.updateNetworkACLItem(networkACLItemVOMock); + } + + @Test + public void updateNetworkACLItemTestHappyDay() throws ResourceUnavailableException { + NetworkACLItemVO networkACLItemVOMock = new NetworkACLItemVO(); + networkACLItemVOMock.id = 1L; + networkACLItemVOMock.aclId = 2L; + + Mockito.doReturn(true).when(networkACLItemDaoMock).update(1L, networkACLItemVOMock); + Mockito.doReturn(true).when(networkACLManagerImpl).applyNetworkACL(2L); + + NetworkACLItem returnedNetworkAclItem = networkACLManagerImpl.updateNetworkACLItem(networkACLItemVOMock); + + Mockito.verify(networkACLItemDaoMock).update(1L, networkACLItemVOMock); + Mockito.verify(networkACLManagerImpl).applyNetworkACL(2L); + + Assert.assertEquals(networkACLItemVOMock, returnedNetworkAclItem); + Assert.assertEquals(State.Add, returnedNetworkAclItem.getState()); + } +} diff --git a/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java b/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java new file mode 100644 index 000000000000..ee7a474bd195 --- /dev/null +++ b/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java @@ -0,0 +1,774 @@ +// 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.vpc; + +import java.util.ArrayList; + +import org.apache.cloudstack.acl.SecurityChecker.AccessType; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd; +import org.apache.cloudstack.api.command.user.network.UpdateNetworkACLItemCmd; +import org.apache.cloudstack.context.CallContext; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InOrder; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.Spy; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.Network; +import com.cloud.network.NetworkModel; +import com.cloud.network.dao.NetworkVO; +import com.cloud.network.vpc.NetworkACLItem.Action; +import com.cloud.network.vpc.NetworkACLItem.TrafficType; +import com.cloud.user.Account; +import com.cloud.user.AccountManager; +import com.cloud.utils.db.EntityManager; +import com.cloud.utils.exception.CloudRuntimeException; + +@RunWith(PowerMockRunner.class) +public class NetworkACLServiceImplTest { + + @Spy + @InjectMocks + private NetworkACLServiceImpl networkAclServiceImpl = new NetworkACLServiceImpl(); + @Mock + private NetworkModel networkModelMock; + @Mock + private NetworkACLManager networkAclManager; + @Mock + private NetworkACLItemDao networkAclItemDaoMock; + @Mock + private EntityManager EntityManagerMock; + @Mock + private AccountManager AccountManager; + + @Mock + private CreateNetworkACLCmd createNetworkAclCmdMock; + @Mock + private UpdateNetworkACLItemCmd updateNetworkACLItemCmdMock; + @Mock + private Network networkMock; + @Mock + private NetworkACL networkAclMock; + @Mock + private NetworkACLItemVO networkAclItemVoMock; + + private Long networkAclMockId = 1L; + private Long networkOfferingMockId = 2L; + private Long networkMockVpcMockId = 3L; + + @Before + public void befoteTest() { + Mockito.when(createNetworkAclCmdMock.getNetworkId()).thenReturn(1L); + Mockito.when(createNetworkAclCmdMock.getProtocol()).thenReturn("tcp"); + + Mockito.when(networkMock.getNetworkOfferingId()).thenReturn(networkOfferingMockId); + Mockito.when(networkMock.getVpcId()).thenReturn(networkMockVpcMockId); + } + + @Test + public void createNetworkACLItemTestAclNumberNull() { + createNetworkACLItemTestForNumberAndExecuteTest(null); + } + + @Test + public void createNetworkACLItemTestAclNumberNotNull() { + createNetworkACLItemTestForNumberAndExecuteTest(10); + } + + private void createNetworkACLItemTestForNumberAndExecuteTest(Integer number) { + Mockito.when(createNetworkAclCmdMock.getNumber()).thenReturn(number); + + Mockito.doReturn(networkAclMockId).when(networkAclServiceImpl).createAclListIfNeeded(createNetworkAclCmdMock); + Mockito.when(networkAclManager.getNetworkACL(networkAclMockId)).thenReturn(networkAclMock); + + Mockito.doNothing().when(networkAclServiceImpl).validateAclRuleNumber(createNetworkAclCmdMock, networkAclMock); + Mockito.doNothing().when(networkAclServiceImpl).validateNetworkAcl(networkAclMock); + + Mockito.doReturn(Action.Allow).when(networkAclServiceImpl).validateAndCreateNetworkAclRuleAction(Mockito.anyString()); + Mockito.when(networkAclItemDaoMock.getMaxNumberByACL(networkAclMockId)).thenReturn(5); + + Mockito.doNothing().when(networkAclServiceImpl).validateNetworkACLItem(Mockito.any(NetworkACLItemVO.class)); + Mockito.when(networkAclManager.createNetworkACLItem(Mockito.any(NetworkACLItemVO.class))).thenAnswer(new Answer() { + @Override + public NetworkACLItemVO answer(InvocationOnMock invocation) throws Throwable { + return (NetworkACLItemVO)invocation.getArguments()[0]; + } + }); + + NetworkACLItem netowkrAclRuleCreated = networkAclServiceImpl.createNetworkACLItem(createNetworkAclCmdMock); + + Assert.assertEquals(number == null ? 6 : number, netowkrAclRuleCreated.getNumber()); + + InOrder inOrder = Mockito.inOrder(networkAclManager, networkAclServiceImpl, networkAclItemDaoMock); + inOrder.verify(networkAclServiceImpl).createAclListIfNeeded(createNetworkAclCmdMock); + inOrder.verify(networkAclManager).getNetworkACL(networkAclMockId); + inOrder.verify(networkAclServiceImpl).validateNetworkAcl(networkAclMock); + inOrder.verify(networkAclServiceImpl).validateAclRuleNumber(createNetworkAclCmdMock, networkAclMock); + inOrder.verify(networkAclServiceImpl).validateAndCreateNetworkAclRuleAction(Mockito.anyString()); + inOrder.verify(networkAclItemDaoMock, Mockito.times(number == null ? 1 : 0)).getMaxNumberByACL(networkAclMockId); + inOrder.verify(networkAclServiceImpl).validateNetworkACLItem(Mockito.any(NetworkACLItemVO.class)); + inOrder.verify(networkAclManager).createNetworkACLItem(Mockito.any(NetworkACLItemVO.class)); + } + + @Test + public void createAclListIfNeededTestAclRuleListIdNotNull() { + Long expectedAclListId = 1L; + Mockito.when(createNetworkAclCmdMock.getACLId()).thenReturn(expectedAclListId); + + Long returnetAclListId = networkAclServiceImpl.createAclListIfNeeded(createNetworkAclCmdMock); + + Assert.assertEquals(expectedAclListId, returnetAclListId); + } + + @Test(expected = InvalidParameterValueException.class) + public void createAclListIfNeededTestAclRuleListIdNullAndNetworkDoesNotHaveVpc() { + Mockito.when(createNetworkAclCmdMock.getACLId()).thenReturn(null); + + long networkId = 1L; + Mockito.when(createNetworkAclCmdMock.getNetworkId()).thenReturn(networkId); + + Network networkMock = Mockito.mock(Network.class); + Mockito.when(networkMock.getVpcId()).thenReturn(null); + + Mockito.doReturn(networkMock).when(networkModelMock).getNetwork(networkId); + + networkAclServiceImpl.createAclListIfNeeded(createNetworkAclCmdMock); + } + + @Test + public void createAclListIfNeededTestAclRuleListIdNullAndNetworkWithVpcAndNotAclListYet() { + Mockito.when(createNetworkAclCmdMock.getACLId()).thenReturn(null); + + long networkId = 1L; + Mockito.when(createNetworkAclCmdMock.getNetworkId()).thenReturn(networkId); + + Network networkMock = Mockito.mock(Network.class); + Mockito.when(networkMock.getVpcId()).thenReturn(12L); + Mockito.when(networkMock.getNetworkACLId()).thenReturn(null); + + Mockito.doReturn(networkMock).when(networkModelMock).getNetwork(networkId); + + Long expectedAclListId = 15L; + Mockito.doReturn(expectedAclListId).when(networkAclServiceImpl).createAclListForNetworkAndReturnAclListId(createNetworkAclCmdMock, networkMock); + + Long aclIdReturned = networkAclServiceImpl.createAclListIfNeeded(createNetworkAclCmdMock); + + Assert.assertEquals(expectedAclListId, aclIdReturned); + Mockito.verify(networkAclServiceImpl).createAclListForNetworkAndReturnAclListId(createNetworkAclCmdMock, networkMock); + } + + @Test + public void createAclListIfNeededTestAclRuleListIdNullAndNetworkWithVpcAndAclListAlreadyCreated() { + Mockito.when(createNetworkAclCmdMock.getACLId()).thenReturn(null); + + long networkId = 1L; + Mockito.when(createNetworkAclCmdMock.getNetworkId()).thenReturn(networkId); + Network networkMock = Mockito.mock(Network.class); + ; + Mockito.when(networkMock.getVpcId()).thenReturn(12L); + Long expectedAclListId = 15L; + Mockito.when(networkMock.getNetworkACLId()).thenReturn(expectedAclListId); + + Mockito.doReturn(networkMock).when(networkModelMock).getNetwork(networkId); + + Mockito.doReturn(16L).when(networkAclServiceImpl).createAclListForNetworkAndReturnAclListId(createNetworkAclCmdMock, networkMock); + + Long aclIdReturned = networkAclServiceImpl.createAclListIfNeeded(createNetworkAclCmdMock); + + Assert.assertEquals(expectedAclListId, aclIdReturned); + Mockito.verify(networkAclServiceImpl, Mockito.times(0)).createAclListForNetworkAndReturnAclListId(createNetworkAclCmdMock, networkMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void createAclListForNetworkAndReturnAclListIdTestServicesNotSupportedByNetworkOffering() { + Mockito.doReturn(false).when(networkModelMock).areServicesSupportedByNetworkOffering(networkOfferingMockId, Network.Service.NetworkACL); + networkAclServiceImpl.createAclListForNetworkAndReturnAclListId(createNetworkAclCmdMock, networkMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void createAclListForNetworkAndReturnAclListIdTestServicesSupportedByNetworkOfferingButVpcNotFound() { + Mockito.doReturn(true).when(networkModelMock).areServicesSupportedByNetworkOffering(networkOfferingMockId, Network.Service.NetworkACL); + Mockito.doReturn(null).when(EntityManagerMock).findById(Vpc.class, networkMockVpcMockId); + + networkAclServiceImpl.createAclListForNetworkAndReturnAclListId(createNetworkAclCmdMock, networkMock); + } + + @Test(expected = CloudRuntimeException.class) + public void createAclListForNetworkAndReturnAclListIdTestCreateNetworkAclReturnsNull() { + Mockito.doReturn(true).when(networkModelMock).areServicesSupportedByNetworkOffering(networkOfferingMockId, Network.Service.NetworkACL); + Mockito.doReturn(Mockito.mock(Vpc.class)).when(EntityManagerMock).findById(Vpc.class, networkMockVpcMockId); + Mockito.doReturn(null).when(networkAclManager).createNetworkACL(Mockito.anyString(), Mockito.anyString(), Mockito.anyLong(), Mockito.anyBoolean()); + + networkAclServiceImpl.createAclListForNetworkAndReturnAclListId(createNetworkAclCmdMock, networkMock); + } + + @Test(expected = CloudRuntimeException.class) + public void createAclListForNetworkAndReturnAclListIdTestAclNetworkIsCreatedButNotApplied() throws ResourceUnavailableException { + Mockito.doReturn(true).when(networkModelMock).areServicesSupportedByNetworkOffering(networkOfferingMockId, Network.Service.NetworkACL); + Mockito.doReturn(Mockito.mock(Vpc.class)).when(EntityManagerMock).findById(Vpc.class, networkMockVpcMockId); + Mockito.doReturn(Mockito.mock(NetworkACL.class)).when(networkAclManager).createNetworkACL(Mockito.anyString(), Mockito.anyString(), Mockito.anyLong(), Mockito.anyBoolean()); + Mockito.doReturn(false).when(networkAclManager).replaceNetworkACL(Mockito.any(NetworkACL.class), Mockito.any(NetworkVO.class)); + + NetworkVO networkVoMock = new NetworkVO(); + networkVoMock.setNetworkOfferingId(networkOfferingMockId); + networkVoMock.setVpcId(networkMockVpcMockId); + + networkAclServiceImpl.createAclListForNetworkAndReturnAclListId(createNetworkAclCmdMock, networkVoMock); + } + + @Test(expected = CloudRuntimeException.class) + public void createAclListForNetworkAndReturnAclListIdTestAclNetworkIsCreatedButNotAppliedWithException() throws ResourceUnavailableException { + Mockito.doReturn(true).when(networkModelMock).areServicesSupportedByNetworkOffering(networkOfferingMockId, Network.Service.NetworkACL); + Mockito.doReturn(Mockito.mock(Vpc.class)).when(EntityManagerMock).findById(Vpc.class, networkMockVpcMockId); + Mockito.doReturn(Mockito.mock(NetworkACL.class)).when(networkAclManager).createNetworkACL(Mockito.anyString(), Mockito.anyString(), Mockito.anyLong(), Mockito.anyBoolean()); + + Mockito.doThrow(ResourceUnavailableException.class).when(networkAclManager).replaceNetworkACL(Mockito.any(NetworkACL.class), Mockito.any(NetworkVO.class)); + + NetworkVO networkVoMock = new NetworkVO(); + networkVoMock.setNetworkOfferingId(networkOfferingMockId); + networkVoMock.setVpcId(networkMockVpcMockId); + + networkAclServiceImpl.createAclListForNetworkAndReturnAclListId(createNetworkAclCmdMock, networkVoMock); + } + + @Test + public void createAclListForNetworkAndReturnAclListIdTestAclIsCreatedAndAppliedWithSuccess() throws ResourceUnavailableException { + Mockito.doReturn(true).when(networkModelMock).areServicesSupportedByNetworkOffering(networkOfferingMockId, Network.Service.NetworkACL); + Mockito.doReturn(Mockito.mock(Vpc.class)).when(EntityManagerMock).findById(Vpc.class, networkMockVpcMockId); + + NetworkACL networkAclMock = Mockito.mock(NetworkACL.class); + Long expectedNetworkAclId = 5L; + Mockito.when(networkAclMock.getId()).thenReturn(expectedNetworkAclId); + Mockito.doReturn(networkAclMock).when(networkAclManager).createNetworkACL(Mockito.anyString(), Mockito.anyString(), Mockito.anyLong(), Mockito.anyBoolean()); + + Mockito.doReturn(true).when(networkAclManager).replaceNetworkACL(Mockito.any(NetworkACL.class), Mockito.any(NetworkVO.class)); + + NetworkVO networkVoMock = new NetworkVO(); + networkVoMock.setNetworkOfferingId(networkOfferingMockId); + networkVoMock.setVpcId(networkMockVpcMockId); + + Long networkAclIdReceived = networkAclServiceImpl.createAclListForNetworkAndReturnAclListId(createNetworkAclCmdMock, networkVoMock); + + Assert.assertEquals(expectedNetworkAclId, networkAclIdReceived); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateAclRuleNumberTestNumberLessThanOne() { + Mockito.when(createNetworkAclCmdMock.getNumber()).thenReturn(0); + networkAclServiceImpl.validateAclRuleNumber(createNetworkAclCmdMock, networkAclMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateAclRuleNumberTestNumberNegative() { + Mockito.when(createNetworkAclCmdMock.getNumber()).thenReturn(-1); + networkAclServiceImpl.validateAclRuleNumber(createNetworkAclCmdMock, networkAclMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateAclRuleNumberTestNumberInOtherAcl() { + Mockito.when(createNetworkAclCmdMock.getNumber()).thenReturn(1); + Mockito.doReturn(Mockito.mock(NetworkACLItemVO.class)).when(networkAclItemDaoMock).findByAclAndNumber(Mockito.anyLong(), Mockito.anyInt()); + + networkAclServiceImpl.validateAclRuleNumber(createNetworkAclCmdMock, networkAclMock); + + Mockito.verify(networkAclItemDaoMock).findByAclAndNumber(Mockito.anyLong(), Mockito.anyInt()); + } + + @Test + public void validateAclRuleNumberTestHappyDay() { + Mockito.when(createNetworkAclCmdMock.getNumber()).thenReturn(1); + Mockito.doReturn(null).when(networkAclItemDaoMock).findByAclAndNumber(Mockito.anyLong(), Mockito.anyInt()); + + networkAclServiceImpl.validateAclRuleNumber(createNetworkAclCmdMock, networkAclMock); + Mockito.verify(networkAclItemDaoMock).findByAclAndNumber(Mockito.anyLong(), Mockito.anyInt()); + } + + @Test + public void validateAclRuleNumberTestNumberNull() { + Mockito.when(createNetworkAclCmdMock.getNumber()).thenReturn(null); + Mockito.doReturn(null).when(networkAclItemDaoMock).findByAclAndNumber(Mockito.anyLong(), Mockito.anyInt()); + + networkAclServiceImpl.validateAclRuleNumber(createNetworkAclCmdMock, networkAclMock); + Mockito.verify(networkAclItemDaoMock, Mockito.times(0)).findByAclAndNumber(Mockito.anyLong(), Mockito.anyInt()); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateNetworkAclTestAclNull() { + networkAclServiceImpl.validateNetworkAcl(null); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateNetworkAclTestAclDefaulAllow() { + Mockito.when(networkAclMock.getId()).thenReturn(2L); + networkAclServiceImpl.validateNetworkAcl(networkAclMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateNetworkAclTestAclDefaulDeny() { + Mockito.when(networkAclMock.getId()).thenReturn(1L); + networkAclServiceImpl.validateNetworkAcl(networkAclMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateNetworkAclTestAclNotDefaulWithoutVpc() { + Mockito.when(networkAclMock.getId()).thenReturn(3L); + Mockito.doReturn(null).when(EntityManagerMock).findById(Vpc.class, networkMockVpcMockId); + ; + + networkAclServiceImpl.validateNetworkAcl(networkAclMock); + } + + @Test + @PrepareForTest(CallContext.class) + public void validateNetworkAclTestAclNotDefaulWithVpc() { + CallContext callContextMock = Mockito.mock(CallContext.class); + Mockito.doReturn(Mockito.mock(Account.class)).when(callContextMock).getCallingAccount(); + + PowerMockito.mockStatic(CallContext.class); + PowerMockito.when(CallContext.current()).thenReturn(callContextMock); + + Mockito.when(networkAclMock.getId()).thenReturn(3L); + Mockito.when(networkAclMock.getVpcId()).thenReturn(networkMockVpcMockId); + + Mockito.doReturn(Mockito.mock(Vpc.class)).when(EntityManagerMock).findById(Vpc.class, networkMockVpcMockId); + Mockito.doNothing().when(AccountManager).checkAccess(Mockito.any(Account.class), Mockito.isNull(AccessType.class), Mockito.eq(true), Mockito.any(Vpc.class)); + + networkAclServiceImpl.validateNetworkAcl(networkAclMock); + + Mockito.verify(EntityManagerMock).findById(Vpc.class, networkMockVpcMockId); + Mockito.verify(AccountManager).checkAccess(Mockito.any(Account.class), Mockito.isNull(AccessType.class), Mockito.eq(true), Mockito.any(Vpc.class)); + + PowerMockito.verifyStatic(); + CallContext.current(); + + } + + @Test + public void validateAndCreateNetworkAclRuleActionTestActionNull() { + NetworkACLItem.Action receivedAction = networkAclServiceImpl.validateAndCreateNetworkAclRuleAction(null); + + Assert.assertEquals(NetworkACLItem.Action.Allow, receivedAction); + + Mockito.verify(networkAclServiceImpl).validateNetworkAclRuleAction(null); + } + + @Test + public void validateAndCreateNetworkAclRuleActionTestActionAllow() { + NetworkACLItem.Action receivedAction = networkAclServiceImpl.validateAndCreateNetworkAclRuleAction("allow"); + + Assert.assertEquals(NetworkACLItem.Action.Allow, receivedAction); + Mockito.verify(networkAclServiceImpl).validateNetworkAclRuleAction("allow"); + } + + @Test + public void validateAndCreateNetworkAclRuleActionTestActionDeny() { + NetworkACLItem.Action receivedAction = networkAclServiceImpl.validateAndCreateNetworkAclRuleAction("deny"); + + Assert.assertEquals(NetworkACLItem.Action.Deny, receivedAction); + Mockito.verify(networkAclServiceImpl).validateNetworkAclRuleAction("deny"); + } + + @Test + public void validateNetworkAclRuleActionTestActionNull() { + networkAclServiceImpl.validateNetworkAclRuleAction(null); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateNetworkAclRuleActionTestInvalidAction() { + networkAclServiceImpl.validateNetworkAclRuleAction("Invalid"); + } + + @Test + public void validateNetworkAclRuleActionTestValidActions() { + networkAclServiceImpl.validateNetworkAclRuleAction("deny"); + networkAclServiceImpl.validateNetworkAclRuleAction("allow"); + } + + @Test + public void validateNetworkACLItemTest() { + Mockito.doNothing().when(networkAclServiceImpl).validateSourceStartAndEndPorts(networkAclItemVoMock); + Mockito.doNothing().when(networkAclServiceImpl).validateSourceCidrList(networkAclItemVoMock); + Mockito.doNothing().when(networkAclServiceImpl).validateProtocol(networkAclItemVoMock); + + networkAclServiceImpl.validateNetworkACLItem(networkAclItemVoMock); + + InOrder inOrder = Mockito.inOrder(networkAclServiceImpl); + inOrder.verify(networkAclServiceImpl).validateSourceStartAndEndPorts(networkAclItemVoMock); + inOrder.verify(networkAclServiceImpl).validateSourceCidrList(networkAclItemVoMock); + inOrder.verify(networkAclServiceImpl).validateProtocol(networkAclItemVoMock); + } + + @Test + public void validateSourceStartAndEndPortsTestBothPortsNull() { + networkAclServiceImpl.validateSourceStartAndEndPorts(networkAclItemVoMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateSourceStartAndEndPortsTestStartPorInvalid() { + Mockito.when(networkAclItemVoMock.getSourcePortStart()).thenReturn(65536); + + networkAclServiceImpl.validateSourceStartAndEndPorts(networkAclItemVoMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateSourceStartAndEndPortsTestStartPorValidButEndPortInvalid() { + Mockito.when(networkAclItemVoMock.getSourcePortStart()).thenReturn(65535); + Mockito.when(networkAclItemVoMock.getSourcePortEnd()).thenReturn(65536); + + networkAclServiceImpl.validateSourceStartAndEndPorts(networkAclItemVoMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateSourceStartAndEndPortsTestStartPortBiggerThanEndPort() { + Mockito.when(networkAclItemVoMock.getSourcePortStart()).thenReturn(65535); + Mockito.when(networkAclItemVoMock.getSourcePortEnd()).thenReturn(2); + + networkAclServiceImpl.validateSourceStartAndEndPorts(networkAclItemVoMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateSourceStartAndEndPortsTestPortsWithAllProtocol() { + Mockito.when(networkAclItemVoMock.getSourcePortStart()).thenReturn(1); + Mockito.when(networkAclItemVoMock.getSourcePortEnd()).thenReturn(2); + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn("all"); + + networkAclServiceImpl.validateSourceStartAndEndPorts(networkAclItemVoMock); + } + + @Test + public void validateSourceStartAndEndPortsTestPortsWithTcpProtocol() { + Mockito.when(networkAclItemVoMock.getSourcePortStart()).thenReturn(1); + Mockito.when(networkAclItemVoMock.getSourcePortEnd()).thenReturn(2); + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn("tcp"); + + networkAclServiceImpl.validateSourceStartAndEndPorts(networkAclItemVoMock); + } + + @Test + public void validateSourceCidrListTestEmptySourceCirdList() { + Mockito.when(networkAclItemVoMock.getSourceCidrList()).thenReturn(new ArrayList<>()); + networkAclServiceImpl.validateSourceCidrList(networkAclItemVoMock); + } + + @Test(expected = ServerApiException.class) + public void validateSourceCidrListTestInvalidCidrs() { + ArrayList cidrsInvalid = new ArrayList<>(); + cidrsInvalid.add("256.0.0.0./32"); + + Mockito.when(networkAclItemVoMock.getSourceCidrList()).thenReturn(cidrsInvalid); + networkAclServiceImpl.validateSourceCidrList(networkAclItemVoMock); + } + + @Test + public void validateSourceCidrListTestValidCidrs() { + ArrayList cidrsInvalid = new ArrayList<>(); + cidrsInvalid.add("192.168.12.0/24"); + + Mockito.when(networkAclItemVoMock.getSourceCidrList()).thenReturn(cidrsInvalid); + networkAclServiceImpl.validateSourceCidrList(networkAclItemVoMock); + } + + @Test + public void validateProtocolTestProtocolIsNullOrBlank() { + Mockito.doNothing().when(networkAclServiceImpl).validateIcmpTypeAndCode(networkAclItemVoMock); + + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn(null); + networkAclServiceImpl.validateProtocol(networkAclItemVoMock); + + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn(""); + networkAclServiceImpl.validateProtocol(networkAclItemVoMock); + + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn(" "); + networkAclServiceImpl.validateProtocol(networkAclItemVoMock); + + Mockito.verify(networkAclServiceImpl, Mockito.times(0)).validateIcmpTypeAndCode(networkAclItemVoMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateProtocolTestProtocolIsNumericValueLessThanZero() { + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn("-1"); + networkAclServiceImpl.validateProtocol(networkAclItemVoMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateProtocolTestProtocolIsNumericValueMoreThan255() { + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn("256"); + networkAclServiceImpl.validateProtocol(networkAclItemVoMock); + } + + @Test + public void validateProtocolTestProtocolIsNumericValidValue() { + Mockito.doNothing().when(networkAclServiceImpl).validateIcmpTypeAndCode(networkAclItemVoMock); + + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn("255"); + Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(null); + Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(null); + + networkAclServiceImpl.validateProtocol(networkAclItemVoMock); + + Mockito.verify(networkAclServiceImpl).validateIcmpTypeAndCode(networkAclItemVoMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateProtocolTestProtocolIsStringInvalid() { + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn("invalid"); + networkAclServiceImpl.validateProtocol(networkAclItemVoMock); + } + + @Test + public void validateProtocolTestProtocolIsStringValid() { + Mockito.doNothing().when(networkAclServiceImpl).validateIcmpTypeAndCode(networkAclItemVoMock); + + Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(null); + Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(null); + + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn("tcp"); + networkAclServiceImpl.validateProtocol(networkAclItemVoMock); + + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn("all"); + networkAclServiceImpl.validateProtocol(networkAclItemVoMock); + + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn("udp"); + networkAclServiceImpl.validateProtocol(networkAclItemVoMock); + + Mockito.verify(networkAclServiceImpl, Mockito.times(3)).validateIcmpTypeAndCode(networkAclItemVoMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateProtocolTestProtocolNotIcmpWithIcmpConfigurations() { + Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(1); + Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(1); + + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn("tcp"); + networkAclServiceImpl.validateProtocol(networkAclItemVoMock); + } + + @Test + public void validateProtocolTestProtocolNotIcmpWithSourcePorts() { + Mockito.doNothing().when(networkAclServiceImpl).validateIcmpTypeAndCode(networkAclItemVoMock); + + Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(null); + Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(null); + + Mockito.when(networkAclItemVoMock.getSourcePortStart()).thenReturn(1); + Mockito.when(networkAclItemVoMock.getSourcePortEnd()).thenReturn(1); + + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn("tcp"); + networkAclServiceImpl.validateProtocol(networkAclItemVoMock); + + Mockito.verify(networkAclServiceImpl).validateIcmpTypeAndCode(networkAclItemVoMock); + } + + @Test + public void validateProtocolTestProtocolIcmpWithIcmpConfigurations() { + Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(1); + Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(1); + + Mockito.when(networkAclItemVoMock.getSourcePortStart()).thenReturn(null); + Mockito.when(networkAclItemVoMock.getSourcePortEnd()).thenReturn(null); + + Mockito.doNothing().when(networkAclServiceImpl).validateIcmpTypeAndCode(networkAclItemVoMock); + + Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn("icmp"); + networkAclServiceImpl.validateProtocol(networkAclItemVoMock); + + Mockito.verify(networkAclServiceImpl).validateIcmpTypeAndCode(networkAclItemVoMock); + } + + @Test + public void validateIcmpTypeAndCodeTestIcmpTypeNull() { + Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(null); + + networkAclServiceImpl.validateIcmpTypeAndCode(networkAclItemVoMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateIcmpTypeAndCodeTestIcmpTypeInvalid() { + Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(256); + + networkAclServiceImpl.validateIcmpTypeAndCode(networkAclItemVoMock); + } + + @Test + public void validateIcmpTypeAndCodeTestIcmpTypeNegativeOne() { + Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(-1); + Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(null); + + networkAclServiceImpl.validateIcmpTypeAndCode(networkAclItemVoMock); + } + + @Test + public void validateIcmpTypeAndCodeTestIcmpTypeNegativeOneAndIcmpCodeNegativeOne() { + Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(-1); + Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(-1); + + networkAclServiceImpl.validateIcmpTypeAndCode(networkAclItemVoMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateIcmpTypeAndCodeTestIcmpTypeValidAndIcmpCodeInvalid() { + Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(255); + Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(16); + + networkAclServiceImpl.validateIcmpTypeAndCode(networkAclItemVoMock); + } + + @Test + public void validateIcmpTypeAndCodeTestIcmpTypeValidAndIcmpCodeValid() { + Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(255); + Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(1); + + networkAclServiceImpl.validateIcmpTypeAndCode(networkAclItemVoMock); + } + + @Test + public void updateNetworkACLItemTest() throws ResourceUnavailableException { + Mockito.when(networkAclItemVoMock.getAclId()).thenReturn(networkAclMockId); + Mockito.doReturn(networkAclItemVoMock).when(networkAclServiceImpl).validateNetworkAclRuleIdAndRetrieveIt(updateNetworkACLItemCmdMock); + Mockito.doReturn(networkAclMock).when(networkAclManager).getNetworkACL(networkAclMockId); + Mockito.doNothing().when(networkAclServiceImpl).validateNetworkAcl(Mockito.eq(networkAclMock)); + Mockito.doNothing().when(networkAclServiceImpl).transferDataToNetworkAclRulePojo(Mockito.eq(updateNetworkACLItemCmdMock), Mockito.eq(networkAclItemVoMock), Mockito.eq(networkAclMock)); + Mockito.doNothing().when(networkAclServiceImpl).validateNetworkACLItem(networkAclItemVoMock); + Mockito.doReturn(networkAclItemVoMock).when(networkAclManager).updateNetworkACLItem(networkAclItemVoMock); + + networkAclServiceImpl.updateNetworkACLItem(updateNetworkACLItemCmdMock); + + InOrder inOrder = Mockito.inOrder(networkAclServiceImpl, networkAclManager); + inOrder.verify(networkAclServiceImpl).validateNetworkAclRuleIdAndRetrieveIt(updateNetworkACLItemCmdMock); + inOrder.verify(networkAclManager).getNetworkACL(networkAclMockId); + inOrder.verify(networkAclServiceImpl).validateNetworkAcl(networkAclMock); + inOrder.verify(networkAclServiceImpl).transferDataToNetworkAclRulePojo(Mockito.eq(updateNetworkACLItemCmdMock), Mockito.eq(networkAclItemVoMock), Mockito.eq(networkAclMock)); + inOrder.verify(networkAclServiceImpl).validateNetworkACLItem(networkAclItemVoMock); + inOrder.verify(networkAclManager).updateNetworkACLItem(networkAclItemVoMock); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateNetworkAclRuleIdAndRetrieveItTestNetworkAclNotFound() { + Mockito.doReturn(null).when(networkAclItemDaoMock).findById(Mockito.anyLong()); + + networkAclServiceImpl.validateNetworkAclRuleIdAndRetrieveIt(updateNetworkACLItemCmdMock); + } + + @Test + public void validateNetworkAclRuleIdAndRetrieveItTestNetworkAclFound() { + Mockito.doReturn(networkAclItemVoMock).when(networkAclItemDaoMock).findById(Mockito.anyLong()); + + NetworkACLItemVO returnedNetworkAclItemVo = networkAclServiceImpl.validateNetworkAclRuleIdAndRetrieveIt(updateNetworkACLItemCmdMock); + + Assert.assertNotEquals(networkAclItemVoMock, returnedNetworkAclItemVo); + Mockito.verify(networkAclItemVoMock).clone(); + } + + @Test(expected = InvalidParameterValueException.class) + public void transferDataToNetworkAclRulePojoTestNumberOfAcltoBeUpdatedAlreadyInUse() { + int aclNumberToUpdate = 1; + Mockito.when(updateNetworkACLItemCmdMock.getNumber()).thenReturn(aclNumberToUpdate); + Mockito.when(networkAclMock.getId()).thenReturn(networkAclMockId); + Mockito.when(networkAclItemVoMock.getId()).thenReturn(100L); + NetworkACLItemVO otherNetworkAclItemVoMock = Mockito.mock(NetworkACLItemVO.class); + Mockito.when(otherNetworkAclItemVoMock.getId()).thenReturn(101L); + Mockito.doReturn(otherNetworkAclItemVoMock).when(networkAclItemDaoMock).findByAclAndNumber(networkAclMockId, aclNumberToUpdate); + + networkAclServiceImpl.transferDataToNetworkAclRulePojo(updateNetworkACLItemCmdMock, networkAclItemVoMock, networkAclMock); + } + + @Test + public void transferDataToNetworkAclRulePojoTestAllValuesNull() { + Mockito.when(updateNetworkACLItemCmdMock.getNumber()).thenReturn(null); + Mockito.when(updateNetworkACLItemCmdMock.getSourcePortStart()).thenReturn(null); + Mockito.when(updateNetworkACLItemCmdMock.getSourcePortEnd()).thenReturn(null); + Mockito.when(updateNetworkACLItemCmdMock.getSourceCidrList()).thenReturn(null); + Mockito.when(updateNetworkACLItemCmdMock.getProtocol()).thenReturn(null); + Mockito.when(updateNetworkACLItemCmdMock.getIcmpCode()).thenReturn(null); + Mockito.when(updateNetworkACLItemCmdMock.getIcmpType()).thenReturn(null); + Mockito.when(updateNetworkACLItemCmdMock.getAction()).thenReturn(null); + Mockito.when(updateNetworkACLItemCmdMock.getTrafficType()).thenReturn(null); + Mockito.when(updateNetworkACLItemCmdMock.getCustomId()).thenReturn(null); + Mockito.when(updateNetworkACLItemCmdMock.getReason()).thenReturn(null); + + Mockito.when(updateNetworkACLItemCmdMock.isDisplay()).thenReturn(false); + Mockito.when(networkAclItemVoMock.isDisplay()).thenReturn(false); + + networkAclServiceImpl.transferDataToNetworkAclRulePojo(updateNetworkACLItemCmdMock, networkAclItemVoMock, networkAclMock); + + Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setNumber(Mockito.anyInt()); + Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setSourcePortStart(Mockito.anyInt()); + Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setSourcePortEnd(Mockito.anyInt()); + Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setSourceCidrList(Mockito.anyListOf(String.class)); + Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setProtocol(Mockito.anyString()); + Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setIcmpCode(Mockito.anyInt()); + Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setIcmpType(Mockito.anyInt()); + Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setAction(Mockito.any(Action.class)); + Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setTrafficType(Mockito.any(TrafficType.class)); + Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setUuid(Mockito.anyString()); + Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setReason(Mockito.anyString()); + Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setDisplay(Mockito.anyBoolean()); + Mockito.verify(networkAclServiceImpl, Mockito.times(0)).validateAndCreateNetworkAclRuleAction(Mockito.anyString()); + } + + @Test + public void transferDataToNetworkAclRulePojoTestAllValuesWithUpdateData() { + Mockito.when(updateNetworkACLItemCmdMock.getNumber()).thenReturn(1); + Mockito.when(updateNetworkACLItemCmdMock.getSourcePortStart()).thenReturn(23); + Mockito.when(updateNetworkACLItemCmdMock.getSourcePortEnd()).thenReturn(24); + + ArrayList cidrsList = new ArrayList<>(); + cidrsList.add("192.168.6.0/24"); + Mockito.when(updateNetworkACLItemCmdMock.getSourceCidrList()).thenReturn(cidrsList); + + Mockito.when(updateNetworkACLItemCmdMock.getProtocol()).thenReturn("all"); + Mockito.when(updateNetworkACLItemCmdMock.getIcmpCode()).thenReturn(5); + Mockito.when(updateNetworkACLItemCmdMock.getIcmpType()).thenReturn(6); + Mockito.when(updateNetworkACLItemCmdMock.getAction()).thenReturn("deny"); + Mockito.when(updateNetworkACLItemCmdMock.getTrafficType()).thenReturn(TrafficType.Egress); + Mockito.when(updateNetworkACLItemCmdMock.getCustomId()).thenReturn("customUuid"); + Mockito.when(updateNetworkACLItemCmdMock.getReason()).thenReturn("reason"); + + Mockito.when(updateNetworkACLItemCmdMock.isDisplay()).thenReturn(true); + Mockito.when(networkAclItemVoMock.isDisplay()).thenReturn(false); + + networkAclServiceImpl.transferDataToNetworkAclRulePojo(updateNetworkACLItemCmdMock, networkAclItemVoMock, networkAclMock); + + Mockito.verify(networkAclItemVoMock).setNumber(1); + Mockito.verify(networkAclItemVoMock).setSourcePortStart(23); + Mockito.verify(networkAclItemVoMock).setSourcePortEnd(24); + Mockito.verify(networkAclItemVoMock).setSourceCidrList(cidrsList); + Mockito.verify(networkAclItemVoMock).setProtocol("all"); + Mockito.verify(networkAclItemVoMock).setIcmpCode(5); + Mockito.verify(networkAclItemVoMock).setIcmpType(6); + Mockito.verify(networkAclItemVoMock).setAction(Action.Deny); + Mockito.verify(networkAclItemVoMock).setTrafficType(TrafficType.Egress); + Mockito.verify(networkAclItemVoMock).setUuid("customUuid"); + Mockito.verify(networkAclItemVoMock).setReason("reason"); + Mockito.verify(networkAclItemVoMock).setDisplay(true); + Mockito.verify(networkAclServiceImpl).validateAndCreateNetworkAclRuleAction("deny"); + } + +} diff --git a/server/src/test/java/com/cloud/vpc/NetworkACLManagerTest.java b/server/src/test/java/com/cloud/vpc/NetworkACLManagerTest.java index 9daf551e9ec8..ca1ddc62b528 100644 --- a/server/src/test/java/com/cloud/vpc/NetworkACLManagerTest.java +++ b/server/src/test/java/com/cloud/vpc/NetworkACLManagerTest.java @@ -22,8 +22,6 @@ import javax.inject.Inject; -import junit.framework.TestCase; - import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.framework.messagebus.MessageBus; @@ -74,6 +72,8 @@ import com.cloud.utils.component.ComponentContext; import com.cloud.utils.db.EntityManager; +import junit.framework.TestCase; + @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(loader = AnnotationConfigContextLoader.class) public class NetworkACLManagerTest extends TestCase { @@ -135,8 +135,7 @@ public void testCreateACL() throws Exception { public void testApplyACL() throws Exception { final NetworkVO network = Mockito.mock(NetworkVO.class); Mockito.when(_networkDao.findById(Matchers.anyLong())).thenReturn(network); - Mockito.when(_networkModel.isProviderSupportServiceInNetwork(Matchers.anyLong(), Matchers.any(Network.Service.class), Matchers.any(Network.Provider.class))) - .thenReturn(true); + Mockito.when(_networkModel.isProviderSupportServiceInNetwork(Matchers.anyLong(), Matchers.any(Network.Service.class), Matchers.any(Network.Provider.class))).thenReturn(true); Mockito.when(_networkAclElements.get(0).applyNetworkACLs(Matchers.any(Network.class), Matchers.anyList())).thenReturn(true); assertTrue(_aclMgr.applyACLToNetwork(1L)); } @@ -162,14 +161,10 @@ public void driveTestApplyNetworkACL(final boolean result, final boolean applyNe final NetworkVO network = Mockito.mock(NetworkVO.class); final List networks = new ArrayList(); networks.add(network); - Mockito.when(_networkDao.listByAclId(Matchers.anyLong())) - .thenReturn(networks); + Mockito.when(_networkDao.listByAclId(Matchers.anyLong())).thenReturn(networks); Mockito.when(_networkDao.findById(Matchers.anyLong())).thenReturn(network); - Mockito.when(_networkModel.isProviderSupportServiceInNetwork(Matchers.anyLong(), - Matchers.any(Network.Service.class), Matchers.any(Network.Provider.class))) - .thenReturn(true); - Mockito.when(_networkAclElements.get(0).applyNetworkACLs(Matchers.any(Network.class), - Matchers.anyList())).thenReturn(applyNetworkACLs); + Mockito.when(_networkModel.isProviderSupportServiceInNetwork(Matchers.anyLong(), Matchers.any(Network.Service.class), Matchers.any(Network.Provider.class))).thenReturn(true); + Mockito.when(_networkAclElements.get(0).applyNetworkACLs(Matchers.any(Network.class), Matchers.anyList())).thenReturn(applyNetworkACLs); // Make sure it applies ACL to private gateway final List vpcGateways = new ArrayList(); @@ -177,8 +172,7 @@ public void driveTestApplyNetworkACL(final boolean result, final boolean applyNe final PrivateGateway privateGateway = Mockito.mock(PrivateGateway.class); Mockito.when(_vpcSvc.getVpcPrivateGateway(Mockito.anyLong())).thenReturn(privateGateway); vpcGateways.add(vpcGateway); - Mockito.when(_vpcGatewayDao.listByAclIdAndType(aclId, VpcGateway.Type.Private)) - .thenReturn(vpcGateways); + Mockito.when(_vpcGatewayDao.listByAclIdAndType(aclId, VpcGateway.Type.Private)).thenReturn(vpcGateways); // Create 4 rules to test all 4 scenarios: only revoke should // be deleted, only add should update @@ -203,8 +197,7 @@ public void driveTestApplyNetworkACL(final boolean result, final boolean applyNe Mockito.when(rule2Add.getId()).thenReturn(addId); Mockito.when(_networkACLItemDao.findById(addId)).thenReturn(rule2Add); - Mockito.when(_networkACLItemDao.listByACL(aclId)) - .thenReturn(rules); + Mockito.when(_networkACLItemDao.listByACL(aclId)).thenReturn(rules); // Mock methods to avoid Mockito.doReturn(applyACLToPrivateGw).when(aclManager).applyACLToPrivateGw(privateGateway); @@ -218,20 +211,12 @@ public void driveTestApplyNetworkACL(final boolean result, final boolean applyNe Mockito.verify(_networkACLItemDao, Mockito.times(timesProcessingDone)).update(addId, rule2Add); } - @Test public void testRevokeACLItem() throws Exception { Mockito.when(_networkACLItemDao.findById(Matchers.anyLong())).thenReturn(aclItem); assertTrue(_aclMgr.revokeNetworkACLItem(1L)); } - @Test - public void testUpdateACLItem() throws Exception { - Mockito.when(_networkACLItemDao.findById(Matchers.anyLong())).thenReturn(aclItem); - Mockito.when(_networkACLItemDao.update(Matchers.anyLong(), Matchers.any(NetworkACLItemVO.class))).thenReturn(true); - assertNotNull(_aclMgr.updateNetworkACLItem(1L, "UDP", null, NetworkACLItem.TrafficType.Ingress, "Deny", 10, 22, 32, null, null, null, true)); - } - @Test public void deleteNonEmptyACL() throws Exception { final List aclItems = new ArrayList(); @@ -251,8 +236,8 @@ public void deleteNonEmptyACL() throws Exception { } @Configuration - @ComponentScan(basePackageClasses = {NetworkACLManagerImpl.class}, includeFilters = {@ComponentScan.Filter(value = NetworkACLTestConfiguration.Library.class, - type = FilterType.CUSTOM)}, useDefaultFilters = false) + @ComponentScan(basePackageClasses = {NetworkACLManagerImpl.class}, includeFilters = { + @ComponentScan.Filter(value = NetworkACLTestConfiguration.Library.class, type = FilterType.CUSTOM)}, useDefaultFilters = false) public static class NetworkACLTestConfiguration extends SpringUtils.CloudStackTestConfiguration { @Bean diff --git a/server/src/test/java/com/cloud/vpc/NetworkACLServiceTest.java b/server/src/test/java/com/cloud/vpc/NetworkACLServiceTest.java index 1909a4f500bf..35a94a2914be 100644 --- a/server/src/test/java/com/cloud/vpc/NetworkACLServiceTest.java +++ b/server/src/test/java/com/cloud/vpc/NetworkACLServiceTest.java @@ -20,14 +20,9 @@ import javax.inject.Inject; -import com.cloud.user.User; -import junit.framework.TestCase; - -import org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.test.utils.SpringUtils; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -48,7 +43,6 @@ import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.NetworkModel; import com.cloud.network.dao.NetworkDao; -import com.cloud.network.vpc.NetworkACLItem; import com.cloud.network.vpc.NetworkACLItemDao; import com.cloud.network.vpc.NetworkACLItemVO; import com.cloud.network.vpc.NetworkACLManager; @@ -66,39 +60,31 @@ import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.AccountVO; +import com.cloud.user.User; import com.cloud.user.UserVO; import com.cloud.utils.component.ComponentContext; import com.cloud.utils.db.EntityManager; +import junit.framework.TestCase; + @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(loader = AnnotationConfigContextLoader.class) public class NetworkACLServiceTest extends TestCase { - @Inject - NetworkACLService _aclService; @Inject - AccountManager _accountMgr; - @Inject - VpcManager _vpcMgr; - @Inject - NetworkACLManager _networkAclMgr; + private NetworkACLService _aclService; @Inject - NetworkACLDao _networkACLDao; + private NetworkACLManager _networkAclMgr; @Inject - NetworkACLItemDao _networkACLItemDao; + private NetworkACLDao _networkACLDao; @Inject - EntityManager _entityMgr; + private NetworkACLItemDao _networkACLItemDao; @Inject - VpcDao _vpcDao; - @Inject - VpcService _vpcSrv; + private EntityManager _entityMgr; - private CreateNetworkACLCmd createACLItemCmd; private NetworkACLVO acl; private NetworkACLItemVO aclItem; - private static final Logger s_logger = Logger.getLogger(NetworkACLServiceTest.class); - @Override @Before public void setUp() { @@ -107,43 +93,6 @@ public void setUp() { UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN); CallContext.register(user, account); - - createACLItemCmd = new CreateNetworkACLCmd() { - @Override - public Long getACLId() { - return 3L; - } - - @Override - public Integer getNumber() { - return 1; - } - - @Override - public String getProtocol() { - return "TCP"; - } - }; - - acl = new NetworkACLVO() { - @Override - public Long getVpcId() { - return 1L; - } - - @Override - public long getId() { - return 1L; - } - - }; - - aclItem = new NetworkACLItemVO() { - @Override - public long getAclId() { - return 4L; - } - }; } @Override @@ -152,13 +101,6 @@ public void tearDown() { CallContext.unregister(); } - @Test - public void testCreateACL() throws Exception { - Mockito.when(_entityMgr.findById(Matchers.eq(Vpc.class), Matchers.anyLong())).thenReturn(new VpcVO()); - Mockito.when(_networkAclMgr.createNetworkACL("acl_new", "acl desc", 1L, true)).thenReturn(acl); - assertNotNull(_aclService.createNetworkACL("acl_new", "acl desc", 1L, true)); - } - @Test(expected = InvalidParameterValueException.class) public void testDeleteDefaultACL() throws Exception { Mockito.when(_networkACLDao.findById(Matchers.anyLong())).thenReturn(acl); @@ -166,26 +108,6 @@ public void testDeleteDefaultACL() throws Exception { _aclService.deleteNetworkACL(1L); } - @Test - public void testCreateACLItem() throws Exception { - Mockito.when(_entityMgr.findById(Matchers.eq(Vpc.class), Matchers.anyLong())).thenReturn(new VpcVO()); - Mockito.when(_networkAclMgr.getNetworkACL(Matchers.anyLong())).thenReturn(acl); - Mockito.when( - _networkAclMgr.createNetworkACLItem(Matchers.anyInt(), Matchers.anyInt(), Matchers.anyString(), Matchers.anyList(), Matchers.anyInt(), Matchers.anyInt(), - Matchers.any(NetworkACLItem.TrafficType.class), Matchers.anyLong(), Matchers.anyString(), Matchers.anyInt(), Matchers.anyBoolean())).thenReturn( - new NetworkACLItemVO()); - Mockito.when(_networkACLItemDao.findByAclAndNumber(Matchers.anyLong(), Matchers.anyInt())).thenReturn(null); - assertNotNull(_aclService.createNetworkACLItem(createACLItemCmd)); - } - - @Test(expected = InvalidParameterValueException.class) - public void testCreateACLItemDuplicateNumber() throws Exception { - Mockito.when(_entityMgr.findById(Matchers.eq(Vpc.class), Matchers.anyLong())).thenReturn(new VpcVO()); - Mockito.when(_networkAclMgr.getNetworkACL(Matchers.anyLong())).thenReturn(acl); - Mockito.when(_networkACLItemDao.findByAclAndNumber(Matchers.anyLong(), Matchers.anyInt())).thenReturn(new NetworkACLItemVO()); - _aclService.createNetworkACLItem(createACLItemCmd); - } - @Test public void testDeleteACLItem() throws Exception { Mockito.when(_networkACLItemDao.findById(Matchers.anyLong())).thenReturn(aclItem); @@ -196,8 +118,8 @@ public void testDeleteACLItem() throws Exception { } @Configuration - @ComponentScan(basePackageClasses = {NetworkACLServiceImpl.class}, includeFilters = {@ComponentScan.Filter(value = NetworkACLTestConfiguration.Library.class, - type = FilterType.CUSTOM)}, useDefaultFilters = false) + @ComponentScan(basePackageClasses = {NetworkACLServiceImpl.class}, includeFilters = { + @ComponentScan.Filter(value = NetworkACLTestConfiguration.Library.class, type = FilterType.CUSTOM)}, useDefaultFilters = false) public static class NetworkACLTestConfiguration extends SpringUtils.CloudStackTestConfiguration { @Bean diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index 9b4e76380015..2acabdbfc791 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -8453,11 +8453,32 @@ div#details-tab-aclRules div.multi-edit table tr td.protocolnumber { max-width: 60px !important; } +div#details-tab-aclRules div.multi-edit table tr th.traffictype, +div#details-tab-aclRules div.multi-edit table tr td.traffictype { + width: 60px !important; + min-width: 60px !important; + max-width: 60px !important; +} + +div#details-tab-aclRules div.multi-edit table tr th.reason, +div#details-tab-aclRules div.multi-edit table tr td.reason { + width: 60px !important; + min-width: 60px !important; + max-width: 60px !important; +} + +div#details-tab-aclRules div.multi-edit table tr th.icmptype, div#details-tab-aclRules div.multi-edit table tr td.icmptype, +div#details-tab-aclRules div.multi-edit table tr th.icmpcode, div#details-tab-aclRules div.multi-edit table tr td.icmpcode { + width: 60px !important; + min-width: 60px !important; + max-width: 60px !important; +} + div#details-tab-aclRules div.multi-edit table tr th.startport, div#details-tab-aclRules div.multi-edit table tr td.startport, div#details-tab-aclRules div.multi-edit table tr th.endport, div#details-tab-aclRules div.multi-edit table tr td.endport { - width: 70px !important; - min-width: 70px !important; - max-width: 70px !important; + width: 60px !important; + min-width: 60px !important; + max-width: 60px !important; } div#details-tab-aclRules td.cidrlist span { diff --git a/ui/l10n/ar.js b/ui/l10n/ar.js index 9c10afcea007..f6927437017f 100644 --- a/ui/l10n/ar.js +++ b/ui/l10n/ar.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "ACL List Rules", "label.acl.name": "ACL Name", "label.acl.replaced": "ACL replaced", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "Acquire New IP", "label.acquire.new.secondary.ip": "Acquire new secondary IP", "label.action": "Action", diff --git a/ui/l10n/ca.js b/ui/l10n/ca.js index fe85a1938be0..276b3e51bfc2 100644 --- a/ui/l10n/ca.js +++ b/ui/l10n/ca.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "ACL List Rules", "label.acl.name": "ACL Name", "label.acl.replaced": "ACL replaced", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "Acquire New IP", "label.acquire.new.secondary.ip": "Acquire new secondary IP", "label.action": "Action", diff --git a/ui/l10n/de_DE.js b/ui/l10n/de_DE.js index 62e00560a695..76374f63459f 100644 --- a/ui/l10n/de_DE.js +++ b/ui/l10n/de_DE.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "ACL-Listenregeln", "label.acl.name": "ACL-Name", "label.acl.replaced": "ACL ersetzt", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "Neue IP erwerben", "label.acquire.new.secondary.ip": "Neue sekundäre IP erwerben", "label.action": "Aktion", diff --git a/ui/l10n/en.js b/ui/l10n/en.js index ef7c91e290a7..6d994303f1af 100644 --- a/ui/l10n/en.js +++ b/ui/l10n/en.js @@ -105,6 +105,8 @@ var dictionary = { "label.acl.list.rules":"ACL List Rules", "label.acl.name":"ACL Name", "label.acl.replaced":"ACL replaced", +"label.acl.reason": "Reason", +"label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip":"Acquire New IP", "label.acquire.new.secondary.ip":"Acquire new secondary IP", "label.action":"Action", diff --git a/ui/l10n/es.js b/ui/l10n/es.js index 5a0982bee27e..37f8425ac057 100644 --- a/ui/l10n/es.js +++ b/ui/l10n/es.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "Lista de Reglas ACL", "label.acl.name": "Nombre de ACL", "label.acl.replaced": "ACL reemplazada", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "Adquirir nueva IP", "label.acquire.new.secondary.ip": "Adquirir nueva IP secundaria", "label.action": "Acción", diff --git a/ui/l10n/fr_FR.js b/ui/l10n/fr_FR.js index 0f81e9ccbee5..2d03b64dcaab 100644 --- a/ui/l10n/fr_FR.js +++ b/ui/l10n/fr_FR.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "Liste règles ACL", "label.acl.name": "Nom ACL", "label.acl.replaced": "ACL remplacée", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "Acquérir nouvelle adr. IP", "label.acquire.new.secondary.ip": "Acquérir nouvelle IP secondaire", "label.action": "Action", diff --git a/ui/l10n/hu.js b/ui/l10n/hu.js index 105b3ce845b7..f4d20e5be1c7 100644 --- a/ui/l10n/hu.js +++ b/ui/l10n/hu.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "ACL List Rules", "label.acl.name": "ACL név", "label.acl.replaced": "ACL lehelyettesítve", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "Új IP cím beszerzése", "label.acquire.new.secondary.ip": "Új másodlagos IP cím beszerzése", "label.action": "Művelet", diff --git a/ui/l10n/it_IT.js b/ui/l10n/it_IT.js index 0e7e17a4db9b..bcc3a0fa661a 100644 --- a/ui/l10n/it_IT.js +++ b/ui/l10n/it_IT.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "ACL List Rules", "label.acl.name": "ACL Name", "label.acl.replaced": "ACL replaced", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "Acquisizione nuovo indirizzo IP", "label.acquire.new.secondary.ip": "Acquisizione nuovo IP secondario", "label.action": "Action", diff --git a/ui/l10n/ja_JP.js b/ui/l10n/ja_JP.js index c0e8abdcc0a9..efa937a48561 100644 --- a/ui/l10n/ja_JP.js +++ b/ui/l10n/ja_JP.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "ACL ルールのリスト", "label.acl.name": "ACL 名", "label.acl.replaced": "ACL が置き換えられました", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "新しい IP アドレスの取得", "label.acquire.new.secondary.ip": "セカンダリ IP アドレスの取得", "label.action": "操作", diff --git a/ui/l10n/ko_KR.js b/ui/l10n/ko_KR.js index d8ffb72ef24f..de2d6ba9c983 100644 --- a/ui/l10n/ko_KR.js +++ b/ui/l10n/ko_KR.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "ACL List Rules", "label.acl.name": "ACL Name", "label.acl.replaced": "ACL replaced", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "새로운 IP 주소 취득", "label.acquire.new.secondary.ip": "새로운 두번째 IP 주소 취득", "label.action": "Action", diff --git a/ui/l10n/nb_NO.js b/ui/l10n/nb_NO.js index 0725037de7e0..57fda63e7e1c 100644 --- a/ui/l10n/nb_NO.js +++ b/ui/l10n/nb_NO.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "ACL Liste Regler", "label.acl.name": "ACL Navn", "label.acl.replaced": "ACL erstattet", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "Tilegne ny IP", "label.acquire.new.secondary.ip": "Tilegne ny sekundær IP", "label.action": "Handling", diff --git a/ui/l10n/nl_NL.js b/ui/l10n/nl_NL.js index 9bba48c3bf06..4bf253dd0743 100644 --- a/ui/l10n/nl_NL.js +++ b/ui/l10n/nl_NL.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "ACL lijst regels", "label.acl.name": "ACL naam", "label.acl.replaced": "ACL vervangen", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "Bemachtig nieuw IP", "label.acquire.new.secondary.ip": "Verkrijg nieuw secundair IP", "label.action": "Actie", diff --git a/ui/l10n/pl.js b/ui/l10n/pl.js index b829dc3a9b56..7b7a89b316a9 100644 --- a/ui/l10n/pl.js +++ b/ui/l10n/pl.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "ACL List Rules", "label.acl.name": "ACL Name", "label.acl.replaced": "ACL replaced", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "Acquire New IP", "label.acquire.new.secondary.ip": "Acquire new secondary IP", "label.action": "Action", diff --git a/ui/l10n/pt_BR.js b/ui/l10n/pt_BR.js index 590dd794b767..45de2067fa7a 100644 --- a/ui/l10n/pt_BR.js +++ b/ui/l10n/pt_BR.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "Lista de regas de ACL", "label.acl.name": "Nome da ACL", "label.acl.replaced": "ACL trocado", + "label.acl.reason": "Motivo", + "label.acl.reason.description": "Motivo para se utilizar a regra.", "label.acquire.new.ip": "Adquirir novo IP", "label.acquire.new.secondary.ip": "Adquira um novo IP secundário", "label.action": "Ação", diff --git a/ui/l10n/ru_RU.js b/ui/l10n/ru_RU.js index d676df59d4ae..0321f710ceeb 100644 --- a/ui/l10n/ru_RU.js +++ b/ui/l10n/ru_RU.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "ACL List Rules", "label.acl.name": "ACL Name", "label.acl.replaced": "ACL replaced", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "Получить новый IP", "label.acquire.new.secondary.ip": "Запросить дополнительный IP-адрес", "label.action": "Действия", diff --git a/ui/l10n/zh_CN.js b/ui/l10n/zh_CN.js index 4d0762d9d961..1d617d6f630e 100644 --- a/ui/l10n/zh_CN.js +++ b/ui/l10n/zh_CN.js @@ -104,6 +104,8 @@ var dictionary = { "label.acl.list.rules": "ACL列表策略", "label.acl.name": "ACL 名称", "label.acl.replaced": "ACL 已替换", + "label.acl.reason": "Reason", + "label.acl.reason.description": "Enter the reason behind an ACL rule.", "label.acquire.new.ip": "获取新 IP", "label.acquire.new.secondary.ip": "获取新二级 IP", "label.action": "操作", diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index a77c4d7b585d..7a2a30205d0b 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -429,7 +429,14 @@ }] }); } - } + }, + 'reason': { + edit: true, + label: 'label.acl.reason', + desc: 'label.acl.reason.description', + isEditable: true, + isTextarea: true + } }; var aclRuleFieldsForMultiEdit = { @@ -594,7 +601,8 @@ number: args.data.number, protocol: args.data.protocol, traffictype: args.data.traffictype, - action: args.data.action + action: args.data.action, + reason: args.data.reason }; if (data.protocol === 'tcp' || data.protocol === 'udp') { @@ -620,6 +628,7 @@ $.ajax({ url: createURL('updateNetworkACLItem'), data: data, + type: "POST", success: function(json) { args.response.success({ _custom: { From 521e71fbeb35f591df5752271c3714c8e556864a Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Tue, 13 Mar 2018 15:42:42 +0100 Subject: [PATCH 024/145] createNetworkACL: number has the wrong doc (#2484) Signed-off-by: Yoan Blanc --- .../api/command/user/network/CreateNetworkACLCmd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java index 00c81a7b05b7..2b2a3c6866a3 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java @@ -77,7 +77,7 @@ public class CreateNetworkACLCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "the traffic type for the ACL," + "can be ingress or egress, defaulted to ingress if not specified") private String trafficType; - @Parameter(name = ApiConstants.NUMBER, type = CommandType.INTEGER, description = "The network of the VM the ACL will be created for") + @Parameter(name = ApiConstants.NUMBER, type = CommandType.INTEGER, description = "The number of the ACL item, its ordering") private Integer number; @Parameter(name = ApiConstants.ACTION, type = CommandType.STRING, description = "scl entry action, allow or deny") From c3488a51db4bce4ec32c09e6fef78193d360cf3f Mon Sep 17 00:00:00 2001 From: Henko Date: Tue, 13 Mar 2018 18:27:51 +0200 Subject: [PATCH 025/145] CLOUDSTACK-10147 Disabled Xenserver Cluster can still deploy VM's. Added code to skip disabled clusters when selecting a host (#2442) --- .../java/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java index cc244ce41ba8..5d8ad0a7051e 100644 --- a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java +++ b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java @@ -1040,6 +1040,11 @@ private DeployDestination checkClustersforDestination(List clusterList, Vi for (Long clusterId : clusterList) { ClusterVO clusterVO = _clusterDao.findById(clusterId); + if (clusterVO.getAllocationState() == Grouping.AllocationState.Disabled) { + s_logger.debug("Cannot deploy in disabled cluster " + clusterId + ", skipping this cluster"); + avoid.addCluster(clusterVO.getId()); + } + if (clusterVO.getHypervisorType() != vmProfile.getHypervisorType()) { s_logger.debug("Cluster: " + clusterId + " has HyperVisorType that does not match the VM, skipping this cluster"); avoid.addCluster(clusterVO.getId()); From 972b8b71d7fb60a64e8a05e7555f9f92ede7ff40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Wed, 14 Mar 2018 15:27:43 -0300 Subject: [PATCH 026/145] CLOUDSTACK-8855 Improve Error Message for Host Alert State and reconnect host API. (#2387) * CLOUDSTACK-8855 Improve Error Message for Host Alert State * [CLOUDSTACK-9846] create column to save the content of alert messages Remove declaration of throws CloudRuntimeException I also removed some unused variables and comments left behind This closes #837 * Isolate a problematic test "smoke/test_certauthority_root" --- .travis.yml | 3 +- api/src/main/java/com/cloud/alert/Alert.java | 2 + .../com/cloud/resource/ResourceService.java | 21 +-- .../command/admin/host/ReconnectHostCmd.java | 28 +-- .../java/com/cloud/agent/AgentManager.java | 4 +- .../cloud/agent/manager/AgentManagerImpl.java | 173 ++++++++---------- .../manager/ClusteredAgentManagerImpl.java | 110 +++++------ .../main/java/com/cloud/alert/AlertVO.java | 12 ++ .../java/com/cloud/host/dao/HostDaoImpl.java | 1 - .../db/schema-41000to41100-cleanup.sql | 2 +- .../META-INF/db/schema-41000to41100.sql | 2 +- .../META-INF/db/schema-41100to41200.sql | 5 +- .../test/DirectAgentManagerSimpleImpl.java | 6 +- .../network/element/NetscalerElement.java | 116 ++++++------ requirements.txt | 3 +- .../com/cloud/alert/AlertManagerImpl.java | 47 +++-- .../cloud/resource/ResourceManagerImpl.java | 37 +--- .../apache/cloudstack/ca/CAManagerImpl.java | 51 +++--- .../cloudstack/ca/CAManagerImplTest.java | 2 +- 19 files changed, 286 insertions(+), 339 deletions(-) diff --git a/.travis.yml b/.travis.yml index be0bfb122105..f4b52bae9457 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,10 +33,11 @@ env: - PATH=$HOME/.local/bin:$PATH matrix: # Keep the TESTS sorted by name and grouped by type + - TESTS="smoke/test_certauthority_root" + - TESTS="smoke/test_accounts smoke/test_affinity_groups smoke/test_affinity_groups_projects - smoke/test_certauthority_root smoke/test_deploy_vgpu_enabled_vm smoke/test_deploy_vm_iso smoke/test_deploy_vm_root_resize diff --git a/api/src/main/java/com/cloud/alert/Alert.java b/api/src/main/java/com/cloud/alert/Alert.java index f77442068d60..d85dca5b7b0d 100644 --- a/api/src/main/java/com/cloud/alert/Alert.java +++ b/api/src/main/java/com/cloud/alert/Alert.java @@ -41,4 +41,6 @@ public interface Alert extends Identity, InternalIdentity { boolean getArchived(); String getName(); + + String getContent(); } diff --git a/api/src/main/java/com/cloud/resource/ResourceService.java b/api/src/main/java/com/cloud/resource/ResourceService.java index 854b53591d63..70823084d84c 100644 --- a/api/src/main/java/com/cloud/resource/ResourceService.java +++ b/api/src/main/java/com/cloud/resource/ResourceService.java @@ -18,7 +18,6 @@ import java.util.List; -import com.cloud.dc.DataCenter; import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd; import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd; import org.apache.cloudstack.api.command.admin.host.AddHostCmd; @@ -29,6 +28,8 @@ import org.apache.cloudstack.api.command.admin.host.UpdateHostCmd; import org.apache.cloudstack.api.command.admin.host.UpdateHostPasswordCmd; +import com.cloud.dc.DataCenter; +import com.cloud.exception.AgentUnavailableException; import com.cloud.exception.DiscoveryException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceInUseException; @@ -41,25 +42,17 @@ public interface ResourceService { /** * Updates a host * - * @param cmd - * - the command specifying hostId - * @return hostObject - * @throws NoTransitionException + * @param cmd - the command specifying hostId */ Host updateHost(UpdateHostCmd cmd) throws NoTransitionException; Host cancelMaintenance(CancelMaintenanceCmd cmd); - Host reconnectHost(ReconnectHostCmd cmd); + Host reconnectHost(ReconnectHostCmd cmd) throws AgentUnavailableException; /** * We will automatically create an Apache CloudStack cluster to attach to the external cluster and return a hyper host to perform * host related operation within the cluster - * - * @param cmd - * @return - * @throws IllegalArgumentException - * @throws DiscoveryException */ List discoverCluster(AddClusterCmd cmd) throws IllegalArgumentException, DiscoveryException, ResourceInUseException; @@ -75,12 +68,6 @@ public interface ResourceService { /** * Deletes a host - * - * @param hostId - * TODO - * @param isForced - * TODO - * * @param true if deleted, false otherwise */ boolean deleteHost(long hostId, boolean isForced, boolean isForceDeleteStorage); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java index 5e1563726813..34e439f3a378 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java @@ -16,8 +16,6 @@ // under the License. package org.apache.cloudstack.api.command.admin.host; -import org.apache.log4j.Logger; - import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,13 +25,16 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.context.CallContext; +import org.apache.log4j.Logger; import com.cloud.event.EventTypes; +import com.cloud.exception.AgentUnavailableException; +import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; import com.cloud.user.Account; +import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = "reconnectHost", description = "Reconnects a host.", responseObject = HostResponse.class, - requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) +@APICommand(name = "reconnectHost", description = "Reconnects a host.", responseObject = HostResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ReconnectHostCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ReconnectHostCmd.class.getName()); @@ -101,16 +102,15 @@ public Long getInstanceId() { public void execute() { try { Host result = _resourceService.reconnectHost(this); - if (result != null) { - HostResponse response = _responseGenerator.createHostResponse(result); - response.setResponseName(getCommandName()); - this.setResponseObject(response); - } else { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to reconnect host"); - } - } catch (Exception ex) { - s_logger.warn("Exception: ", ex); - throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage()); + HostResponse response = _responseGenerator.createHostResponse(result); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } catch (InvalidParameterValueException e) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, e.getMessage()); + } catch (CloudRuntimeException e) { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); + } catch (AgentUnavailableException e) { + throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, e.getMessage()); } } } diff --git a/engine/components-api/src/main/java/com/cloud/agent/AgentManager.java b/engine/components-api/src/main/java/com/cloud/agent/AgentManager.java index 933c3eaef99c..c51970c85f76 100644 --- a/engine/components-api/src/main/java/com/cloud/agent/AgentManager.java +++ b/engine/components-api/src/main/java/com/cloud/agent/AgentManager.java @@ -36,7 +36,7 @@ */ public interface AgentManager { static final ConfigKey Wait = new ConfigKey("Advanced", Integer.class, "wait", "1800", "Time in seconds to wait for control commands to return", - true); + true); public enum TapAgentsAction { Add, Del, Contains, @@ -143,7 +143,7 @@ public enum TapAgentsAction { public void pullAgentOutMaintenance(long hostId); - boolean reconnect(long hostId); + void reconnect(long hostId) throws AgentUnavailableException; void rescan(); diff --git a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java index b7357756c4c6..4b80fb1bc118 100644 --- a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java @@ -38,7 +38,6 @@ import javax.naming.ConfigurationException; import org.apache.cloudstack.ca.CAManager; -import com.cloud.configuration.ManagementServiceConfiguration; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.Configurable; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; @@ -75,6 +74,7 @@ import com.cloud.agent.transport.Request; import com.cloud.agent.transport.Response; import com.cloud.alert.AlertManager; +import com.cloud.configuration.ManagementServiceConfiguration; import com.cloud.dc.ClusterVO; import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; @@ -122,7 +122,6 @@ **/ public class AgentManagerImpl extends ManagerBase implements AgentManager, HandlerFactory, Configurable { protected static final Logger s_logger = Logger.getLogger(AgentManagerImpl.class); - protected static final Logger status_logger = Logger.getLogger(Status.class); /** * _agents is a ConcurrentHashMap, but it is used from within a synchronized block. This will be reported by findbugs as JLM_JSR166_UTILCONCURRENT_MONITORENTER. Maybe a @@ -133,7 +132,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl protected List> _cmdMonitors = new ArrayList>(17); protected List> _creationMonitors = new ArrayList>(17); protected List _loadingAgents = new ArrayList(); - protected int _monitorId = 0; + private int _monitorId = 0; private final Lock _agentStatusLock = new ReentrantLock(); @Inject @@ -180,28 +179,22 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl @Inject ResourceManager _resourceMgr; - @Inject ManagementServiceConfiguration mgmtServiceConf; protected final ConfigKey Workers = new ConfigKey("Advanced", Integer.class, "workers", "5", - "Number of worker threads handling remote agent connections.", false); + "Number of worker threads handling remote agent connections.", false); protected final ConfigKey Port = new ConfigKey("Advanced", Integer.class, "port", "8250", "Port to listen on for remote agent connections.", false); protected final ConfigKey AlertWait = new ConfigKey("Advanced", Integer.class, "alert.wait", "1800", - "Seconds to wait before alerting on a disconnected agent", true); + "Seconds to wait before alerting on a disconnected agent", true); protected final ConfigKey DirectAgentLoadSize = new ConfigKey("Advanced", Integer.class, "direct.agent.load.size", "16", - "The number of direct agents to load each time", false); + "The number of direct agents to load each time", false); protected final ConfigKey DirectAgentPoolSize = new ConfigKey("Advanced", Integer.class, "direct.agent.pool.size", "500", - "Default size for DirectAgentPool", false); + "Default size for DirectAgentPool", false); protected final ConfigKey DirectAgentThreadCap = new ConfigKey("Advanced", Float.class, "direct.agent.thread.cap", "1", - "Percentage (as a value between 0 and 1) of direct.agent.pool.size to be used as upper thread cap for a single direct agent to process requests", false); - protected final ConfigKey CheckTxnBeforeSending = new ConfigKey( - "Developer", - Boolean.class, - "check.txn.before.sending.agent.commands", - "false", - "This parameter allows developers to enable a check to see if a transaction wraps commands that are sent to the resource. This is not to be enabled on production systems.", - true); + "Percentage (as a value between 0 and 1) of direct.agent.pool.size to be used as upper thread cap for a single direct agent to process requests", false); + protected final ConfigKey CheckTxnBeforeSending = new ConfigKey("Developer", Boolean.class, "check.txn.before.sending.agent.commands", "false", + "This parameter allows developers to enable a check to see if a transaction wraps commands that are sent to the resource. This is not to be enabled on production systems.", true); @Override public boolean configure(final String name, final Map params) throws ConfigurationException { @@ -241,7 +234,6 @@ public boolean configure(final String name, final Map params) th return true; } - @Override public Task create(final Task.Type type, final Link link, final byte[] data) { return new AgentHandler(type, link, data); @@ -436,8 +428,7 @@ public Answer[] send(final Long hostId, final Commands commands, int timeout) th if (CheckTxnBeforeSending.value()) { if (!noDbTxn()) { throw new CloudRuntimeException("We do not allow transactions to be wrapped around commands sent to be executed on remote agents. " - + "We cannot predict how long it takes a command to complete. " - + "The transaction may be rolled back because the connection took too long."); + + "We cannot predict how long it takes a command to complete. " + "The transaction may be rolled back because the connection took too long."); } } else { assert noDbTxn() : "I know, I know. Why are we so strict as to not allow txn across an agent call? ... Why are we so cruel ... Why are we such a dictator .... Too bad... Sorry...but NO AGENT COMMANDS WRAPPED WITHIN DB TRANSACTIONS!"; @@ -564,15 +555,13 @@ protected AgentAttache notifyMonitorsOfConnection(final AgentAttache attache, fi monitor.second().processConnect(host, cmd[i], forRebalance); } catch (final Exception e) { if (e instanceof ConnectionException) { - final ConnectionException ce = (ConnectionException) e; + final ConnectionException ce = (ConnectionException)e; if (ce.isSetupError()) { - s_logger.warn("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + - " due to " + e.getMessage()); + s_logger.warn("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + " due to " + e.getMessage()); handleDisconnectWithoutInvestigation(attache, Event.AgentDisconnected, true, true); throw ce; } else { - s_logger.info("Monitor " + monitor.second().getClass().getSimpleName() + " says not to continue the connect process for " + hostId + - " due to " + e.getMessage()); + s_logger.info("Monitor " + monitor.second().getClass().getSimpleName() + " says not to continue the connect process for " + hostId + " due to " + e.getMessage()); handleDisconnectWithoutInvestigation(attache, Event.ShutdownRequested, true, true); return attache; } @@ -580,8 +569,7 @@ protected AgentAttache notifyMonitorsOfConnection(final AgentAttache attache, fi handleDisconnectWithoutInvestigation(attache, Event.ShutdownRequested, true, true); throw new CloudRuntimeException("Unable to connect " + attache.getId(), e); } else { - s_logger.error("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + - " due to " + e.getMessage(), e); + s_logger.error("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + " due to " + e.getMessage(), e); handleDisconnectWithoutInvestigation(attache, Event.AgentDisconnected, true, true); throw new CloudRuntimeException("Unable to connect " + attache.getId(), e); } @@ -634,7 +622,7 @@ private ServerResource loadResourcesWithoutHypervisor(final HostVO host) { try { final Class clazz = Class.forName(resourceName); final Constructor constructor = clazz.getConstructor(); - resource = (ServerResource) constructor.newInstance(); + resource = (ServerResource)constructor.newInstance(); } catch (final ClassNotFoundException e) { s_logger.warn("Unable to find class " + host.getResource(), e); } catch (final InstantiationException e) { @@ -888,7 +876,7 @@ protected boolean handleDisconnectWithInvestigation(final AgentAttache attache, final String hostDesc = "name: " + host.getName() + " (id:" + host.getId() + "), availability zone: " + dcVO.getName() + ", pod: " + podVO.getName(); if (host.getType() != Host.Type.SecondaryStorage && host.getType() != Host.Type.ConsoleProxy) { _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "Host disconnected, " + hostDesc, - "If the agent for host [" + hostDesc + "] is not restarted within " + AlertWait + " seconds, host will go to Alert state"); + "If the agent for host [" + hostDesc + "] is not restarted within " + AlertWait + " seconds, host will go to Alert state"); } event = Status.Event.AgentDisconnected; } @@ -899,7 +887,7 @@ protected boolean handleDisconnectWithInvestigation(final AgentAttache attache, final String podName = podVO != null ? podVO.getName() : "NO POD"; final String hostDesc = "name: " + host.getName() + " (id:" + host.getId() + "), availability zone: " + dcVO.getName() + ", pod: " + podName; _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "Host in ALERT state, " + hostDesc, - "In availability zone " + host.getDataCenterId() + ", host is in alert state: " + host.getId() + "-" + host.getName()); + "In availability zone " + host.getDataCenterId() + ", host is in alert state: " + host.getId() + "-" + host.getName()); } } else { s_logger.debug("The next status of agent " + host.getId() + " is not Alert, no need to investigate what happened"); @@ -987,33 +975,30 @@ public Answer[] send(final Long hostId, final Commands cmds) throws AgentUnavail } @Override - public boolean reconnect(final long hostId) { - HostVO host; + public void reconnect(final long hostId) throws AgentUnavailableException { + HostVO host = _hostDao.findById(hostId); + if (host == null) { + throw new CloudRuntimeException("Unable to find host: " + hostId); + } - host = _hostDao.findById(hostId); - if (host == null || host.getRemoved() != null) { - s_logger.warn("Unable to find host " + hostId); - return false; + if (host.getRemoved() != null) { + throw new CloudRuntimeException("Host has already been removed: " + hostId); } if (host.getStatus() == Status.Disconnected) { - s_logger.info("Host is already disconnected, no work to be done"); - return true; + s_logger.debug("Host is already disconnected, no work to be done: " + hostId); + return; } if (host.getStatus() != Status.Up && host.getStatus() != Status.Alert && host.getStatus() != Status.Rebalancing) { - s_logger.info("Unable to disconnect host because it is not in the correct state: host=" + hostId + "; Status=" + host.getStatus()); - return false; + throw new CloudRuntimeException("Unable to disconnect host because it is not in the correct state: host=" + hostId + "; Status=" + host.getStatus()); } - final AgentAttache attache = findAttache(hostId); + AgentAttache attache = findAttache(hostId); if (attache == null) { - s_logger.info("Unable to disconnect host because it is not connected to this server: " + hostId); - return false; + throw new CloudRuntimeException("Unable to disconnect host because it is not connected to this server: " + hostId); } - disconnectWithoutInvestigation(attache, Event.ShutdownRequested); - return true; } @Override @@ -1049,8 +1034,15 @@ public boolean executeUserRequest(final long hostId, final Event event) throws A handleDisconnectWithoutInvestigation(attache, Event.AgentDisconnected, true, true); } return true; - } else if (event == Event.ShutdownRequested) { - return reconnect(hostId); + } + if (event == Event.ShutdownRequested) { + try { + reconnect(hostId); + } catch (CloudRuntimeException e) { + s_logger.debug("Error on shutdown request for hostID: " + hostId, e); + return false; + } + return true; } return false; } @@ -1166,7 +1158,7 @@ protected void runInContext() { _request.logD("Processing the first command "); final StartupCommand[] startups = new StartupCommand[_cmds.length]; for (int i = 0; i < _cmds.length; i++) { - startups[i] = (StartupCommand) _cmds[i]; + startups[i] = (StartupCommand)_cmds[i]; } final AgentAttache attache = handleConnectedAgent(_link, startups, _request); @@ -1184,7 +1176,7 @@ protected void connectAgent(final Link link, final Command[] cmds, final Request for (int i = 0; i < cmds.length; i++) { cmd = cmds[i]; if (cmd instanceof StartupRoutingCommand || cmd instanceof StartupProxyCommand || cmd instanceof StartupSecondaryStorageCommand || - cmd instanceof StartupStorageCommand) { + cmd instanceof StartupStorageCommand) { answers[i] = new StartupAnswer((StartupCommand) cmds[i], 0, mgmtServiceConf.getPingInterval()); break; } @@ -1205,7 +1197,7 @@ public AgentHandler(final Task.Type type, final Link link, final byte[] data) { } protected void processRequest(final Link link, final Request request) { - final AgentAttache attache = (AgentAttache) link.attachment(); + final AgentAttache attache = (AgentAttache)link.attachment(); final Command[] cmds = request.getCommands(); Command cmd = cmds[0]; boolean logD = true; @@ -1256,10 +1248,9 @@ protected void processRequest(final Link link, final Request request) { final StartupStorageCommand startup = (StartupStorageCommand) cmd; answer = new StartupAnswer(startup, attache.getId(), mgmtServiceConf.getPingInterval()); } else if (cmd instanceof ShutdownCommand) { - final ShutdownCommand shutdown = (ShutdownCommand) cmd; + final ShutdownCommand shutdown = (ShutdownCommand)cmd; final String reason = shutdown.getReason(); - s_logger.info("Host " + attache.getId() + " has informed us that it is shutting down with reason " + reason + " and detail " + - shutdown.getDetail()); + s_logger.info("Host " + attache.getId() + " has informed us that it is shutting down with reason " + reason + " and detail " + shutdown.getDetail()); if (reason.equals(ShutdownCommand.Update)) { // disconnectWithoutInvestigation(attache, Event.UpdateNeeded); throw new CloudRuntimeException("Agent update not implemented"); @@ -1268,16 +1259,16 @@ protected void processRequest(final Link link, final Request request) { } return; } else if (cmd instanceof AgentControlCommand) { - answer = handleControlCommand(attache, (AgentControlCommand) cmd); + answer = handleControlCommand(attache, (AgentControlCommand)cmd); } else { - handleCommands(attache, request.getSequence(), new Command[] { cmd }); + handleCommands(attache, request.getSequence(), new Command[] {cmd}); if (cmd instanceof PingCommand) { - final long cmdHostId = ((PingCommand) cmd).getHostId(); + final long cmdHostId = ((PingCommand)cmd).getHostId(); // if the router is sending a ping, verify the // gateway was pingable if (cmd instanceof PingRoutingCommand) { - final boolean gatewayAccessible = ((PingRoutingCommand) cmd).isGatewayAccessible(); + final boolean gatewayAccessible = ((PingRoutingCommand)cmd).isGatewayAccessible(); final HostVO host = _hostDao.findById(Long.valueOf(cmdHostId)); if (host != null) { @@ -1286,22 +1277,18 @@ protected void processRequest(final Link link, final Request request) { // gateway (cannot ping the default route) final DataCenterVO dcVO = _dcDao.findById(host.getDataCenterId()); final HostPodVO podVO = _podDao.findById(host.getPodId()); - final String hostDesc = - "name: " + host.getName() + " (id:" + host.getId() + "), availability zone: " + dcVO.getName() + ", pod: " - + podVO.getName(); + final String hostDesc = "name: " + host.getName() + " (id:" + host.getId() + "), availability zone: " + dcVO.getName() + ", pod: " + podVO.getName(); - _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_ROUTING, host.getDataCenterId(), host.getPodId(), - "Host lost connection to gateway, " + hostDesc, "Host [" + hostDesc + - "] lost connection to gateway (default route) and is possibly having network connection issues."); + _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_ROUTING, host.getDataCenterId(), host.getPodId(), "Host lost connection to gateway, " + hostDesc, + "Host [" + hostDesc + "] lost connection to gateway (default route) and is possibly having network connection issues."); } else { _alertMgr.clearAlert(AlertManager.AlertType.ALERT_TYPE_ROUTING, host.getDataCenterId(), host.getPodId()); } } else { - s_logger.debug("Not processing " + PingRoutingCommand.class.getSimpleName() + " for agent id=" + cmdHostId + - "; can't find the host in the DB"); + s_logger.debug("Not processing " + PingRoutingCommand.class.getSimpleName() + " for agent id=" + cmdHostId + "; can't find the host in the DB"); } } - answer = new PingAnswer((PingCommand) cmd); + answer = new PingAnswer((PingCommand)cmd); } else if (cmd instanceof ReadyAnswer) { final HostVO host = _hostDao.findById(attache.getId()); if (host == null) { @@ -1337,7 +1324,7 @@ protected void processRequest(final Link link, final Request request) { } protected void processResponse(final Link link, final Response response) { - final AgentAttache attache = (AgentAttache) link.attachment(); + final AgentAttache attache = (AgentAttache)link.attachment(); if (attache == null) { s_logger.warn("Unable to process: " + response); } else if (!attache.processAnswers(response.getSequence(), response)) { @@ -1355,7 +1342,7 @@ protected void doTask(final Task task) throws TaskExecutionException { try { final Request event = Request.parse(data); if (event instanceof Response) { - processResponse(task.getLink(), (Response) event); + processResponse(task.getLink(), (Response)event); } else { processRequest(task.getLink(), event); } @@ -1370,7 +1357,7 @@ protected void doTask(final Task task) throws TaskExecutionException { } else if (type == Task.Type.CONNECT) { } else if (type == Task.Type.DISCONNECT) { final Link link = task.getLink(); - final AgentAttache attache = (AgentAttache) link.attachment(); + final AgentAttache attache = (AgentAttache)link.attachment(); if (attache != null) { disconnectWithInvestigation(attache, Event.AgentDisconnected); } else { @@ -1411,23 +1398,21 @@ public boolean tapLoadingAgents(final Long hostId, final TapAgentsAction action) public boolean agentStatusTransitTo(final HostVO host, final Status.Event e, final long msId) { try { _agentStatusLock.lock(); - if (status_logger.isDebugEnabled()) { + if (s_logger.isDebugEnabled()) { final ResourceState state = host.getResourceState(); final StringBuilder msg = new StringBuilder("Transition:"); msg.append("[Resource state = ").append(state); msg.append(", Agent event = ").append(e.toString()); msg.append(", Host id = ").append(host.getId()).append(", name = " + host.getName()).append("]"); - status_logger.debug(msg); + s_logger.debug(msg); } host.setManagementServerId(msId); try { return _statusStateMachine.transitTo(host, e, host.getId(), _hostDao); } catch (final NoTransitionException e1) { - status_logger.debug("Cannot transit agent status with event " + e + " for host " + host.getId() + ", name=" + host.getName() + - ", mangement server id is " + msId); - throw new CloudRuntimeException("Cannot transit agent status with event " + e + " for host " + host.getId() + ", mangement server id is " + msId + "," + - e1.getMessage()); + s_logger.debug("Cannot transit agent status with event " + e + " for host " + host.getId() + ", name=" + host.getName() + ", mangement server id is " + msId); + throw new CloudRuntimeException("Cannot transit agent status with event " + e + " for host " + host.getId() + ", mangement server id is " + msId + "," + e1.getMessage()); } } finally { _agentStatusLock.unlock(); @@ -1491,6 +1476,7 @@ private void disconnectInternal(final long hostId, final Status.Event event, fin } } + @Override public void disconnectWithInvestigation(final long hostId, final Status.Event event) { disconnectInternal(hostId, event, true); } @@ -1501,8 +1487,7 @@ public void disconnectWithoutInvestigation(final long hostId, final Status.Event } @Override - public boolean handleDirectConnectAgent(final Host host, final StartupCommand[] cmds, final ServerResource resource, - final boolean forRebalance, boolean newHost) throws ConnectionException { + public boolean handleDirectConnectAgent(final Host host, final StartupCommand[] cmds, final ServerResource resource, final boolean forRebalance, boolean newHost) throws ConnectionException { AgentAttache attache; attache = createAttacheForDirectConnect(host, resource); @@ -1579,17 +1564,17 @@ protected void runInContext() { /* * Host is in non-operation state, so no investigation and direct put agent to Disconnected */ - status_logger.debug("Ping timeout but agent " + agentId + " is in resource state of " + resourceState + ", so no investigation"); + s_logger.debug("Ping timeout but agent " + agentId + " is in resource state of " + resourceState + ", so no investigation"); disconnectWithoutInvestigation(agentId, Event.ShutdownRequested); } else { final HostVO host = _hostDao.findById(agentId); - if (host != null && (host.getType() == Host.Type.ConsoleProxy || host.getType() == Host.Type.SecondaryStorageVM - || host.getType() == Host.Type.SecondaryStorageCmdExecutor)) { + if (host != null + && (host.getType() == Host.Type.ConsoleProxy || host.getType() == Host.Type.SecondaryStorageVM || host.getType() == Host.Type.SecondaryStorageCmdExecutor)) { s_logger.warn("Disconnect agent for CPVM/SSVM due to physical connection close. host: " + host.getId()); disconnectWithoutInvestigation(agentId, Event.ShutdownRequested); } else { - status_logger.debug("Ping timeout for agent " + agentId + ", do invstigation"); + s_logger.debug("Ping timeout for agent " + agentId + ", do invstigation"); disconnectWithInvestigation(agentId, Event.PingTimeout); } } @@ -1605,8 +1590,8 @@ protected void runInContext() { final DataCenterVO dcVO = _dcDao.findById(host.getDataCenterId()); final HostPodVO podVO = _podDao.findById(host.getPodId()); final String hostDesc = "name: " + host.getName() + " (id:" + host.getId() + "), availability zone: " + dcVO.getName() + ", pod: " + podVO.getName(); - _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "Migration Complete for host " + hostDesc, "Host [" - + hostDesc + "] is ready for maintenance"); + _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "Migration Complete for host " + hostDesc, + "Host [" + hostDesc + "] is ready for maintenance"); } } } catch (final Throwable th) { @@ -1708,7 +1693,7 @@ public String getConfigComponentName() { @Override public ConfigKey[] getConfigKeys() { return new ConfigKey[] { CheckTxnBeforeSending, Workers, Port, Wait, AlertWait, DirectAgentLoadSize, DirectAgentPoolSize, - DirectAgentThreadCap }; + DirectAgentThreadCap }; } protected class SetHostParamsListener implements Listener { @@ -1738,20 +1723,20 @@ public void processHostAdded(long hostId) { @Override public void processConnect(final Host host, final StartupCommand cmd, final boolean forRebalance) { - if (cmd instanceof StartupRoutingCommand) { - if (((StartupRoutingCommand)cmd).getHypervisorType() == HypervisorType.KVM || ((StartupRoutingCommand)cmd).getHypervisorType() == HypervisorType.LXC) { - Map params = new HashMap(); - params.put("router.aggregation.command.each.timeout", _configDao.getValue("router.aggregation.command.each.timeout")); + if (cmd instanceof StartupRoutingCommand) { + if (((StartupRoutingCommand)cmd).getHypervisorType() == HypervisorType.KVM || ((StartupRoutingCommand)cmd).getHypervisorType() == HypervisorType.LXC) { + Map params = new HashMap(); + params.put("router.aggregation.command.each.timeout", _configDao.getValue("router.aggregation.command.each.timeout")); - try { - SetHostParamsCommand cmds = new SetHostParamsCommand(params); - Commands c = new Commands(cmds); - send(host.getId(), c, this); - } catch (AgentUnavailableException e) { - s_logger.debug("Failed to send host params on host: " + host.getId()); + try { + SetHostParamsCommand cmds = new SetHostParamsCommand(params); + Commands c = new Commands(cmds); + send(host.getId(), c, this); + } catch (AgentUnavailableException e) { + s_logger.debug("Failed to send host params on host: " + host.getId()); + } } } - } } diff --git a/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java index 7a9678e6a4ae..38822cba16ba 100644 --- a/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java @@ -46,12 +46,12 @@ import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.ha.dao.HAConfigDao; import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.cloudstack.managed.context.ManagedContextTimerTask; +import org.apache.cloudstack.outofbandmanagement.dao.OutOfBandManagementDao; import org.apache.cloudstack.utils.identity.ManagementServerNode; import org.apache.cloudstack.utils.security.SSLUtils; -import org.apache.cloudstack.ha.dao.HAConfigDao; -import org.apache.cloudstack.outofbandmanagement.dao.OutOfBandManagementDao; import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; @@ -134,14 +134,12 @@ protected ClusteredAgentManagerImpl() { super(); } - protected final ConfigKey EnableLB = new ConfigKey(Boolean.class, "agent.lb.enabled", "Advanced", "false", - "Enable agent load balancing between management server nodes", true); + protected final ConfigKey EnableLB = new ConfigKey(Boolean.class, "agent.lb.enabled", "Advanced", "false", "Enable agent load balancing between management server nodes", true); protected final ConfigKey ConnectedAgentThreshold = new ConfigKey(Double.class, "agent.load.threshold", "Advanced", "0.7", "What percentage of the agents can be held by one management server before load balancing happens", true); - protected final ConfigKey LoadSize = new ConfigKey(Integer.class, "direct.agent.load.size", "Advanced", "16", - "How many agents to connect to in each round", true); - protected final ConfigKey ScanInterval = new ConfigKey(Integer.class, "direct.agent.scan.interval", "Advanced", "90", - "Interval between scans to load agents", false, ConfigKey.Scope.Global, 1000); + protected final ConfigKey LoadSize = new ConfigKey(Integer.class, "direct.agent.load.size", "Advanced", "16", "How many agents to connect to in each round", true); + protected final ConfigKey ScanInterval = new ConfigKey(Integer.class, "direct.agent.scan.interval", "Advanced", "90", "Interval between scans to load agents", false, + ConfigKey.Scope.Global, 1000); @Override public boolean configure(final String name, final Map xmlParams) throws ConfigurationException { @@ -342,8 +340,7 @@ public boolean executeUserRequest(final long hostId, final Event event) throws A final HostTransferMapVO transferVO = _hostTransferDao.findById(hostId); if (transferVO != null) { if (transferVO.getFutureOwner() == _nodeId && transferVO.getState() == HostTransferState.TransferStarted) { - s_logger.debug("Not processing " + Event.AgentDisconnected + " event for the host id=" + hostId + " as the host is being connected to " + - _nodeId); + s_logger.debug("Not processing " + Event.AgentDisconnected + " event for the host id=" + hostId + " as the host is being connected to " + _nodeId); return true; } } @@ -352,8 +349,7 @@ public boolean executeUserRequest(final long hostId, final Event event) throws A // don't process disconnect if the disconnect came for the host via delayed cluster notification, // but the host has already reconnected to the current management server if (!attache.forForward()) { - s_logger.debug("Not processing " + Event.AgentDisconnected + " event for the host id=" + hostId + - " as the host is directly connected to the current management server " + _nodeId); + s_logger.debug("Not processing " + Event.AgentDisconnected + " event for the host id=" + hostId + " as the host is directly connected to the current management server " + _nodeId); return true; } @@ -367,19 +363,15 @@ public boolean executeUserRequest(final long hostId, final Event event) throws A } @Override - public boolean reconnect(final long hostId) { - Boolean result; - try { - result = propagateAgentEvent(hostId, Event.ShutdownRequested); - if (result != null) { - return result; - } - } catch (final AgentUnavailableException e) { - s_logger.debug("cannot propagate agent reconnect because agent is not available", e); - return false; - } + public void reconnect(final long hostId) throws CloudRuntimeException, AgentUnavailableException { + Boolean result = propagateAgentEvent(hostId, Event.ShutdownRequested); + if (result == null) { + super.reconnect(hostId); - return super.reconnect(hostId); + } + if (!result) { + throw new CloudRuntimeException("Failed to propagating agent change request event:" + Event.ShutdownRequested + " to host:" + hostId); + } } public void notifyNodesInCluster(final AgentAttache attache) { @@ -398,18 +390,18 @@ public void notifyNodesInClusterToScheduleHostScanTask() { } protected static void logT(final byte[] bytes, final String msg) { - s_logger.trace("Seq " + Request.getAgentId(bytes) + "-" + Request.getSequence(bytes) + ": MgmtId " + Request.getManagementServerId(bytes) + ": " + - (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg); + s_logger.trace("Seq " + Request.getAgentId(bytes) + "-" + Request.getSequence(bytes) + ": MgmtId " + Request.getManagementServerId(bytes) + ": " + + (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg); } protected static void logD(final byte[] bytes, final String msg) { - s_logger.debug("Seq " + Request.getAgentId(bytes) + "-" + Request.getSequence(bytes) + ": MgmtId " + Request.getManagementServerId(bytes) + ": " + - (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg); + s_logger.debug("Seq " + Request.getAgentId(bytes) + "-" + Request.getSequence(bytes) + ": MgmtId " + Request.getManagementServerId(bytes) + ": " + + (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg); } protected static void logI(final byte[] bytes, final String msg) { - s_logger.info("Seq " + Request.getAgentId(bytes) + "-" + Request.getSequence(bytes) + ": MgmtId " + Request.getManagementServerId(bytes) + ": " + - (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg); + s_logger.info("Seq " + Request.getAgentId(bytes) + "-" + Request.getSequence(bytes) + ": MgmtId " + Request.getManagementServerId(bytes) + ": " + + (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg); } public boolean routeToPeer(final String peer, final byte[] bytes) { @@ -443,8 +435,7 @@ public boolean routeToPeer(final String peer, final byte[] bytes) { logI(bytes, "Unable to route to peer: " + Request.parse(bytes).toString() + " due to " + e.getMessage()); } catch (ClassNotFoundException | UnsupportedVersionException ex) { // Request.parse thrown exception when we try to log it, log as much as we can - logI(bytes, "Unable to route to peer due to" + e.getMessage() - + ". Also caught exception when parsing request: " + ex.getMessage()); + logI(bytes, "Unable to route to peer due to" + e.getMessage() + ". Also caught exception when parsing request: " + ex.getMessage()); } } } @@ -489,8 +480,7 @@ public SocketChannel connectToPeer(final String peerName, final SocketChannel pr try { prevCh.close(); } catch (final Exception e) { - s_logger.info("[ignored]" - + "failed to get close resource for previous channel Socket: " + e.getLocalizedMessage()); + s_logger.info("[ignored]" + "failed to get close resource for previous channel Socket: " + e.getLocalizedMessage()); } } if (ch == null || ch == prevCh) { @@ -597,7 +587,7 @@ public boolean stop() { s_logger.info("Closing: " + ch.toString()); ch.close(); } catch (final IOException e) { - s_logger.info("[ignored] error on closing channel: " +ch.toString(), e); + s_logger.info("[ignored] error on closing channel: " + ch.toString(), e); } } } @@ -770,8 +760,7 @@ public void removeAgent(final AgentAttache attache, final Status nextState) { } @Override - public boolean executeRebalanceRequest(final long agentId, final long currentOwnerId, final long futureOwnerId, final Event event) throws AgentUnavailableException, - OperationTimedoutException { + public boolean executeRebalanceRequest(final long agentId, final long currentOwnerId, final long futureOwnerId, final Event event) throws AgentUnavailableException, OperationTimedoutException { boolean result = false; if (event == Event.RequestAgentRebalance) { return setToWaitForRebalance(agentId, currentOwnerId, futureOwnerId); @@ -837,8 +826,8 @@ public void startRebalanceAgents() { avLoad = allManagedAgents.size() / allMS.size(); } else { if (s_logger.isDebugEnabled()) { - s_logger.debug("There are no hosts to rebalance in the system. Current number of active management server nodes in the system is " + allMS.size() + - "; number of managed agents is " + allManagedAgents.size()); + s_logger.debug("There are no hosts to rebalance in the system. Current number of active management server nodes in the system is " + allMS.size() + "; number of managed agents is " + + allManagedAgents.size()); } return; } @@ -991,8 +980,7 @@ protected void runInContext() { // remove the host from re-balance list and delete from op_host_transfer DB // no need to do anything with the real attache as we haven't modified it yet final Date cutTime = DateUtil.currentGMTTime(); - final HostTransferMapVO transferMap = - _hostTransferDao.findActiveHostTransferMapByHostId(hostId, new Date(cutTime.getTime() - rebalanceTimeOut)); + final HostTransferMapVO transferMap = _hostTransferDao.findActiveHostTransferMapByHostId(hostId, new Date(cutTime.getTime() - rebalanceTimeOut)); if (transferMap == null) { s_logger.debug("Timed out waiting for the host id=" + hostId + " to be ready to transfer, skipping rebalance for the host"); @@ -1010,8 +998,7 @@ protected void runInContext() { final ManagementServerHostVO ms = _mshostDao.findByMsid(transferMap.getFutureOwner()); if (ms != null && ms.getState() != ManagementServerHost.State.Up) { - s_logger.debug("Can't transfer host " + hostId + " as it's future owner is not in UP state: " + ms + - ", skipping rebalance for the host"); + s_logger.debug("Can't transfer host " + hostId + " as it's future owner is not in UP state: " + ms + ", skipping rebalance for the host"); iterator.remove(); _hostTransferDao.completeAgentTransfer(hostId); continue; @@ -1027,8 +1014,8 @@ protected void runInContext() { } } else { - s_logger.debug("Agent " + hostId + " can't be transfered yet as its request queue size is " + attache.getQueueSize() + - " and listener queue size is " + attache.getNonRecurringListenersSize()); + s_logger.debug("Agent " + hostId + " can't be transfered yet as its request queue size is " + attache.getQueueSize() + " and listener queue size is " + + attache.getNonRecurringListenersSize()); } } } else { @@ -1094,8 +1081,7 @@ protected boolean rebalanceHost(final long hostId, final long currentOwnerId, fi if (result) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Loading directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId + - " as a part of rebalance process"); + s_logger.debug("Loading directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId + " as a part of rebalance process"); } result = loadDirectlyConnectedHost(host, true); } else { @@ -1103,17 +1089,15 @@ protected boolean rebalanceHost(final long hostId, final long currentOwnerId, fi } } catch (final Exception ex) { - s_logger.warn("Failed to load directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId + - " as a part of rebalance process due to:", ex); + s_logger.warn("Failed to load directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId + " as a part of rebalance process due to:", + ex); result = false; } if (result) { - s_logger.debug("Successfully loaded directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId + - " as a part of rebalance process"); + s_logger.debug("Successfully loaded directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId + " as a part of rebalance process"); } else { - s_logger.warn("Failed to load directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId + - " as a part of rebalance process"); + s_logger.warn("Failed to load directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId + " as a part of rebalance process"); } } @@ -1144,8 +1128,7 @@ protected void finishRebalance(final long hostId, final long futureOwnerId, fina // 2) Get all transfer requests and route them to peer Request requestToTransfer = forwardAttache.getRequestToTransfer(); while (requestToTransfer != null) { - s_logger.debug("Forwarding request " + requestToTransfer.getSequence() + " held in transfer attache " + hostId + " from the management server " + - _nodeId + " to " + futureOwnerId); + s_logger.debug("Forwarding request " + requestToTransfer.getSequence() + " held in transfer attache " + hostId + " from the management server " + _nodeId + " to " + futureOwnerId); final boolean routeResult = routeToPeer(Long.toString(futureOwnerId), requestToTransfer.getBytes()); if (!routeResult) { logD(requestToTransfer.getBytes(), "Failed to route request to peer"); @@ -1198,8 +1181,8 @@ protected boolean startRebalance(final long hostId) { if (attache == null) { s_logger.warn("Attache for the agent " + hostId + " no longer exists on management server " + _nodeId + ", can't start host rebalancing"); } else { - s_logger.warn("Attache for the agent " + hostId + " has request queue size= " + attache.getQueueSize() + " and listener queue size " + - attache.getNonRecurringListenersSize() + ", can't start host rebalancing"); + s_logger.warn("Attache for the agent " + hostId + " has request queue size= " + attache.getQueueSize() + " and listener queue size " + attache.getNonRecurringListenersSize() + + ", can't start host rebalancing"); } return false; } @@ -1255,8 +1238,9 @@ private String handleScheduleHostScanTaskCommand(final ScheduleHostScanTaskComma } catch (final Exception e) { // Scheduling host scan task in peer MS is a best effort operation during host add, regular host scan // happens at fixed intervals anyways. So handling any exceptions that may be thrown - s_logger.warn("Exception happened while trying to schedule host scan task on mgmt server " + _clusterMgr.getSelfPeerName() + - ", ignoring as regular host scan happens at fixed interval anyways", e); + s_logger.warn( + "Exception happened while trying to schedule host scan task on mgmt server " + _clusterMgr.getSelfPeerName() + ", ignoring as regular host scan happens at fixed interval anyways", + e); return null; } @@ -1372,15 +1356,15 @@ public String dispatch(final ClusterServicePdu pdu) { final String jsonReturn = _gson.toJson(answers); if (s_logger.isDebugEnabled()) { - s_logger.debug("Completed dispatching -> " + pdu.getAgentId() + ", json: " + pdu.getJsonPackage() + " in " + - (System.currentTimeMillis() - startTick) + " ms, return result: " + jsonReturn); + s_logger.debug("Completed dispatching -> " + pdu.getAgentId() + ", json: " + pdu.getJsonPackage() + " in " + (System.currentTimeMillis() - startTick) + " ms, return result: " + + jsonReturn); } return jsonReturn; } else { if (s_logger.isDebugEnabled()) { - s_logger.debug("Completed dispatching -> " + pdu.getAgentId() + ", json: " + pdu.getJsonPackage() + " in " + - (System.currentTimeMillis() - startTick) + " ms, return null result"); + s_logger.debug( + "Completed dispatching -> " + pdu.getAgentId() + ", json: " + pdu.getJsonPackage() + " in " + (System.currentTimeMillis() - startTick) + " ms, return null result"); } } } catch (final AgentUnavailableException e) { diff --git a/engine/schema/src/main/java/com/cloud/alert/AlertVO.java b/engine/schema/src/main/java/com/cloud/alert/AlertVO.java index 70ef469f52b8..1f2cd9d8c601 100644 --- a/engine/schema/src/main/java/com/cloud/alert/AlertVO.java +++ b/engine/schema/src/main/java/com/cloud/alert/AlertVO.java @@ -53,6 +53,9 @@ public class AlertVO implements Alert { @Column(name = "subject", length = 999) private String subject; + @Column(name = "content", length = 5000) + private String content; + @Column(name = "sent_count") private int sentCount = 0; @@ -191,4 +194,13 @@ public String getName() { public void setName(String name) { this.name = name; } + + @Override + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } } diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java index e48bfd58a6a8..5af099d4e322 100644 --- a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java @@ -80,7 +80,6 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao private static final String LIST_CLUSTERID_FOR_HOST_TAG = "select distinct cluster_id from host join host_tags on host.id = host_tags.host_id and host_tags.tag = ?"; - protected SearchBuilder TypePodDcStatusSearch; protected SearchBuilder IdStatusSearch; diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41000to41100-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41000to41100-cleanup.sql index d7a080efd166..f8d9ce9b73bb 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41000to41100-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41000to41100-cleanup.sql @@ -66,4 +66,4 @@ CREATE VIEW `cloud`.`user_view` AS left join `cloud`.`async_job` ON async_job.instance_id = user.id and async_job.instance_type = 'User' - and async_job.job_status = 0; + and async_job.job_status = 0; \ No newline at end of file diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41000to41100.sql b/engine/schema/src/main/resources/META-INF/db/schema-41000to41100.sql index 2e7f9e9fe9cf..70a76d98d86f 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41000to41100.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41000to41100.sql @@ -566,4 +566,4 @@ CREATE TABLE IF NOT EXISTS `cloud`.`external_netscaler_controlcenter` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; ALTER TABLE `cloud`.`sslcerts` ADD COLUMN `name` varchar(255) NULL default NULL COMMENT 'Name of the Certificate'; -ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `service_package_id` varchar(255) NULL default NULL COMMENT 'Netscaler ControlCenter Service Package'; +ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `service_package_id` varchar(255) NULL default NULL COMMENT 'Netscaler ControlCenter Service Package'; \ No newline at end of file diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql b/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql index 5667c5b3dab0..97bd5ae7aaee 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41100to41200.sql @@ -20,4 +20,7 @@ --; -- [CLOUDSTACK-10314] Add reason column to ACL rule table -ALTER TABLE `cloud`.`network_acl_item` ADD COLUMN `reason` VARCHAR(2500) AFTER `display`; \ No newline at end of file +ALTER TABLE `cloud`.`network_acl_item` ADD COLUMN `reason` VARCHAR(2500) AFTER `display`; + +--[CLOUDSTACK-9846] Make provision to store content and subject for Alerts in separate columns. +ALTER TABLE `cloud`.`alert` ADD COLUMN `content` VARCHAR(5000); diff --git a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java index 30cba4d6c71e..c6003afee578 100644 --- a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java +++ b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java @@ -266,20 +266,16 @@ public void pullAgentOutMaintenance(long hostId) { } @Override - public boolean reconnect(long hostId) { - // TODO Auto-generated method stub - return false; + public void reconnect(long hostId) { } @Override public boolean isAgentAttached(long hostId) { - // TODO Auto-generated method stub return false; } @Override public boolean handleDirectConnectAgent(Host host, StartupCommand[] cmds, ServerResource resource, boolean forRebalance, boolean newHost) throws ConnectionException { - // TODO Auto-generated method stub return false; } diff --git a/plugins/network-elements/netscaler/src/main/java/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/element/NetscalerElement.java index 38a836d2d6db..1df16404d399 100644 --- a/plugins/network-elements/netscaler/src/main/java/com/cloud/network/element/NetscalerElement.java +++ b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/element/NetscalerElement.java @@ -28,12 +28,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.log4j.Logger; -import org.json.JSONException; -import org.json.JSONObject; - -import com.google.gson.Gson; - import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.ServerApiException; @@ -41,6 +35,9 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import org.apache.cloudstack.region.gslb.GslbServiceProvider; +import org.apache.log4j.Logger; +import org.json.JSONException; +import org.json.JSONObject; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -84,6 +81,7 @@ import com.cloud.deploy.DeploymentPlan; import com.cloud.event.ActionEvent; import com.cloud.event.EventTypes; +import com.cloud.exception.AgentUnavailableException; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InsufficientNetworkCapacityException; @@ -154,10 +152,11 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; +import com.google.gson.Gson; public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl - implements LoadBalancingServiceProvider, NetscalerLoadBalancerElementService, ExternalLoadBalancerDeviceManager, - IpDeployer, StaticNatServiceProvider, GslbServiceProvider { +implements LoadBalancingServiceProvider, NetscalerLoadBalancerElementService, ExternalLoadBalancerDeviceManager, +IpDeployer, StaticNatServiceProvider, GslbServiceProvider { private static final Logger s_logger = Logger.getLogger(NetscalerElement.class); public static final AutoScaleCounterType AutoScaleCounterSnmp = new AutoScaleCounterType("snmp"); @@ -218,7 +217,7 @@ private boolean canHandle(Network config, Service service) { boolean handleInAdvanceZone = (zone.getNetworkType() == NetworkType.Advanced && (config.getGuestType() == Network.GuestType.Isolated - || config.getGuestType() == Network.GuestType.Shared) + || config.getGuestType() == Network.GuestType.Shared) && config.getTrafficType() == TrafficType.Guest); boolean handleInBasicZone = (zone.getNetworkType() == NetworkType.Basic && config.getGuestType() == Network.GuestType.Shared && config.getTrafficType() == TrafficType.Guest); @@ -242,7 +241,7 @@ private boolean isBasicZoneNetwok(Network config) { @Override public boolean implement(Network guestConfig, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws ResourceUnavailableException, ConcurrentOperationException, - InsufficientNetworkCapacityException { + InsufficientNetworkCapacityException { if (!canHandle(guestConfig, Service.Lb)) { return false; @@ -271,7 +270,7 @@ public boolean implement(Network guestConfig, NetworkOffering offering, DeployDe throw new ResourceUnavailableException( "There are no NetScaler load balancer devices with the free capacity for implementing this network : " + e.getMessage(), - DataCenter.class, guestConfig.getDataCenterId()); + DataCenter.class, guestConfig.getDataCenterId()); } } @@ -286,7 +285,6 @@ public HostVO allocateNCCResourceForNetwork(Network guestConfig) throws Configur Map _configs; List ncc = _netscalerControlCenterDao.listAll(); HostVO hostVO = null; - Map params; if (ncc.size() > 0) { NetScalerControlCenterVO nccVO = ncc.get(0); String ipAddress = nccVO.getNccip(); @@ -414,7 +412,7 @@ public boolean manageGuestNetworkWithNetscalerControlCenter(boolean add, Network @Override public boolean prepare(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, InsufficientNetworkCapacityException, - ResourceUnavailableException { + ResourceUnavailableException { return true; } @@ -593,45 +591,45 @@ public ExternalLoadBalancerDeviceVO addNetscalerLoadBalancer(AddNetscalerLoadBal boolean dedicatedUse = (configParams.get(ApiConstants.LOAD_BALANCER_DEVICE_DEDICATED) != null) ? Boolean.parseBoolean(configParams.get(ApiConstants.LOAD_BALANCER_DEVICE_DEDICATED)) : false; - if (dedicatedUse && !deviceName.equals(NetworkDevice.NetscalerVPXLoadBalancer.getName())) { - String msg = "Only Netscaler VPX load balancers can be specified for dedicated use"; - s_logger.debug(msg); - throw new InvalidParameterValueException(msg); - } + if (dedicatedUse && !deviceName.equals(NetworkDevice.NetscalerVPXLoadBalancer.getName())) { + String msg = "Only Netscaler VPX load balancers can be specified for dedicated use"; + s_logger.debug(msg); + throw new InvalidParameterValueException(msg); + } - if (cmd.isGslbProvider()) { + if (cmd.isGslbProvider()) { - if (!deviceName.equals(NetworkDevice.NetscalerVPXLoadBalancer.getName()) - && !deviceName.equals(NetworkDevice.NetscalerMPXLoadBalancer.getName())) { - String msg = "Only Netscaler VPX or MPX load balancers can be specified as GSLB service provider"; - s_logger.debug(msg); - throw new InvalidParameterValueException(msg); - } + if (!deviceName.equals(NetworkDevice.NetscalerVPXLoadBalancer.getName()) + && !deviceName.equals(NetworkDevice.NetscalerMPXLoadBalancer.getName())) { + String msg = "Only Netscaler VPX or MPX load balancers can be specified as GSLB service provider"; + s_logger.debug(msg); + throw new InvalidParameterValueException(msg); + } - if (cmd.getSitePublicIp() == null || cmd.getSitePrivateIp() == null) { - String msg = "Public and Privae IP needs to provided for NetScaler that will be GSLB provider"; - s_logger.debug(msg); - throw new InvalidParameterValueException(msg); - } + if (cmd.getSitePublicIp() == null || cmd.getSitePrivateIp() == null) { + String msg = "Public and Privae IP needs to provided for NetScaler that will be GSLB provider"; + s_logger.debug(msg); + throw new InvalidParameterValueException(msg); + } - if (dedicatedUse) { - throw new InvalidParameterValueException( - "NetScaler provisioned to be GSLB service provider can only be configured for shared usage."); - } + if (dedicatedUse) { + throw new InvalidParameterValueException( + "NetScaler provisioned to be GSLB service provider can only be configured for shared usage."); + } - } + } - if (cmd.isExclusiveGslbProvider() && !cmd.isGslbProvider()) { - throw new InvalidParameterValueException( - "NetScaler can be provisioned to be exclusive GSLB service provider" - + " only if its being configured as GSLB service provider also."); - } + if (cmd.isExclusiveGslbProvider() && !cmd.isGslbProvider()) { + throw new InvalidParameterValueException( + "NetScaler can be provisioned to be exclusive GSLB service provider" + + " only if its being configured as GSLB service provider also."); + } - ExternalLoadBalancerDeviceVO lbDeviceVO = addExternalLoadBalancer(cmd.getPhysicalNetworkId(), cmd.getUrl(), - cmd.getUsername(), cmd.getPassword(), deviceName, new NetscalerResource(), cmd.isGslbProvider(), - cmd.isExclusiveGslbProvider(), cmd.getSitePublicIp(), cmd.getSitePrivateIp()); + ExternalLoadBalancerDeviceVO lbDeviceVO = addExternalLoadBalancer(cmd.getPhysicalNetworkId(), cmd.getUrl(), + cmd.getUsername(), cmd.getPassword(), deviceName, new NetscalerResource(), cmd.isGslbProvider(), + cmd.isExclusiveGslbProvider(), cmd.getSitePublicIp(), cmd.getSitePrivateIp()); - return lbDeviceVO; + return lbDeviceVO; } @Override @@ -759,7 +757,11 @@ public void doInTransactionWithoutResult(TransactionStatus status) { }); HostVO host = _hostDao.findById(lbDeviceVo.getHostId()); - _agentMgr.reconnect(host.getId()); + try { + _agentMgr.reconnect(host.getId()); + } catch (AgentUnavailableException e) { + s_logger.warn("failed to reconnect host " + host, e); + } return lbDeviceVo; } @@ -858,8 +860,9 @@ public boolean deleteServicePackageOffering(DeleteServicePackageOfferingCmd cmd) boolean flag=false; try { result = _netscalerServicePackageDao.findByUuid(cmd.getId()); - if (result == null) + if (result == null) { throw new CloudRuntimeException("Record does not Exists in the Table"); + } if(_networkOfferingDao.isUsingServicePackage(result.getUuid())) { @@ -869,10 +872,11 @@ public boolean deleteServicePackageOffering(DeleteServicePackageOfferingCmd cmd) flag = _netscalerServicePackageDao.remove(result.getId()); } catch (Exception e) { - if (e instanceof InvalidParameterValueException) + if (e instanceof InvalidParameterValueException) { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, e.getMessage()); - else - throw e; + } else { + throw e; + } } return flag; @@ -884,18 +888,19 @@ public boolean deleteServicePackageOffering(DeleteServicePackageOfferingCmd cmd) public boolean deleteNetscalerControlCenter(DeleteNetscalerControlCenterCmd cmd) throws CloudRuntimeException { NetScalerControlCenterVO result = _netscalerControlCenterDao.findByUuid(cmd.getId()); - if (result == null) + if (result == null) { throw new CloudRuntimeException("External Netscaler Control Center Table does not contain record with this ID"); - else { + } else { //ID list of Network Offering which are not removed and have service Package Uuid field not null. List servicePackageId_list = _networkOfferingDao.listNetworkOfferingID(); if (servicePackageId_list.size() != 0) { //VO list of Networks which are using Network Offering. List networkVO_list = _networkDao.listNetworkVO(servicePackageId_list); - if (networkVO_list != null && networkVO_list.size() != 0) + if (networkVO_list != null && networkVO_list.size() != 0) { throw new CloudRuntimeException( "ServicePackages published by NetScalerControlCenter are being used by NetworkOfferings. Try deleting NetworkOffering with ServicePackages and then delete NetScalerControlCenter."); + } } } try { @@ -1466,8 +1471,9 @@ public NetScalerServicePackageResponse registerNetscalerServicePackage(RegisterS @DB public NetScalerControlCenterVO registerNetscalerControlCenter(RegisterNetscalerControlCenterCmd cmd) { - if (_netscalerControlCenterDao.listAll() != null && _netscalerControlCenterDao.listAll().size() != 0) + if (_netscalerControlCenterDao.listAll() != null && _netscalerControlCenterDao.listAll().size() != 0) { throw new CloudRuntimeException("One Netscaler Control Center already exist in the DataBase. At a time only one Netscaler Control Center is allowed"); + } final RegisterNetscalerControlCenterCmd cmdinfo = cmd; String ipAddress = cmd.getIpaddress(); @@ -1511,7 +1517,7 @@ public Map deployNetscalerServiceVm(DeployNetscalerVpxCmd cmd) { Long serviceOfferingId = cmd.getServiceOfferingId(); DeploymentPlan plan = new DataCenterDeployment(dest.getDataCenter().getId()); try { - resp = _netScalerVMManager.deployNsVpx(cmd.getAccount(), dest, plan, serviceOfferingId, templateId); + resp = _netScalerVMManager.deployNsVpx(cmd.getAccount(), dest, plan, serviceOfferingId, templateId); } catch (InsufficientCapacityException e) { e.printStackTrace(); } @@ -1520,7 +1526,7 @@ public Map deployNetscalerServiceVm(DeployNetscalerVpxCmd cmd) { @Override public VirtualRouter stopNetscalerServiceVm(Long id, boolean forced, Account callingAccount, long callingUserId) throws ConcurrentOperationException, - ResourceUnavailableException { + ResourceUnavailableException { return _netScalerVMManager.stopNetScalerVm(id, forced, callingAccount, callingUserId); } } \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 5f2551e9f4fe..4485f5d73f96 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,5 +21,4 @@ cloudmonkey # Marvin dependencies are installed via its bundle # Install the SolidFire SDK for Python -solidfire-sdk-python - +solidfire-sdk-python \ No newline at end of file diff --git a/server/src/main/java/com/cloud/alert/AlertManagerImpl.java b/server/src/main/java/com/cloud/alert/AlertManagerImpl.java index a58a4f8b0f91..5a7a8b436e07 100644 --- a/server/src/main/java/com/cloud/alert/AlertManagerImpl.java +++ b/server/src/main/java/com/cloud/alert/AlertManagerImpl.java @@ -39,12 +39,6 @@ import javax.mail.internet.InternetAddress; import javax.naming.ConfigurationException; -import org.apache.log4j.Logger; - -import com.sun.mail.smtp.SMTPMessage; -import com.sun.mail.smtp.SMTPSSLTransport; -import com.sun.mail.smtp.SMTPTransport; - import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.Configurable; @@ -52,6 +46,7 @@ import org.apache.cloudstack.managed.context.ManagedContextTimerTask; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; +import org.apache.log4j.Logger; import com.cloud.alert.dao.AlertDao; import com.cloud.api.ApiDBUtils; @@ -85,10 +80,12 @@ import com.cloud.utils.component.ManagerBase; import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.SearchCriteria; +import com.sun.mail.smtp.SMTPMessage; +import com.sun.mail.smtp.SMTPSSLTransport; +import com.sun.mail.smtp.SMTPTransport; public class AlertManagerImpl extends ManagerBase implements AlertManager, Configurable { private static final Logger s_logger = Logger.getLogger(AlertManagerImpl.class.getName()); - private static final Logger s_alertsLogger = Logger.getLogger("org.apache.cloudstack.alerts"); private static final long INITIAL_CAPACITY_CHECK_DELAY = 30L * 1000L; // Thirty seconds expressed in milliseconds. @@ -205,8 +202,9 @@ public boolean configure(String name, Map params) throws Configu String capacityCheckPeriodStr = configs.get("capacity.check.period"); if (capacityCheckPeriodStr != null) { _capacityCheckPeriod = Long.parseLong(capacityCheckPeriodStr); - if (_capacityCheckPeriod <= 0) + if (_capacityCheckPeriod <= 0) { _capacityCheckPeriod = Long.parseLong(Config.CapacityCheckPeriod.getDefaultValue()); + } } _timer = new Timer("CapacityChecker"); @@ -249,7 +247,7 @@ public void sendAlert(AlertType alertType, long dataCenterId, Long podId, String if (_emailAlert != null) { _emailAlert.sendAlert(alertType, dataCenterId, podId, null, subject, body); } else { - s_alertsLogger.warn("AlertType:: " + alertType + " | dataCenterId:: " + dataCenterId + " | podId:: " + podId + + s_logger.warn("AlertType:: " + alertType + " | dataCenterId:: " + dataCenterId + " | podId:: " + podId + " | message:: " + subject + " | body:: " + body); } } catch (Exception ex) { @@ -589,7 +587,7 @@ private void generateEmailAlert(DataCenterVO dc, HostPodVO pod, ClusterVO cluste alertType = AlertManager.AlertType.ALERT_TYPE_LOCAL_STORAGE; break; - //Pod Level + //Pod Level case Capacity.CAPACITY_TYPE_PRIVATE_IP: msgSubject = "System Alert: Number of unallocated private IPs is low in pod " + pod.getName() + " of availability zone " + dc.getName(); totalStr = Double.toString(totalCapacity); @@ -598,7 +596,7 @@ private void generateEmailAlert(DataCenterVO dc, HostPodVO pod, ClusterVO cluste alertType = AlertManager.AlertType.ALERT_TYPE_PRIVATE_IP; break; - //Zone Level + //Zone Level case Capacity.CAPACITY_TYPE_SECONDARY_STORAGE: msgSubject = "System Alert: Low Available Secondary Storage in availability zone " + dc.getName(); totalStr = formatBytesToMegabytes(totalCapacity); @@ -746,22 +744,22 @@ protected PasswordAuthentication getPasswordAuthentication() { // TODO: make sure this handles SSL transport (useAuth is true) and regular public void sendAlert(AlertType alertType, long dataCenterId, Long podId, Long clusterId, String subject, String content) throws MessagingException, - UnsupportedEncodingException { - s_alertsLogger.warn("AlertType:: " + alertType + " | dataCenterId:: " + dataCenterId + " | podId:: " + + UnsupportedEncodingException { + s_logger.warn("AlertType:: " + alertType + " | dataCenterId:: " + dataCenterId + " | podId:: " + podId + " | clusterId:: " + clusterId + " | message:: " + subject); AlertVO alert = null; if ((alertType != AlertManager.AlertType.ALERT_TYPE_HOST) && - (alertType != AlertManager.AlertType.ALERT_TYPE_USERVM) && - (alertType != AlertManager.AlertType.ALERT_TYPE_DOMAIN_ROUTER) && - (alertType != AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY) && - (alertType != AlertManager.AlertType.ALERT_TYPE_SSVM) && - (alertType != AlertManager.AlertType.ALERT_TYPE_STORAGE_MISC) && - (alertType != AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE) && - (alertType != AlertManager.AlertType.ALERT_TYPE_RESOURCE_LIMIT_EXCEEDED) && - (alertType != AlertManager.AlertType.ALERT_TYPE_UPLOAD_FAILED) && - (alertType != AlertManager.AlertType.ALERT_TYPE_OOBM_AUTH_ERROR) && - (alertType != AlertManager.AlertType.ALERT_TYPE_HA_ACTION) && - (alertType != AlertManager.AlertType.ALERT_TYPE_CA_CERT)) { + (alertType != AlertManager.AlertType.ALERT_TYPE_USERVM) && + (alertType != AlertManager.AlertType.ALERT_TYPE_DOMAIN_ROUTER) && + (alertType != AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY) && + (alertType != AlertManager.AlertType.ALERT_TYPE_SSVM) && + (alertType != AlertManager.AlertType.ALERT_TYPE_STORAGE_MISC) && + (alertType != AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE) && + (alertType != AlertManager.AlertType.ALERT_TYPE_RESOURCE_LIMIT_EXCEEDED) && + (alertType != AlertManager.AlertType.ALERT_TYPE_UPLOAD_FAILED) && + (alertType != AlertManager.AlertType.ALERT_TYPE_OOBM_AUTH_ERROR) && + (alertType != AlertManager.AlertType.ALERT_TYPE_HA_ACTION) && + (alertType != AlertManager.AlertType.ALERT_TYPE_CA_CERT)) { alert = _alertDao.getLastAlert(alertType.getType(), dataCenterId, podId, clusterId); } @@ -770,6 +768,7 @@ public void sendAlert(AlertType alertType, long dataCenterId, Long podId, Long c AlertVO newAlert = new AlertVO(); newAlert.setType(alertType.getType()); newAlert.setSubject(subject); + newAlert.setContent(content); newAlert.setClusterId(clusterId); newAlert.setPodId(podId); newAlert.setDataCenterId(dataCenterId); diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java index 2966d41d8bf8..195543686cb2 100755 --- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java @@ -30,10 +30,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.commons.lang.ObjectUtils; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd; import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd; @@ -50,6 +46,9 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.utils.identity.ManagementServerNode; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.ObjectUtils; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -75,7 +74,6 @@ import com.cloud.capacity.dao.CapacityDao; import com.cloud.cluster.ClusterManager; import com.cloud.configuration.Config; -import com.cloud.configuration.ConfigurationManager; import com.cloud.dc.ClusterDetailsDao; import com.cloud.dc.ClusterDetailsVO; import com.cloud.dc.ClusterVO; @@ -249,8 +247,6 @@ public void setDiscoverers(final List discoverers) { @Inject private VMTemplateDao _templateDao; @Inject - private ConfigurationManager _configMgr; - @Inject private ClusterVSMMapDao _clusterVSMMapDao; private final long _nodeId = ManagementServerNode.getManagementServerId(); @@ -610,7 +606,7 @@ public List discoverHosts(final AddSecondaryStorageCmd cmd) thro private List discoverHostsFull(final Long dcId, final Long podId, Long clusterId, final String clusterName, String url, String username, String password, final String hypervisorType, final List hostTags, final Map params, final boolean deferAgentCreation) throws IllegalArgumentException, DiscoveryException, - InvalidParameterValueException { + InvalidParameterValueException { URI uri = null; // Check if the zone exists in the system @@ -836,7 +832,6 @@ protected boolean doDeleteHost(final long hostId, final boolean isForced, final } // Get storage pool host mappings here because they can be removed as a // part of handleDisconnect later - // TODO: find out the bad boy, what's a buggy logic! final List pools = _storagePoolHostDao.listByHostIdIncludingRemoved(hostId); final ResourceStateAdapter.DeleteHostAnswer answer = @@ -1166,15 +1161,15 @@ public Host cancelMaintenance(final CancelMaintenanceCmd cmd) { } @Override - public Host reconnectHost(final ReconnectHostCmd cmd) { - final Long hostId = cmd.getId(); + public Host reconnectHost(ReconnectHostCmd cmd) throws AgentUnavailableException { + Long hostId = cmd.getId(); - final HostVO host = _hostDao.findById(hostId); + HostVO host = _hostDao.findById(hostId); if (host == null) { throw new InvalidParameterValueException("Host with id " + hostId.toString() + " doesn't exist"); } - - return _agentMgr.reconnect(hostId) ? host : null; + _agentMgr.reconnect(hostId); + return host; } @Override @@ -2310,7 +2305,6 @@ public boolean executeUserRequest(final long hostId, final ResourceState.Event e } else if (event == ResourceState.Event.AdminCancelMaintenance) { return doCancelMaintenance(hostId); } else if (event == ResourceState.Event.DeleteHost) { - /* TODO: Ask alex why we assume the last two parameters are false */ return doDeleteHost(hostId, false, false); } else if (event == ResourceState.Event.Unmanaged) { return doUmanageHost(hostId); @@ -2329,7 +2323,7 @@ private boolean doUmanageHost(final long hostId) { } if (host.getHypervisorType() == HypervisorType.KVM || host.getHypervisorType() == HypervisorType.LXC) { - final MaintainAnswer answer = (MaintainAnswer)_agentMgr.easySend(hostId, new MaintainCommand()); + _agentMgr.easySend(hostId, new MaintainCommand()); } _agentMgr.disconnectWithoutInvestigation(hostId, Event.ShutdownRequested); @@ -2379,10 +2373,6 @@ public boolean updateClusterPassword(final UpdateHostPasswordCmd command) { final List hosts = listAllHostsInCluster(command.getClusterId()); for (final HostVO host : hosts) { try { - /* - * FIXME: this is a buggy logic, check with alex. Shouldn't - * return if propagation return non null - */ final Boolean result = propagateResourceEvent(host.getId(), ResourceState.Event.UpdatePassword); if (result != null) { return result; @@ -2852,11 +2842,4 @@ public Boolean doInTransaction(final TransactionStatus status) { return false; } } - - @Override - public boolean start() { - // TODO Auto-generated method stub - return super.start(); - } - } diff --git a/server/src/main/java/org/apache/cloudstack/ca/CAManagerImpl.java b/server/src/main/java/org/apache/cloudstack/ca/CAManagerImpl.java index 3a904315fe16..02e7a4231a49 100644 --- a/server/src/main/java/org/apache/cloudstack/ca/CAManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/ca/CAManagerImpl.java @@ -191,7 +191,8 @@ public boolean provisionCertificate(final Host host, final Boolean reconnect, fi if (Strings.isNullOrEmpty(csr)) { return false; } - final Certificate certificate = issueCertificate(csr, Collections.singletonList(host.getName()), Arrays.asList(host.getPrivateIpAddress(), host.getPublicIpAddress(), host.getStorageIpAddress()), CAManager.CertValidityPeriod.value(), caProvider); + final Certificate certificate = issueCertificate(csr, Collections.singletonList(host.getName()), + Arrays.asList(host.getPrivateIpAddress(), host.getPublicIpAddress(), host.getStorageIpAddress()), CAManager.CertValidityPeriod.value(), caProvider); return deployCertificate(host, certificate, reconnect, null); } catch (final AgentUnavailableException | OperationTimedoutException e) { LOG.error("Host/agent is not available or operation timed out, failed to setup keystore and generate CSR for host/agent id=" + host.getId() + ", due to: ", e); @@ -206,18 +207,19 @@ public String generateKeyStoreAndCsr(final Host host, final Map cmd.setAccessDetail(sshAccessDetails); } CallContext.current().setEventDetails("generating keystore and CSR for host id: " + host.getId()); - final SetupKeystoreAnswer answer = (SetupKeystoreAnswer) agentManager.send(host.getId(), cmd); + final SetupKeystoreAnswer answer = (SetupKeystoreAnswer)agentManager.send(host.getId(), cmd); return answer.getCsr(); } @Override - public boolean deployCertificate(final Host host, final Certificate certificate, final Boolean reconnect, final Map sshAccessDetails) throws AgentUnavailableException, OperationTimedoutException { + public boolean deployCertificate(final Host host, final Certificate certificate, final Boolean reconnect, final Map sshAccessDetails) + throws AgentUnavailableException, OperationTimedoutException { final SetupCertificateCommand cmd = new SetupCertificateCommand(certificate); if (sshAccessDetails != null && !sshAccessDetails.isEmpty()) { cmd.setAccessDetail(sshAccessDetails); } CallContext.current().setEventDetails("deploying certificate for host id: " + host.getId()); - final SetupCertificateAnswer answer = (SetupCertificateAnswer) agentManager.send(host.getId(), cmd); + final SetupCertificateAnswer answer = (SetupCertificateAnswer)agentManager.send(host.getId(), cmd); if (answer.getResult()) { CallContext.current().setEventDetails("successfully deployed certificate for host id: " + host.getId()); } else { @@ -227,9 +229,12 @@ public boolean deployCertificate(final Host host, final Certificate certificate, if (answer.getResult()) { getActiveCertificatesMap().put(host.getPrivateIpAddress(), certificate.getClientCertificate()); if (sshAccessDetails == null && reconnect != null && reconnect) { - LOG.info(String.format("Successfully setup certificate on host, reconnecting with agent with id=%d, name=%s, address=%s", - host.getId(), host.getName(), host.getPublicIpAddress())); - return agentManager.reconnect(host.getId()); + LOG.info(String.format("Successfully setup certificate on host, reconnecting with agent with id=%d, name=%s, address=%s", host.getId(), host.getName(), host.getPublicIpAddress())); + try { + agentManager.reconnect(host.getId()); + } catch (AgentUnavailableException | CloudRuntimeException e) { + LOG.debug("Error when reconnecting to host: " + host.getUuid(), e); + } } return true; } @@ -257,8 +262,7 @@ public void sendAlert(final Host host, final String subject, final String messag if (host == null) { return; } - alertManager.sendAlert(AlertManager.AlertType.ALERT_TYPE_CA_CERT, - host.getDataCenterId(), host.getPodId(), subject, message); + alertManager.sendAlert(AlertManager.AlertType.ALERT_TYPE_CA_CERT, host.getDataCenterId(), host.getPodId(), subject, message); } @Override @@ -303,7 +307,7 @@ protected void runInContext() { } final DateTime now = DateTime.now(DateTimeZone.UTC); final Map certsMap = caManager.getActiveCertificatesMap(); - for (final Iterator> it = certsMap.entrySet().iterator(); it.hasNext(); ) { + for (final Iterator> it = certsMap.entrySet().iterator(); it.hasNext();) { final Map.Entry entry = it.next(); if (entry == null) { continue; @@ -315,19 +319,14 @@ protected void runInContext() { continue; } final Host host = hostDao.findByIp(hostIp); - if (host == null || host.getManagementServerId() == null || - host.getManagementServerId() != ManagementServerNode.getManagementServerId() || - host.getStatus() != Status.Up) { - if (host == null || - (host.getManagementServerId() != null && - host.getManagementServerId() != ManagementServerNode.getManagementServerId())) { + if (host == null || host.getManagementServerId() == null || host.getManagementServerId() != ManagementServerNode.getManagementServerId() || host.getStatus() != Status.Up) { + if (host == null || (host.getManagementServerId() != null && host.getManagementServerId() != ManagementServerNode.getManagementServerId())) { it.remove(); } continue; } - final String hostDescription = String.format("host id=%d, uuid=%s, name=%s, ip=%s, zone id=%d", - host.getId(), host.getUuid(), host.getName(), hostIp, host.getDataCenterId()); + final String hostDescription = String.format("host id=%d, uuid=%s, name=%s, ip=%s, zone id=%d", host.getId(), host.getUuid(), host.getName(), hostIp, host.getDataCenterId()); try { certificate.checkValidity(now.plusDays(CertExpiryAlertPeriod.valueIn(host.getClusterId())).toDate()); @@ -345,7 +344,8 @@ protected void runInContext() { } catch (final Throwable ex) { LOG.warn("Failed to auto-renew certificate for " + hostDescription + ", with error=", ex); caManager.sendAlert(host, "Certificate auto-renewal failed for " + hostDescription, - String.format("Certificate is going to expire for %s. Auto-renewal failed to renew the certificate, please renew it manually. It is not valid after %s.", hostDescription, certificate.getNotAfter())); + String.format("Certificate is going to expire for %s. Auto-renewal failed to renew the certificate, please renew it manually. It is not valid after %s.", + hostDescription, certificate.getNotAfter())); } } else { if (alertMap.containsKey(hostIp)) { @@ -355,8 +355,7 @@ protected void runInContext() { } } caManager.sendAlert(host, "Certificate expiring soon for " + hostDescription, - String.format("Certificate is going to expire for %s. Please renew it, it is not valid after %s.", - hostDescription, certificate.getNotAfter())); + String.format("Certificate is going to expire for %s. Please renew it, it is not valid after %s.", hostDescription, certificate.getNotAfter())); alertMap.put(hostIp, new Date()); } } @@ -427,14 +426,6 @@ public String getConfigComponentName() { @Override public ConfigKey[] getConfigKeys() { - return new ConfigKey[]{ - CAProviderPlugin, - CertKeySize, - CertSignatureAlgorithm, - CertValidityPeriod, - AutomaticCertRenewal, - CABackgroundJobDelay, - CertExpiryAlertPeriod - }; + return new ConfigKey[] {CAProviderPlugin, CertKeySize, CertSignatureAlgorithm, CertValidityPeriod, AutomaticCertRenewal, CABackgroundJobDelay, CertExpiryAlertPeriod}; } } diff --git a/server/src/test/java/org/apache/cloudstack/ca/CAManagerImplTest.java b/server/src/test/java/org/apache/cloudstack/ca/CAManagerImplTest.java index 14ecc971d5fc..64cbf205812a 100644 --- a/server/src/test/java/org/apache/cloudstack/ca/CAManagerImplTest.java +++ b/server/src/test/java/org/apache/cloudstack/ca/CAManagerImplTest.java @@ -113,7 +113,7 @@ public void testProvisionCertificate() throws Exception { final X509Certificate certificate = CertUtils.generateV3Certificate(null, keyPair, keyPair.getPublic(), "CN=ca", "SHA256withRSA", 365, null, null); Mockito.when(caProvider.issueCertificate(Mockito.anyString(), Mockito.anyList(), Mockito.anyList(), Mockito.anyInt())).thenReturn(new Certificate(certificate, null, Collections.singletonList(certificate))); Mockito.when(agentManager.send(Mockito.anyLong(), Mockito.any(SetupKeyStoreCommand.class))).thenReturn(new SetupKeystoreAnswer("someCsr")); - Mockito.when(agentManager.reconnect(Mockito.anyLong())).thenReturn(true); + Mockito.doNothing().when(agentManager).reconnect(Mockito.anyLong()); Assert.assertTrue(caManager.provisionCertificate(host, true, null)); Mockito.verify(agentManager, Mockito.times(2)).send(Mockito.anyLong(), Mockito.any(Answer.class)); Mockito.verify(agentManager, Mockito.times(1)).reconnect(Mockito.anyLong()); From 1708838518299d5d04f810d0d01cfb4faf425b03 Mon Sep 17 00:00:00 2001 From: Khosrow Moossavi Date: Thu, 15 Mar 2018 06:55:29 -0400 Subject: [PATCH 027/145] CLOUDSTACK-10268: Fix and enhance package script (#2433) - new flag `-T, --use-timestamp` to use `timestamp` when POM version contains SNAPSHOT - in the final artifacts (jar) name - in the final package (rpm, deb) name - in `/etc/cloudstack-release` file of SystemVMs - in the Management Server > About dialog - if there's a "branding" string in the POM version (e.g. `x.y.z.a-NAME[-SNAPSHOT]`), the branding name will be used in the final generated pacakge name such as following: - `cloudstack-management-x.y.z.a-NAME.NUMBER.el7.centos.x86_64` - `cloudstack-management_x.y.z.a-NAME-NUMBER~xenial_all.deb` - branding string can be overriden with newly added `-b, --brand` flag - handle the new format version for VR version - fix long opts (they were broken) - tolerate and show a warning message for unrecognized flags - usage help reformat * Deprecate Version class in favor or CloudStackVersion --- .../upgrade/DatabaseIntegrityChecker.java | 5 +- packaging/build-deb.sh | 94 ++++++++- packaging/centos63/cloud.spec | 7 +- packaging/centos7/cloud.spec | 7 +- packaging/package.sh | 190 ++++++++++++------ .../query/dao/DomainRouterJoinDaoImpl.java | 11 +- .../network/router/NetworkHelperImpl.java | 11 +- tools/appliance/build.sh | 16 +- tools/build/setnextversion.sh | 143 +++++++++---- .../main/java/com/cloud/maint/Version.java | 77 ------- .../nvp/plugin/NiciraNvpApiVersion.java | 8 +- .../cloudstack/utils/CloudStackVersion.java | 152 ++++++++------ .../utils/CloudStackVersionTest.java | 143 ++++++++++--- 13 files changed, 574 insertions(+), 290 deletions(-) delete mode 100644 utils/src/main/java/com/cloud/maint/Version.java diff --git a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseIntegrityChecker.java b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseIntegrityChecker.java index 6111fb16cf2f..bb75aacf2b66 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseIntegrityChecker.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseIntegrityChecker.java @@ -26,7 +26,8 @@ import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.maint.Version; +import org.apache.cloudstack.utils.CloudStackVersion; + import com.cloud.upgrade.dao.VersionDao; import com.cloud.utils.component.AdapterBase; import com.cloud.utils.component.ComponentLifecycle; @@ -210,7 +211,7 @@ private boolean checkMissedPremiumUpgradeFor228() { return false; } - if (Version.compare(Version.trimToPatch(dbVersion), Version.trimToPatch("2.2.8")) != 0) { + if (CloudStackVersion.compare(dbVersion, "2.2.8") != 0) { txn.commit(); return true; } diff --git a/packaging/build-deb.sh b/packaging/build-deb.sh index d8f2f8f09b09..52a168a95ba1 100755 --- a/packaging/build-deb.sh +++ b/packaging/build-deb.sh @@ -40,18 +40,104 @@ # docker run -ti -v /tmp:/src ubuntu:14.04 /bin/bash -c "apt-get update && apt-get install -y dpkg-dev python debhelper openjdk-8-jdk genisoimage python-mysql.connector maven lsb-release devscripts dh-systemd python-setuptools && /src/cloudstack/packaging/build-deb.sh" # -cd `dirname $0` -cd .. +function usage() { + cat << USAGE +Usage: ./build-deb.sh [OPTIONS]... +Package CloudStack for Debian based distribution. + +If there's a "branding" string in the POM version (e.g. x.y.z.a-NAME[-SNAPSHOT]), the branding name will +be used in the final generated pacakge like: cloudstack-management_x.y.z.a-NAME-SNAPSHOT~xenial_all.deb +note that you can override/provide "branding" string with "-b, --brand" flag as well. + +Optional arguments: + -b, --brand string Set branding to be used in package name (it will override any branding string in POM version) + -T, --use-timestamp Use epoch timestamp instead of SNAPSHOT in the package name (if not provided, use "SNAPSHOT") + +Other arguments: + -h, --help Display this help message and exit + +Examples: + build-deb.sh --use-timestamp + build-deb.sh --brand foo + +USAGE + exit 0 +} + +BRANDING="" +USE_TIMESTAMP="false" + +while [ -n "$1" ]; do + case "$1" in + -h | --help) + usage + ;; + + -b | --brand) + if [ -n "$BRANDING" ]; then + echo "ERROR: you have already entered value for -b, --brand" + exit 1 + else + BRANDING=$2 + shift 2 + fi + ;; + + -T | --use-timestamp) + if [ "$USE_TIMESTAMP" == "true" ]; then + echo "ERROR: you have already entered value for -T, --use-timestamp" + exit 1 + else + USE_TIMESTAMP="true" + shift 1 + fi + ;; + + -*|*) + echo "ERROR: no such option $1. -h or --help for help" + exit 1 + ;; + esac +done DCH=$(which dch) if [ -z "$DCH" ] ; then echo -e "dch not found, please install devscripts at first. \nDEB Build Failed" - exit + exit 1 fi +NOW="$(date +%s)" +PWD=$(cd $(dirname "$0") && pwd -P) +cd $PWD/../ + VERSION=$(head -n1 debian/changelog |awk -F [\(\)] '{print $2}') DISTCODE=$(lsb_release -sc) +if [ "$USE_TIMESTAMP" == "true" ]; then + # use timestamp instead of SNAPSHOT + if echo "$VERSION" | grep -q SNAPSHOT ; then + # apply/override branding, if provided + if [ "$BRANDING" != "" ]; then + VERSION=$(echo "$VERSION" | cut -d '-' -f 1) # remove any existing branding from POM version to be overriden + VERSION="$VERSION-$BRANDING-$NOW" + else + VERSION=`echo $VERSION | sed 's/-SNAPSHOT/-'$NOW'/g'` + fi + + branch=$(cd $PWD; git rev-parse --abbrev-ref HEAD) + (cd $PWD; ./tools/build/setnextversion.sh --version $VERSION --sourcedir . --branch $branch --no-commit) + fi +else + # apply/override branding, if provided + if [ "$BRANDING" != "" ]; then + VERSION=$(echo "$VERSION" | cut -d '-' -f 1) # remove any existing branding from POM version to be overriden + VERSION="$VERSION-$BRANDING" + + branch=$(cd $PWD; git rev-parse --abbrev-ref HEAD) + (cd $PWD; ./tools/build/setnextversion.sh --version $VERSION --sourcedir . --branch $branch --no-commit) + fi +fi + /bin/cp debian/changelog /tmp/changelog.orig dch -b -v "${VERSION}~${DISTCODE}" -u low -m "Apache CloudStack Release ${VERSION}" @@ -61,3 +147,5 @@ dpkg-checkbuilddeps dpkg-buildpackage -uc -us -b /bin/mv /tmp/changelog.orig debian/changelog + +(cd $PWD; git reset --hard) diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index ba1798e7dacb..c26143ede83f 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -24,13 +24,8 @@ Name: cloudstack Summary: CloudStack IaaS Platform #http://fedoraproject.org/wiki/PackageNamingGuidelines#Pre-Release_packages -%if "%{?_prerelease}" != "" -%define _maventag %{_ver}-SNAPSHOT +%define _maventag %{_fullver} Release: %{_rel}%{dist} -%else -%define _maventag %{_ver} -Release: %{_rel}%{dist} -%endif %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index 481c86c3baf7..23d386696cc5 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -24,13 +24,8 @@ Name: cloudstack Summary: CloudStack IaaS Platform #http://fedoraproject.org/wiki/PackageNamingGuidelines#Pre-Release_packages -%if "%{?_prerelease}" != "" -%define _maventag %{_ver}-SNAPSHOT +%define _maventag %{_fullver} Release: %{_rel}%{dist} -%else -%define _maventag %{_ver} -Release: %{_rel}%{dist} -%endif %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} diff --git a/packaging/package.sh b/packaging/package.sh index 8a8766151234..a823afadff2c 100755 --- a/packaging/package.sh +++ b/packaging/package.sh @@ -17,48 +17,68 @@ # under the License. function usage() { - echo "" - echo "usage: ./package.sh [-h|--help] -d|--distribution [-r|--release ] [-p|--pack oss|OSS|noredist|NOREDIST] [-s|--simulator default|DEFAULT|simulator|SIMULATOR]" - echo "" - echo "The supported arguments are:" - echo " To package with only redistributable libraries (default)" - echo " -p|--pack oss|OSS" - echo " To package with non-redistributable libraries" - echo " -p|--pack noredist|NOREDIST" - echo " To build a package for a distribution (mandatory)" - echo " -d|--distribution centos7|centos63|fedora20|fedora21" - echo " To set the package release version (optional)" - echo " (default is 1 for normal and prereleases, empty for SNAPSHOT)" - echo " -r|--release version(integer)" - echo " To build for Simulator (optional)" - echo " -s|--simulator default|DEFAULT|simulator|SIMULATOR" - echo " To display this information" - echo " -h|--help" - echo "" - echo "Examples: ./package.sh --pack oss" - echo " ./package.sh --pack noredist" - echo " ./package.sh --pack oss --distribution centos7 --release 42" - echo " ./package.sh --distribution centos7 --release 42" - echo " ./package.sh --distribution centos7" + cat << USAGE +Usage: ./package.sh -d DISTRO [OPTIONS]... +Package CloudStack for specific distribution and provided options. + +If there's a "branding" string in the POM version (e.g. x.y.z.a-NAME[-SNAPSHOT]), the branding name will +be used in the final generated pacakge like: cloudstack-management-x.y.z.a-NAME.NUMBER.el7.centos.x86_64 +note that you can override/provide "branding" string with "-b, --brand" flag as well. + +Mandatory arguments: + -d, --distribution string Build package for specified distribution ("centos7"|"centos63") + +Optional arguments: + -p, --pack string Define which type of libraries to package ("oss"|"OSS"|"noredist"|"NOREDIST") (default "oss") + - oss|OSS to package with only redistributable libraries + - noredist|NOREDIST to package with non-redistributable libraries + -r, --release integer Set the package release version (default is 1 for normal and prereleases, empty for SNAPSHOT) + -s, --simulator string Build package for Simulator ("default"|"DEFAULT"|"simulator"|"SIMULATOR") (default "default") + -b, --brand string Set branding to be used in package name (it will override any branding string in POM version) + -T, --use-timestamp Use epoch timestamp instead of SNAPSHOT in the package name (if not provided, use "SNAPSHOT") + +Other arguments: + -h, --help Display this help message and exit + +Examples: + package.sh --distribution centos7 + package.sh --distribution centos7 --pack oss + package.sh --distribution centos7 --pack noredist + package.sh --distribution centos7 --release 42 + package.sh --distribution centos7 --pack noredist --release 42 + +USAGE + exit 0 } +PWD=$(cd $(dirname "$0") && pwd -P) +NOW="$(date +%s)" + # packaging # $1 redist flag # $2 simulator flag # $3 distribution name # $4 package release version +# $5 brand string to apply/override +# $6 use timestamp flag function packaging() { - CWD=$(pwd) - RPMDIR=$CWD/../dist/rpmbuild + RPMDIR=$PWD/../dist/rpmbuild PACK_PROJECT=cloudstack + if [ -n "$1" ] ; then DEFOSSNOSS="-D_ossnoss $1" fi if [ -n "$2" ] ; then DEFSIM="-D_sim $2" fi + if [ "$6" == "true" ]; then + INDICATOR="$NOW" + else + INDICATOR="SNAPSHOT" + fi DISTRO=$3 + MVN=$(which mvn) if [ -z "$MVN" ] ; then MVN=$(locate bin/mvn | grep -e mvn$ | tail -1) @@ -67,24 +87,63 @@ function packaging() { exit 2 fi fi - VERSION=$(cd ../; $MVN org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep --color=none '^[0-9]\.') + + VERSION=$(cd $PWD/../; $MVN org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep --color=none '^[0-9]\.') + REALVER=$(echo "$VERSION" | cut -d '-' -f 1) + + if [ -n "$5" ]; then + BRAND="${5}." + else + BASEVER=$(echo "$VERSION" | sed 's/-SNAPSHOT//g') + BRAND=$(echo "$BASEVER" | cut -d '-' -f 2) + + if [ "$REALVER" != "$BRAND" ]; then + BRAND="${BRAND}." + else + BRAND="" + fi + fi + if echo "$VERSION" | grep -q SNAPSHOT ; then - REALVER=$(echo "$VERSION" | cut -d '-' -f 1) if [ -n "$4" ] ; then - DEFPRE="-D_prerelease $4" - DEFREL="-D_rel SNAPSHOT$4" + DEFREL="-D_rel ${BRAND}${INDICATOR0}.$4" else - DEFPRE="-D_prerelease 1" - DEFREL="-D_rel SNAPSHOT" + DEFREL="-D_rel ${BRAND}${INDICATOR}" fi else - REALVER="$VERSION" if [ -n "$4" ] ; then - DEFREL="-D_rel $4" + DEFREL="-D_rel ${BRAND}$4" else - DEFREL="-D_rel 1" + DEFREL="-D_rel ${BRAND}1" fi fi + + if [ "$USE_TIMESTAMP" == "true" ]; then + # use timestamp instead of SNAPSHOT + if echo "$VERSION" | grep -q SNAPSHOT ; then + # apply/override branding, if provided + if [ "$BRANDING" != "" ]; then + VERSION=$(echo "$VERSION" | cut -d '-' -f 1) # remove any existing branding from POM version to be overriden + VERSION="$VERSION-$BRANDING-$NOW" + else + VERSION=`echo $VERSION | sed 's/-SNAPSHOT/-'$NOW'/g'` + fi + + branch=$(cd $PWD/../; git rev-parse --abbrev-ref HEAD) + (cd $PWD/../; ./tools/build/setnextversion.sh --version $VERSION --sourcedir . --branch $branch --no-commit) + fi + else + # apply/override branding, if provided + if [ "$BRANDING" != "" ]; then + VERSION=$(echo "$VERSION" | cut -d '-' -f 1) # remove any existing branding from POM version to be overriden + VERSION="$VERSION-$BRANDING" + + branch=$(cd $PWD/../; git rev-parse --abbrev-ref HEAD) + (cd $PWD/../; ./tools/build/setnextversion.sh --version $VERSION --sourcedir . --branch $branch --no-commit) + fi + fi + + DEFFULLVER="-D_fullver $VERSION" DEFVER="-D_ver $REALVER" echo "Preparing to package Apache CloudStack $VERSION" @@ -96,13 +155,14 @@ function packaging() { mkdir -p "$RPMDIR/SOURCES/$PACK_PROJECT-$VERSION" echo ". preparing source tarball" - (cd ../; tar -c --exclude .git --exclude dist . | tar -C "$RPMDIR/SOURCES/$PACK_PROJECT-$VERSION" -x ) + (cd $PWD/../; tar -c --exclude .git --exclude dist . | tar -C "$RPMDIR/SOURCES/$PACK_PROJECT-$VERSION" -x ) (cd "$RPMDIR/SOURCES/"; tar -czf "$PACK_PROJECT-$VERSION.tgz" "$PACK_PROJECT-$VERSION") echo ". executing rpmbuild" - cp "$DISTRO/cloud.spec" "$RPMDIR/SPECS" + cp "$PWD/$DISTRO/cloud.spec" "$RPMDIR/SPECS" - (cd "$RPMDIR"; rpmbuild --define "_topdir ${RPMDIR}" "${DEFVER}" "${DEFREL}" ${DEFPRE+"$DEFPRE"} ${DEFOSSNOSS+"$DEFOSSNOSS"} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec) + (cd "$RPMDIR"; rpmbuild --define "_topdir ${RPMDIR}" "${DEFVER}" "${DEFFULLVER}" "${DEFREL}" ${DEFPRE+"$DEFPRE"} ${DEFOSSNOSS+"$DEFOSSNOSS"} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec) + (cd $PWD/../; git reset --hard) if [ $? -ne 0 ]; then echo "RPM Build Failed " exit 3 @@ -116,22 +176,20 @@ TARGETDISTRO="" SIM="" PACKAGEVAL="" RELEASE="" +BRANDING="" +USE_TIMESTAMP="false" -SHORTOPTS="hp:s:d:r:" -LONGOPTS="help,pack:simulator:distribution:release:" -ARGS=$(getopt -s bash -u -a --options "$SHORTOPTS" --longoptions "$LONGOPTS" --name "$0" -- "$@") -eval set -- "$ARGS" -echo "$ARGS" -while [ $# -gt 0 ] ; do +unrecognized_flags="" + +while [ -n "$1" ]; do case "$1" in -h | --help) usage exit 0 ;; + -p | --pack) - echo "Packaging CloudStack..." PACKAGEVAL=$2 - echo "$PACKAGEVAL" if [ "$PACKAGEVAL" == "oss" -o "$PACKAGEVAL" == "OSS" ] ; then PACKAGEVAL="" elif [ "$PACKAGEVAL" == "noredist" -o "$PACKAGEVAL" == "NOREDIST" ] ; then @@ -141,11 +199,11 @@ while [ $# -gt 0 ] ; do usage exit 1 fi - shift + shift 2 ;; + -s | --simulator) SIM=$2 - echo "$SIM" if [ "$SIM" == "default" -o "$SIM" == "DEFAULT" ] ; then SIM="false" elif [ "$SIM" == "simulator" -o "$SIM" == "SIMULATOR" ] ; then @@ -155,8 +213,9 @@ while [ $# -gt 0 ] ; do usage exit 1 fi - shift + shift 2 ;; + -d | --distribution) TARGETDISTRO=$2 if [ -z "$TARGETDISTRO" ] ; then @@ -164,22 +223,41 @@ while [ $# -gt 0 ] ; do usage exit 1 fi - shift + shift 2 ;; + -r | --release) RELEASE=$2 - shift + shift 2 ;; - -) - echo "Error: Unrecognized option" - usage - exit 1 + + -b | --brand) + BRANDING=$2 + shift 2 ;; + + -T | --use-timestamp) + USE_TIMESTAMP="true" + shift 1 + ;; + + -*) + unrecognized_flags="${unrecognized_flags}$1 " + shift 1 + ;; + *) - shift + shift 1 ;; esac done -packaging "$PACKAGEVAL" "$SIM" "$TARGETDISTRO" "$RELEASE" +if [ -n "$unrecognized_flags" ]; then + echo "Warning: Unrecognized option(s) found \" ${unrecognized_flags}\"" + echo " You're advised to fix your build job scripts and prevent using these" + echo " flags, as in the future release(s) they will break packaging script." + echo "" +fi +echo "Packaging CloudStack..." +packaging "$PACKAGEVAL" "$SIM" "$TARGETDISTRO" "$RELEASE" "$BRANDING" "$USE_TIMESTAMP" diff --git a/server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java index e3d1e30d3484..729ef2b6c795 100644 --- a/server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java @@ -21,16 +21,17 @@ import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.api.response.NicResponse; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; +import org.apache.cloudstack.utils.CloudStackVersion; import com.cloud.api.ApiResponseHelper; import com.cloud.api.query.vo.DomainRouterJoinVO; -import com.cloud.maint.Version; import com.cloud.network.Networks.TrafficType; import com.cloud.network.router.VirtualRouter; import com.cloud.network.router.VirtualRouter.Role; @@ -78,9 +79,9 @@ public DomainRouterResponse newDomainRouterResponse(DomainRouterJoinVO router, A routerResponse.setIsRedundantRouter(router.isRedundantRouter()); routerResponse.setRedundantState(router.getRedundantState().toString()); if (router.getTemplateVersion() != null) { - String routerVersion = Version.trimRouterVersion(router.getTemplateVersion()); + String routerVersion = CloudStackVersion.trimRouterVersion(router.getTemplateVersion()); routerResponse.setVersion(routerVersion); - routerResponse.setRequiresUpgrade((Version.compare(routerVersion, NetworkOrchestrationService.MinVRVersion.valueIn(router.getDataCenterId())) < 0)); + routerResponse.setRequiresUpgrade((CloudStackVersion.compare(routerVersion, NetworkOrchestrationService.MinVRVersion.valueIn(router.getDataCenterId())) < 0)); } else { routerResponse.setVersion("UNKNOWN"); routerResponse.setRequiresUpgrade(true); diff --git a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java index fa17e7bc3159..5c84527317a5 100644 --- a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java +++ b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java @@ -27,12 +27,14 @@ import javax.annotation.PostConstruct; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.cloud.network.router.deployment.RouterDeploymentDefinition; + import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; -import org.cloud.network.router.deployment.RouterDeploymentDefinition; +import org.apache.cloudstack.utils.CloudStackVersion; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -61,7 +63,6 @@ import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.maint.Version; import com.cloud.network.IpAddressManager; import com.cloud.network.Network; import com.cloud.network.NetworkModel; @@ -265,8 +266,8 @@ public boolean checkRouterVersion(final VirtualRouter router) { return false; } final long dcid = router.getDataCenterId(); - final String trimmedVersion = Version.trimRouterVersion(router.getTemplateVersion()); - return Version.compare(trimmedVersion, NetworkOrchestrationService.MinVRVersion.valueIn(dcid)) >= 0; + String routerVersion = CloudStackVersion.trimRouterVersion(router.getTemplateVersion()); + return CloudStackVersion.compare(routerVersion, NetworkOrchestrationService.MinVRVersion.valueIn(dcid)) >= 0; } protected DomainRouterVO start(DomainRouterVO router, final User user, final Account caller, final Map params, final DeploymentPlan planToDeploy) diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh index 8b1032ecc8b2..893404da5313 100755 --- a/tools/appliance/build.sh +++ b/tools/appliance/build.sh @@ -34,8 +34,12 @@ Usage: END exit 0 } -echo $@ | grep help >/dev/null && usage -echo $@ | grep '\-h' >/dev/null && usage + +for i in $@; do + if [ "$i" == "-h" -o "$i" == "--help" -o "$i" == "help" ]; then + usage + fi +done # requires 32-bit vhd-util and faketime binaries to be available (even for 64 bit builds) # Something like (on centos 6.5)... @@ -194,8 +198,10 @@ function create_definition() { cp -r "${appliance}" "${appliance_build_name}" set +e if [ ! -z "${version}" ]; then - sed ${sed_regex_option} -i -e "s/^CLOUDSTACK_RELEASE=.+/CLOUDSTACK_RELEASE=${version}/" \ - "${appliance_build_name}/configure_systemvm_services.sh" + if [ -f "${appliance_build_name}/scripts/configure_systemvm_services.sh" ]; then + sed ${sed_regex_option} -i -e "s/^CLOUDSTACK_RELEASE=.+/CLOUDSTACK_RELEASE=${version}/" \ + "${appliance_build_name}/scripts/configure_systemvm_services.sh" + fi fi set -e add_on_exit rm -rf "${appliance_build_name}" @@ -215,7 +221,7 @@ function packer_build() { cd ${appliance_build_name} && packer build template.json && cd .. } -function stage_vmx (){ +function stage_vmx() { cat << VMXFILE > "${1}.vmx" .encoding = "UTF-8" displayname = "${1}" diff --git a/tools/build/setnextversion.sh b/tools/build/setnextversion.sh index 2387b8926bc0..b4bf9145d656 100755 --- a/tools/build/setnextversion.sh +++ b/tools/build/setnextversion.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # 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 @@ -16,60 +16,125 @@ # specific language governing permissions and limitations # under the License. -version='TESTBUILD' -sourcedir=~/cloudstack/ -branch='master' +set -e -usage(){ - echo "usage: $0 -v version [-b branch] [-s source dir] [-h]" - echo " -v sets the version" - echo " -b sets the branch (defaults to 'master')" - echo " -s sets the source directory (defaults to $sourcedir)" - echo " -h" +usage() { + cat << USAGE +Usage: setnextversion.sh --version string [OPTIONS]... +Set the next version of CloudStack in the POMs. + +Mandatory arguments: + -v, --version string Set the next version to be applied + +Optional arguments: + -b, --branch string Set the branch to update the version into (default "master") + -s, --sourcedir string Set the source directory to clone repo into (default "$sourcedir") + -n, --no-commit Apply only the version change and don't git commit them (default "false") + +Other arguments: + -h, --help Display this help message and exit + +Examples: + setnextversion.sh --version x.y.z.a-SNAPSHOT + setnextversion.sh --version x.y.z.a-SNAPSHOT --branch foo-feature + setnextversion.sh --version x.y.z.a-SNAPSHOT --sourcedir /path/to/cloudstack/repo + setnextversion.sh --version x.y.z.a-SNAPSHOT --no-commit + +USAGE + exit 0 } -while getopts v:s:b:h opt -do - case "$opt" in - v) version="$OPTARG";; - s) sourcedir="$OPTARG";; - b) branch="$OPTARG";; - h) usage - exit 0;; - /?) # unknown flag - usage - exit 1;; +while [ -n "$1" ]; do + case "$1" in + -h | --help) + usage + ;; + + -v | --version) + if [ -n "$version" ]; then + echo "ERROR: you have already entered value for -v, --version" + exit 1 + else + version=$2 + shift 2 + fi + ;; + + -b | --branch) + if [ -n "$branch" ]; then + echo "ERROR: you have already entered value for -b, --branch" + exit 1 + else + branch=$2 + shift 2 + fi + ;; + + -s | --sourcedir) + if [ -n "$sourcedir" ]; then + echo "ERROR: you have already entered value for -s, --sourcedir" + exit 1 + else + sourcedir=$2 + shift 2 + fi + ;; + + -n | --no-commit) + if [ "$nocommit" == "true" ]; then + echo "ERROR: you have already entered value for -n, --no-commit" + exit 1 + else + nocommit="true" + shift 1 + fi + ;; + + -*|*) + echo "ERROR: no such option $1. -h or --help for help" + exit 1 + ;; esac done -shift `expr $OPTIND - 1` -if [ $version == 'TESTBUILD' ]; then - echo >&2 "A version must be specified with the -v option: $0 -v 4.0.0.RC1" +if [ -z "$version" ]; then + echo >&2 "A version must be specified with the -v, --version option: $0 -v 4.0.0.RC1" exit 1 fi -echo "Using version: $version" -echo "Using source directory: $sourcedir" -echo "Using branch: $branch" +if [ -z "$branch" ]; then + branch="master" +fi + +if [ -z "$sourcedir" ]; then + sourcedir="~/cloudstack/" +fi + +if [ -z "$nocommit" ]; then + nocommit="false" +fi + +echo "Using version : $version" +echo "Using source directory : $sourcedir" +echo "Using branch : $branch" cd $sourcedir -echo 'checking out correct branch' +echo "checking out correct branch" git checkout $branch -echo 'determining current mvn version' +echo "determining current POM version" export currentversion=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['` echo "found $currentversion" -echo 'setting version numbers' -mvn versions:set -DnewVersion=$version -P vmware -P developer -P systemvm -P simulator -P baremetal -P ucs -Dnoredist -mv deps/XenServerJava/pom.xml.versionsBackup deps/XenServerJava/pom.xml -perl -pi -e "s/$currentversion/$version/" deps/XenServerJava/pom.xml +echo "setting new version numbers" +mvn versions:set -DnewVersion=$version -P vmware -P developer -P systemvm -P simulator -Dnoredist versions:commit + perl -pi -e "s/$currentversion/$version/" tools/apidoc/pom.xml perl -pi -e "s/$currentversion/$version/" debian/changelog perl -pi -e "s/$currentversion/$version/" tools/marvin/setup.py perl -pi -e "s/$currentversion/$version/" services/iam/plugin/pom.xml -perl -pi -e "s/$currentversion/$version/" services/iam/pom.xm +perl -pi -e "s/$currentversion/$version/" services/iam/pom.xml perl -pi -e "s/$currentversion/$version/" services/iam/server/pom.xml perl -pi -e "s/$currentversion/$version/" tools/checkstyle/pom.xml perl -pi -e "s/$currentversion/$version/" services/console-proxy/plugin/pom.xml @@ -85,8 +150,10 @@ perl -pi -e "s/Marvin-(.*).tar.gz/Marvin-${version}.tar.gz/" tools/docker/Docker git clean -f -echo 'commit changes' -git commit -a -s -m "Updating pom.xml version numbers for release $version" -export commitsh=`git show HEAD | head -n 1 | cut -d ' ' -f 2` +if [ "$nocommit" == "false" ]; then + echo "commit changes" + git commit -a -s -m "Updating pom.xml version numbers for release $version" + export commitsh=`git show HEAD | head -n 1 | cut -d ' ' -f 2` -echo "committed as $commitsh" + echo "committed as $commitsh" +fi diff --git a/utils/src/main/java/com/cloud/maint/Version.java b/utils/src/main/java/com/cloud/maint/Version.java deleted file mode 100644 index 925806e3a05c..000000000000 --- a/utils/src/main/java/com/cloud/maint/Version.java +++ /dev/null @@ -1,77 +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.maint; - -public class Version { - /** - * Compares two version strings and see which one is higher version. - * @param ver1 - * @param ver2 - * @return positive if ver1 is higher. negative if ver1 is lower; zero if the same. - */ - public static int compare(String ver1, String ver2) { - String[] tokens1 = ver1.split("[.]"); - String[] tokens2 = ver2.split("[.]"); -// assert(tokens1.length <= tokens2.length); - - int compareLength = Math.min(tokens1.length, tokens2.length); - for (int i = 0; i < compareLength; i++) { - long version1 = Long.parseLong(tokens1[i]); - long version2 = Long.parseLong(tokens2[i]); - if (version1 != version2) { - return version1 < version2 ? -1 : 1; - } - } - - if (tokens1.length > tokens2.length) { - return 1; - } else if (tokens1.length < tokens2.length) { - return -1; - } - - return 0; - } - - public static String trimToPatch(String version) { - int index = version.indexOf("-"); - - if (index > 0) - version = version.substring(0, index); - - String[] tokens = version.split("[.]"); - - if (tokens.length < 3) - return "0"; - return tokens[0] + "." + tokens[1] + "." + tokens[2]; - } - - public static String trimRouterVersion(String version) { - String[] tokens = version.split(" "); - if (tokens.length >= 3 && tokens[2].matches("[0-9]+(\\.[0-9]+)*")) { - return tokens[2]; - } - return "0"; - } - - public static void main(String[] args) { - System.out.println("Result is " + compare(args[0], args[1])); - } - -} diff --git a/utils/src/main/java/com/cloud/utils/nicira/nvp/plugin/NiciraNvpApiVersion.java b/utils/src/main/java/com/cloud/utils/nicira/nvp/plugin/NiciraNvpApiVersion.java index 4dfd4e2b62a5..9090de755a3e 100755 --- a/utils/src/main/java/com/cloud/utils/nicira/nvp/plugin/NiciraNvpApiVersion.java +++ b/utils/src/main/java/com/cloud/utils/nicira/nvp/plugin/NiciraNvpApiVersion.java @@ -21,7 +21,7 @@ import org.apache.log4j.Logger; -import com.cloud.maint.Version; +import org.apache.cloudstack.utils.CloudStackVersion; public class NiciraNvpApiVersion { private static final Logger s_logger = Logger.getLogger(NiciraNvpApiVersion.class); @@ -33,8 +33,10 @@ public static synchronized void setNiciraApiVersion(String apiVersion){ } public static synchronized boolean isApiVersionLowerThan(String apiVersion){ - if (niciraApiVersion == null) return false; - int compare = Version.compare(niciraApiVersion, apiVersion); + if (niciraApiVersion == null) { + return false; + } + int compare = CloudStackVersion.compare(niciraApiVersion, apiVersion); return (compare < 0); } diff --git a/utils/src/main/java/org/apache/cloudstack/utils/CloudStackVersion.java b/utils/src/main/java/org/apache/cloudstack/utils/CloudStackVersion.java index 035f69e89382..8bd2b6f9bf24 100644 --- a/utils/src/main/java/org/apache/cloudstack/utils/CloudStackVersion.java +++ b/utils/src/main/java/org/apache/cloudstack/utils/CloudStackVersion.java @@ -39,16 +39,39 @@ */ public final class CloudStackVersion implements Comparable { - private final static Pattern VERSION_FORMAT = Pattern.compile("(\\d+\\.){2}(\\d+\\.)?\\d+"); + private final static Pattern NUMBER_VERSION_FORMAT = Pattern.compile("(\\d+\\.){2}(\\d+\\.)?\\d+"); + private final static Pattern FULL_VERSION_FORMAT = Pattern.compile("(\\d+\\.){2}(\\d+\\.)?\\d+(-[a-zA-Z]+)?(-\\d+)?(-SNAPSHOT)?"); + + private final int majorRelease; + private final int minorRelease; + private final int patchRelease; + private final Integer securityRelease; + + private CloudStackVersion(final int majorRelease, final int minorRelease, final int patchRelease, final Integer securityRelease) { + + super(); + + checkArgument(majorRelease >= 0, CloudStackVersion.class.getName() + "(int, int, int, Integer) requires a majorRelease greater than 0."); + checkArgument(minorRelease >= 0, CloudStackVersion.class.getName() + "(int, int, int, Integer) requires a minorRelease greater than 0."); + checkArgument(patchRelease >= 0, CloudStackVersion.class.getName() + "(int, int, int, Integer) requires a patchRelease greater than 0."); + checkArgument((securityRelease != null && securityRelease >= 0) || (securityRelease == null), + CloudStackVersion.class.getName() + "(int, int, int, Integer) requires a null securityRelease or a non-null value greater than 0."); + + this.majorRelease = majorRelease; + this.minorRelease = minorRelease; + this.patchRelease = patchRelease; + this.securityRelease = securityRelease; + + } /** * * Parses a String representation of a version that conforms one of the following * formats into a CloudStackVersion instance: *
    - *
  • ..
    • - *
  • ...
    • - *
  • ...-
    • + *
  • <major>.<minor>.<patch>.<security>
    • + *
  • <major>.<minor>.<patch>.<security>.<security>
    • + *
  • <major>.<minor>.<patch>.<security>.<security>-<any string>
    • *
* * If the string contains a suffix that begins with a "-" character, then the "-" and all characters following it @@ -67,7 +90,7 @@ public static CloudStackVersion parse(final String value) { final String trimmedValue = substringBefore(value, "-"); checkArgument(isNotBlank(trimmedValue), CloudStackVersion.class.getName() + ".parse(String) requires a non-blank value"); - checkArgument(VERSION_FORMAT.matcher(trimmedValue).matches(), CloudStackVersion.class.getName() + "parse(String) passed " + + checkArgument(NUMBER_VERSION_FORMAT.matcher(trimmedValue).matches(), CloudStackVersion.class.getName() + ".parse(String) passed " + value + ", but requires a value in the format of int.int.int(.int)(-)"); final String[] components = trimmedValue.split("\\."); @@ -84,39 +107,20 @@ public static CloudStackVersion parse(final String value) { } - private final int majorRelease; - private final int minorRelease; - private final int patchRelease; - private final Integer securityRelease; - - private CloudStackVersion(final int majorRelease, final int minorRelease, final int patchRelease, final Integer securityRelease) { - - super(); - - checkArgument(majorRelease >= 0, CloudStackVersion.class.getName() + "(int, int, int, Integer) requires a majorRelease greater than 0."); - checkArgument(minorRelease >= 0, CloudStackVersion.class.getName() + "(int, int, int, Integer) requires a minorRelease greater than 0."); - checkArgument(patchRelease >= 0, CloudStackVersion.class.getName() + "(int, int, int, Integer) requires a patchRelease greater than 0."); - checkArgument((securityRelease != null && securityRelease >= 0) || (securityRelease == null), - CloudStackVersion.class.getName() + "(int, int, int, Integer) requires a null securityRelease or a non-null value greater than 0."); - - this.majorRelease = majorRelease; - this.minorRelease = minorRelease; - this.patchRelease = patchRelease; - this.securityRelease = securityRelease; - - } - - private static ImmutableList normalizeVersionValues(final ImmutableList values) { - - checkArgument(values != null); - checkArgument(values.size() == 3 || values.size() == 4); - - if (values.size() == 3) { - return ImmutableList.builder().addAll(values).add(0).build(); - } - - return values; - + /** + * Shortcut method to {@link #parse(String)} and {@link #compareTo(CloudStackVersion)} two versions + * + * @param version1 the first value to be parsed and compared + * @param version2 the second value to be parsed and compared + * + * @return A value less than zero (0) indicates version1 is less than version2. A value + * equal to zero (0) indicates version1 equals version2. A value greater than zero (0) + * indicates version1 is greater than version2. + * + * @since 4.12.0.0 + */ + public static int compare(String version1, String version2) { + return parse(version1).compareTo(parse(version2)); } /** @@ -125,7 +129,7 @@ private static ImmutableList normalizeVersionValues(final ImmutableList * A couple of notes about the comparison rules for this method: *
').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(), -top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle= -this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne", -nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d
');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor== -String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),l=0;l=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,l);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection(); -this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){if(!a.disabled){e(this).removeClass("ui-resizable-autohide");b._handles.show()}},function(){if(!a.disabled)if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy(); -var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a= -false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"}); -this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff= -{width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis]; -if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);this._updateVirtualBoundaries(b.shiftKey);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false}, -_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;f=f?0:c.sizeDiff.width;f={width:c.helper.width()-f,height:c.helper.height()-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f, -{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",b);this._helper&&this.helper.remove();return false},_updateVirtualBoundaries:function(b){var a=this.options,c,d,f;a={minWidth:k(a.minWidth)?a.minWidth:0,maxWidth:k(a.maxWidth)?a.maxWidth:Infinity,minHeight:k(a.minHeight)?a.minHeight:0,maxHeight:k(a.maxHeight)?a.maxHeight: -Infinity};if(this._aspectRatio||b){b=a.minHeight*this.aspectRatio;d=a.minWidth/this.aspectRatio;c=a.maxHeight*this.aspectRatio;f=a.maxWidth/this.aspectRatio;if(b>a.minWidth)a.minWidth=b;if(d>a.minHeight)a.minHeight=d;if(cb.width,h=k(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,l=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&l)b.left=i-a.minWidth;if(d&&l)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left= -null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+ -a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+ -c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]); -b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.14"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(), -10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top- -f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var l=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:l.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(l.css("position"))){c._revertToRelativePosition=true;l.css({position:"absolute",top:"auto",left:"auto"})}l.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType? -e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a= -e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing, -step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement= -e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top","Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset; -var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left: -a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top- -d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition, -f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25, -display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b= -e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height= -d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},k=function(b){return!isNaN(parseInt(b,10))}})(jQuery); -;/* - * jQuery UI Selectable 1.8.14 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Selectables - * - * Depends: - * jquery.ui.core.js - * jquery.ui.mouse.js - * jquery.ui.widget.js - */ -(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"), -selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("
")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX, -c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting", -c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d= -this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.righti||a.bottomb&&a.rightg&&a.bottom *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var a=this.options;this.containerCache={};this.element.addClass("ui-sortable"); -this.refresh();this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a=== -"disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&& -!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top, -left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]}; -this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!= -document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a); -return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0], -e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset(); -c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"): -this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null, -dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):d(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")}, -toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+jg&&b+la[this.floating?"width":"height"]?j:g0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith(); -if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), -this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=this.currentItem.find(":data(sortable-item)"),b=0;b=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h=0;b--){var c=this.items[b];if(!(c.instance!=this.currentContainer&&this.currentContainer&&c.item[0]!=this.currentItem[0])){var e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b= -this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f= -d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")|| -0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out", -a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h- -f)this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g- -this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.topthis.containment[3])?g:!(g-this.offset.click.topthis.containment[2])?f:!(f-this.offset.click.left=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this, -this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop", -a,this._uiHash());for(e=0;e li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var a=this,b=a.options;a.running=0;a.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix"); -a.headers=a.element.find(b.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){b.disabled||c(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){b.disabled||c(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){b.disabled||c(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){b.disabled||c(this).removeClass("ui-state-focus")});a.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom"); -if(b.navigation){var d=a.element.find("a").filter(b.navigationFilter).eq(0);if(d.length){var h=d.closest(".ui-accordion-header");a.active=h.length?h:d.closest(".ui-accordion-content").prev()}}a.active=a._findActive(a.active||b.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");a.active.next().addClass("ui-accordion-content-active");a._createIcons();a.resize();a.element.attr("role","tablist");a.headers.attr("role","tab").bind("keydown.accordion", -function(f){return a._keydown(f)}).next().attr("role","tabpanel");a.headers.not(a.active||"").attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).next().hide();a.active.length?a.active.attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):a.headers.eq(0).attr("tabIndex",0);c.browser.safari||a.headers.find("a").attr("tabIndex",-1);b.event&&a.headers.bind(b.event.split(" ").join(".accordion ")+".accordion",function(f){a._clickHandler.call(a,f,this);f.preventDefault()})},_createIcons:function(){var a= -this.options;if(a.icons){c("").addClass("ui-icon "+a.icons.header).prependTo(this.headers);this.active.children(".ui-icon").toggleClass(a.icons.header).toggleClass(a.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var a=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("tabIndex"); -this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var b=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(a.autoHeight||a.fillHeight)b.css("height","");return c.Widget.prototype.destroy.call(this)},_setOption:function(a,b){c.Widget.prototype._setOption.apply(this,arguments);a=="active"&&this.activate(b);if(a=="icons"){this._destroyIcons(); -b&&this._createIcons()}if(a=="disabled")this.headers.add(this.headers.next())[b?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(a){if(!(this.options.disabled||a.altKey||a.ctrlKey)){var b=c.ui.keyCode,d=this.headers.length,h=this.headers.index(a.target),f=false;switch(a.keyCode){case b.RIGHT:case b.DOWN:f=this.headers[(h+1)%d];break;case b.LEFT:case b.UP:f=this.headers[(h-1+d)%d];break;case b.SPACE:case b.ENTER:this._clickHandler({target:a.target},a.target); -a.preventDefault()}if(f){c(a.target).attr("tabIndex",-1);c(f).attr("tabIndex",0);f.focus();return false}return true}},resize:function(){var a=this.options,b;if(a.fillSpace){if(c.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}b=this.element.parent().height();c.browser.msie&&this.element.parent().css("overflow",d);this.headers.each(function(){b-=c(this).outerHeight(true)});this.headers.next().each(function(){c(this).height(Math.max(0,b-c(this).innerHeight()+ -c(this).height()))}).css("overflow","auto")}else if(a.autoHeight){b=0;this.headers.next().each(function(){b=Math.max(b,c(this).height("").height())}).height(b)}return this},activate:function(a){this.options.active=a;a=this._findActive(a)[0];this._clickHandler({target:a},a);return this},_findActive:function(a){return a?typeof a==="number"?this.headers.filter(":eq("+a+")"):this.headers.not(this.headers.not(a)):a===false?c([]):this.headers.filter(":eq(0)")},_clickHandler:function(a,b){var d=this.options; -if(!d.disabled)if(a.target){a=c(a.currentTarget||b);b=a[0]===this.active[0];d.active=d.collapsible&&b?false:this.headers.index(a);if(!(this.running||!d.collapsible&&b)){var h=this.active;j=a.next();g=this.active.next();e={options:d,newHeader:b&&d.collapsible?c([]):a,oldHeader:this.active,newContent:b&&d.collapsible?c([]):j,oldContent:g};var f=this.headers.index(this.active[0])>this.headers.index(a[0]);this.active=b?c([]):a;this._toggle(j,g,e,b,f);h.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header); -if(!b){a.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected);a.next().addClass("ui-accordion-content-active")}}}else if(d.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);this.active.next().addClass("ui-accordion-content-active");var g=this.active.next(), -e={options:d,newHeader:c([]),oldHeader:d.active,newContent:c([]),oldContent:g},j=this.active=c([]);this._toggle(j,g,e)}},_toggle:function(a,b,d,h,f){var g=this,e=g.options;g.toShow=a;g.toHide=b;g.data=d;var j=function(){if(g)return g._completed.apply(g,arguments)};g._trigger("changestart",null,g.data);g.running=b.size()===0?a.size():b.size();if(e.animated){d={};d=e.collapsible&&h?{toShow:c([]),toHide:b,complete:j,down:f,autoHeight:e.autoHeight||e.fillSpace}:{toShow:a,toHide:b,complete:j,down:f,autoHeight:e.autoHeight|| -e.fillSpace};if(!e.proxied)e.proxied=e.animated;if(!e.proxiedDuration)e.proxiedDuration=e.duration;e.animated=c.isFunction(e.proxied)?e.proxied(d):e.proxied;e.duration=c.isFunction(e.proxiedDuration)?e.proxiedDuration(d):e.proxiedDuration;h=c.ui.accordion.animations;var i=e.duration,k=e.animated;if(k&&!h[k]&&!c.easing[k])k="slide";h[k]||(h[k]=function(l){this.slide(l,{easing:k,duration:i||700})});h[k](d)}else{if(e.collapsible&&h)a.toggle();else{b.hide();a.show()}j(true)}b.prev().attr({"aria-expanded":"false", -"aria-selected":"false",tabIndex:-1}).blur();a.prev().attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");if(this.toHide.length)this.toHide.parent()[0].className=this.toHide.parent()[0].className;this._trigger("change",null,this.data)}}});c.extend(c.ui.accordion,{version:"1.8.14", -animations:{slide:function(a,b){a=c.extend({easing:"swing",duration:300},a,b);if(a.toHide.size())if(a.toShow.size()){var d=a.toShow.css("overflow"),h=0,f={},g={},e;b=a.toShow;e=b[0].style.width;b.width(parseInt(b.parent().width(),10)-parseInt(b.css("paddingLeft"),10)-parseInt(b.css("paddingRight"),10)-(parseInt(b.css("borderLeftWidth"),10)||0)-(parseInt(b.css("borderRightWidth"),10)||0));c.each(["height","paddingTop","paddingBottom"],function(j,i){g[i]="hide";j=(""+c.css(a.toShow[0],i)).match(/^([\d+-.]+)(.*)$/); -f[i]={value:j[1],unit:j[2]||"px"}});a.toShow.css({height:0,overflow:"hidden"}).show();a.toHide.filter(":hidden").each(a.complete).end().filter(":visible").animate(g,{step:function(j,i){if(i.prop=="height")h=i.end-i.start===0?0:(i.now-i.start)/(i.end-i.start);a.toShow[0].style[i.prop]=h*f[i.prop].value+f[i.prop].unit},duration:a.duration,easing:a.easing,complete:function(){a.autoHeight||a.toShow.css("height","");a.toShow.css({width:e,overflow:d});a.complete()}})}else a.toHide.animate({height:"hide", -paddingTop:"hide",paddingBottom:"hide"},a);else a.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},a)},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1E3:200})}}})})(jQuery); -;/* - * jQuery UI Autocomplete 1.8.14 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Autocomplete - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - * jquery.ui.position.js - */ -(function(d){var e=0;d.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:false,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var a=this,b=this.element[0].ownerDocument,g;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!(a.options.disabled||a.element.attr("readonly"))){g= -false;var f=d.ui.keyCode;switch(c.keyCode){case f.PAGE_UP:a._move("previousPage",c);break;case f.PAGE_DOWN:a._move("nextPage",c);break;case f.UP:a._move("previous",c);c.preventDefault();break;case f.DOWN:a._move("next",c);c.preventDefault();break;case f.ENTER:case f.NUMPAD_ENTER:if(a.menu.active){g=true;c.preventDefault()}case f.TAB:if(!a.menu.active)return;a.menu.select(c);break;case f.ESCAPE:a.element.val(a.term);a.close(c);break;default:clearTimeout(a.searching);a.searching=setTimeout(function(){if(a.term!= -a.element.val()){a.selectedItem=null;a.search(null,c)}},a.options.delay);break}}}).bind("keypress.autocomplete",function(c){if(g){g=false;c.preventDefault()}}).bind("focus.autocomplete",function(){if(!a.options.disabled){a.selectedItem=null;a.previous=a.element.val()}}).bind("blur.autocomplete",function(c){if(!a.options.disabled){clearTimeout(a.searching);a.closing=setTimeout(function(){a.close(c);a._change(c)},150)}});this._initSource();this.response=function(){return a._response.apply(a,arguments)}; -this.menu=d("
    ").addClass("ui-autocomplete").appendTo(d(this.options.appendTo||"body",b)[0]).mousedown(function(c){var f=a.menu.element[0];d(c.target).closest(".ui-menu-item").length||setTimeout(function(){d(document).one("mousedown",function(h){h.target!==a.element[0]&&h.target!==f&&!d.ui.contains(f,h.target)&&a.close()})},1);setTimeout(function(){clearTimeout(a.closing)},13)}).menu({focus:function(c,f){f=f.item.data("item.autocomplete");false!==a._trigger("focus",c,{item:f})&&/^key/.test(c.originalEvent.type)&& -a.element.val(f.value)},selected:function(c,f){var h=f.item.data("item.autocomplete"),i=a.previous;if(a.element[0]!==b.activeElement){a.element.focus();a.previous=i;setTimeout(function(){a.previous=i;a.selectedItem=h},1)}false!==a._trigger("select",c,{item:h})&&a.element.val(h.value);a.term=a.element.val();a.close(c);a.selectedItem=h},blur:function(){a.menu.element.is(":visible")&&a.element.val()!==a.term&&a.element.val(a.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu"); -d.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");this.menu.element.remove();d.Widget.prototype.destroy.call(this)},_setOption:function(a,b){d.Widget.prototype._setOption.apply(this,arguments);a==="source"&&this._initSource();if(a==="appendTo")this.menu.element.appendTo(d(b||"body",this.element[0].ownerDocument)[0]);a==="disabled"&& -b&&this.xhr&&this.xhr.abort()},_initSource:function(){var a=this,b,g;if(d.isArray(this.options.source)){b=this.options.source;this.source=function(c,f){f(d.ui.autocomplete.filter(b,c.term))}}else if(typeof this.options.source==="string"){g=this.options.source;this.source=function(c,f){a.xhr&&a.xhr.abort();a.xhr=d.ajax({url:g,data:c,dataType:"json",autocompleteRequest:++e,success:function(h){this.autocompleteRequest===e&&f(h)},error:function(){this.autocompleteRequest===e&&f([])}})}}else this.source= -this.options.source},search:function(a,b){a=a!=null?a:this.element.val();this.term=this.element.val();if(a.length").data("item.autocomplete",b).append(d("").text(b.label)).appendTo(a)},_move:function(a,b){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term);this.menu.deactivate()}else this.menu[a](b);else this.search(null,b)},widget:function(){return this.menu.element}});d.extend(d.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, -"\\$&")},filter:function(a,b){var g=new RegExp(d.ui.autocomplete.escapeRegex(b),"i");return d.grep(a,function(c){return g.test(c.label||c.value||c)})}})})(jQuery); -(function(d){d.widget("ui.menu",{_create:function(){var e=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(a){if(d(a.target).closest(".ui-menu-item a").length){a.preventDefault();e.select(a)}});this.refresh()},refresh:function(){var e=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex", --1).mouseenter(function(a){e.activate(a,d(this).parent())}).mouseleave(function(){e.deactivate()})},activate:function(e,a){this.deactivate();if(this.hasScroll()){var b=a.offset().top-this.element.offset().top,g=this.element.scrollTop(),c=this.element.height();if(b<0)this.element.scrollTop(g+b);else b>=c&&this.element.scrollTop(g+b-c+a.height())}this.active=a.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",e,{item:a})},deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id"); -this._trigger("blur");this.active=null}},next:function(e){this.move("next",".ui-menu-item:first",e)},previous:function(e){this.move("prev",".ui-menu-item:last",e)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(e,a,b){if(this.active){e=this.active[e+"All"](".ui-menu-item").eq(0);e.length?this.activate(b,e):this.activate(b,this.element.children(a))}else this.activate(b, -this.element.children(a))},nextPage:function(e){if(this.hasScroll())if(!this.active||this.last())this.activate(e,this.element.children(".ui-menu-item:first"));else{var a=this.active.offset().top,b=this.element.height(),g=this.element.children(".ui-menu-item").filter(function(){var c=d(this).offset().top-a-b+d(this).height();return c<10&&c>-10});g.length||(g=this.element.children(".ui-menu-item:last"));this.activate(e,g)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active|| -this.last()?":first":":last"))},previousPage:function(e){if(this.hasScroll())if(!this.active||this.first())this.activate(e,this.element.children(".ui-menu-item:last"));else{var a=this.active.offset().top,b=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var g=d(this).offset().top-a+b-d(this).height();return g<10&&g>-10});result.length||(result=this.element.children(".ui-menu-item:first"));this.activate(e,result)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active|| -this.first()?":last":":first"))},hasScroll:function(){return this.element.height()    ").addClass("ui-button-text").html(this.options.label).appendTo(a.empty()).text(),e=this.options.icons,f=e.primary&&e.secondary,d=[];if(e.primary||e.secondary){if(this.options.text)d.push("ui-button-text-icon"+(f?"s":e.primary?"-primary":"-secondary"));e.primary&&a.prepend("");e.secondary&&a.append("");if(!this.options.text){d.push(f?"ui-button-icons-only": -"ui-button-icon-only");this.hasTitle||a.attr("title",c)}}else d.push("ui-button-text-only");a.addClass(d.join(" "))}}});b.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(a,c){a==="disabled"&&this.buttons.button("option",a,c);b.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){var a=this.element.css("direction")=== -"ltr";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return b(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(a?"ui-corner-left":"ui-corner-right").end().filter(":last").addClass(a?"ui-corner-right":"ui-corner-left").end().end()},destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return b(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy"); -b.Widget.prototype.destroy.call(this)}})})(jQuery); -;/* - * jQuery UI Dialog 1.8.14 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Dialog - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - * jquery.ui.button.js - * jquery.ui.draggable.js - * jquery.ui.mouse.js - * jquery.ui.position.js - * jquery.ui.resizable.js - */ -(function(c,l){var m={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},n={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},o=c.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false, -position:{my:"center",at:"center",collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||" ",e=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("
    ")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+ -b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var f=(a.uiDialogTitlebar=c("
    ")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g), -h=c('').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);return false}).appendTo(f);(a.uiDialogTitlebarCloseText=c("")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("").addClass("ui-dialog-title").attr("id", -e).html(d).prependTo(f);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose=b.beforeclose;f.find("*").add(f).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body"); -a.uiDialog.remove();a.originalTitle&&a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d,e;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!== -b.uiDialog[0]){e=c(this).css("z-index");isNaN(e)||(d=Math.max(d,e))}});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,e=d.options;if(e.modal&&!a||!e.stack&&!e.modal)return d._trigger("focus",b);if(e.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=e.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.attr("scrollTop"),scrollLeft:d.element.attr("scrollLeft")};c.ui.dialog.maxZ+= -1;d.uiDialog.css("z-index",c.ui.dialog.maxZ);d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;a._size();a._position(b.position);d.show(b.show);a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(e){if(e.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),f=g.filter(":first");g=g.filter(":last");if(e.target===g[0]&&!e.shiftKey){f.focus(1);return false}else if(e.target=== -f[0]&&e.shiftKey){g.focus(1);return false}}});c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,e=c("
    ").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("
    ").addClass("ui-dialog-buttonset").appendTo(e);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a, -function(){return!(d=true)});if(d){c.each(a,function(f,h){h=c.isFunction(h)?{click:h,text:f}:h;var i=c('').click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.each(h,function(j,k){if(j!=="click")j in o?i[j](k):i.attr(j,k)});c.fn.button&&i.button()});e.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(f){return{position:f.position,offset:f.offset}}var b=this,d=b.options,e=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close", -handle:".ui-dialog-titlebar",containment:"document",start:function(f,h){g=d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",f,a(h))},drag:function(f,h){b._trigger("drag",f,a(h))},stop:function(f,h){d.position=[h.position.left-e.scrollLeft(),h.position.top-e.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);b._trigger("dragStop",f,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(f){return{originalPosition:f.originalPosition, -originalSize:f.originalSize,position:f.position,size:f.size}}a=a===l?this.options.resizable:a;var d=this,e=d.options,g=d.uiDialog.css("position");a=typeof a==="string"?a:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:a,start:function(f,h){c(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",f,b(h))},resize:function(f,h){d._trigger("resize", -f,b(h))},stop:function(f,h){c(this).removeClass("ui-dialog-resizing");e.height=c(this).height();e.width=c(this).width();d._trigger("resizeStop",f,b(h));c.ui.dialog.overlay.resize()}}).css("position",g).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(a){var b=[],d=[0,0],e;if(a){if(typeof a==="string"||typeof a==="object"&&"0"in a){b=a.split?a.split(" "): -[a[0],a[1]];if(b.length===1)b[1]=b[0];c.each(["left","top"],function(g,f){if(+b[g]===b[g]){d[g]=b[g];b[g]=f}});a={my:b.join(" "),at:b.join(" "),offset:d.join(" ")}}a=c.extend({},c.ui.dialog.prototype.options.position,a)}else a=c.ui.dialog.prototype.options.position;(e=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(c.extend({of:window},a));e||this.uiDialog.hide()},_setOptions:function(a){var b=this,d={},e=false;c.each(a,function(g,f){b._setOption(g,f); -if(g in m)e=true;if(g in n)d[g]=f});e&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",d)},_setOption:function(a,b){var d=this,e=d.uiDialog;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":e.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?e.addClass("ui-dialog-disabled"): -e.removeClass("ui-dialog-disabled");break;case "draggable":var g=e.is(":data(draggable)");g&&!b&&e.draggable("destroy");!g&&b&&d._makeDraggable();break;case "position":d._position(b);break;case "resizable":(g=e.is(":data(resizable)"))&&!b&&e.resizable("destroy");g&&typeof b==="string"&&e.resizable("option","handles",b);!g&&b!==false&&d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||" "));break}c.Widget.prototype._setOption.apply(d,arguments)},_size:function(){var a= -this.options,b,d,e=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();d=Math.max(0,a.minHeight-b);if(a.height==="auto")if(c.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();a=this.element.css("height","auto").height();e||this.uiDialog.hide();this.element.height(Math.max(a,d))}else this.element.height(Math.max(a.height- -b,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.14",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "), -create:function(a){if(this.instances.length===0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(), -height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){var b=c.inArray(a,this.instances);b!=-1&&this.oldInstances.push(this.instances.splice(b,1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var d=0;c.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight); -b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(a.range==="min"||a.range==="max"?" ui-slider-range-"+a.range:""))}for(var j=c.length;j"); -this.handles=c.add(d(e.join("")).appendTo(b.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(g){g.preventDefault()}).hover(function(){a.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(a.disabled)d(this).blur();else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(g){d(this).data("index.ui-slider-handle", -g)});this.handles.keydown(function(g){var k=true,l=d(this).data("index.ui-slider-handle"),i,h,m;if(!b.options.disabled){switch(g.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:k=false;if(!b._keySliding){b._keySliding=true;d(this).addClass("ui-state-active");i=b._start(g,l);if(i===false)return}break}m=b.options.step;i=b.options.values&&b.options.values.length? -(h=b.values(l)):(h=b.value());switch(g.keyCode){case d.ui.keyCode.HOME:h=b._valueMin();break;case d.ui.keyCode.END:h=b._valueMax();break;case d.ui.keyCode.PAGE_UP:h=b._trimAlignValue(i+(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:h=b._trimAlignValue(i-(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(i===b._valueMax())return;h=b._trimAlignValue(i+m);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(i===b._valueMin())return;h=b._trimAlignValue(i- -m);break}b._slide(g,l,h);return k}}).keyup(function(g){var k=d(this).data("index.ui-slider-handle");if(b._keySliding){b._keySliding=false;b._stop(g,k);b._change(g,k);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy(); -return this},_mouseCapture:function(b){var a=this.options,c,f,e,j,g;if(a.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:b.pageX,y:b.pageY});f=this._valueMax()-this._valueMin()+1;j=this;this.handles.each(function(k){var l=Math.abs(c-j.values(k));if(f>l){f=l;e=d(this);g=k}});if(a.range===true&&this.values(1)===a.min){g+=1;e=d(this.handles[g])}if(this._start(b,g)===false)return false; -this._mouseSliding=true;j._handleIndex=g;e.addClass("ui-state-active").focus();a=e.offset();this._clickOffset=!d(b.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:b.pageX-a.left-e.width()/2,top:b.pageY-a.top-e.height()/2-(parseInt(e.css("borderTopWidth"),10)||0)-(parseInt(e.css("borderBottomWidth"),10)||0)+(parseInt(e.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(b,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(b){var a= -this._normValueFromMouse({x:b.pageX,y:b.pageY});this._slide(b,this._handleIndex,a);return false},_mouseStop:function(b){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(b,this._handleIndex);this._change(b,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(b){var a;if(this.orientation==="horizontal"){a= -this.elementSize.width;b=b.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{a=this.elementSize.height;b=b.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}a=b/a;if(a>1)a=1;if(a<0)a=0;if(this.orientation==="vertical")a=1-a;b=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+a*b)},_start:function(b,a){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a); -c.values=this.values()}return this._trigger("start",b,c)},_slide:function(b,a,c){var f;if(this.options.values&&this.options.values.length){f=this.values(a?0:1);if(this.options.values.length===2&&this.options.range===true&&(a===0&&c>f||a===1&&c1){this.options.values[b]=this._trimAlignValue(a);this._refreshValue();this._change(null,b)}else if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;f=arguments[0];for(e=0;e=this._valueMax())return this._valueMax();var a=this.options.step>0?this.options.step:1,c=(b-this._valueMin())%a;alignValue=b-c;if(Math.abs(c)*2>=a)alignValue+=c>0?a:-a;return parseFloat(alignValue.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max}, -_refreshValue:function(){var b=this.options.range,a=this.options,c=this,f=!this._animateOff?a.animate:false,e,j={},g,k,l,i;if(this.options.values&&this.options.values.length)this.handles.each(function(h){e=(c.values(h)-c._valueMin())/(c._valueMax()-c._valueMin())*100;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";d(this).stop(1,1)[f?"animate":"css"](j,a.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(h===0)c.range.stop(1,1)[f?"animate":"css"]({left:e+"%"},a.animate); -if(h===1)c.range[f?"animate":"css"]({width:e-g+"%"},{queue:false,duration:a.animate})}else{if(h===0)c.range.stop(1,1)[f?"animate":"css"]({bottom:e+"%"},a.animate);if(h===1)c.range[f?"animate":"css"]({height:e-g+"%"},{queue:false,duration:a.animate})}g=e});else{k=this.value();l=this._valueMin();i=this._valueMax();e=i!==l?(k-l)/(i-l)*100:0;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";this.handle.stop(1,1)[f?"animate":"css"](j,a.animate);if(b==="min"&&this.orientation==="horizontal")this.range.stop(1, -1)[f?"animate":"css"]({width:e+"%"},a.animate);if(b==="max"&&this.orientation==="horizontal")this.range[f?"animate":"css"]({width:100-e+"%"},{queue:false,duration:a.animate});if(b==="min"&&this.orientation==="vertical")this.range.stop(1,1)[f?"animate":"css"]({height:e+"%"},a.animate);if(b==="max"&&this.orientation==="vertical")this.range[f?"animate":"css"]({height:100-e+"%"},{queue:false,duration:a.animate})}}});d.extend(d.ui.slider,{version:"1.8.14"})})(jQuery); -;/* - * jQuery UI Tabs 1.8.14 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Tabs - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - */ -(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"
    ",remove:null,select:null,show:null,spinner:"Loading…",tabTemplate:"
  • #{label}
    • "},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&& -e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b= -d(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(b){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var a=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]|| -(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))a.panels=a.panels.add(a.element.find(a._sanitizeSelector(i)));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=a._tabId(f);f.href="#"+i;f=a.element.find("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(a.panels[g-1]||a.list);f.data("destroy.tabs",true)}a.panels=a.panels.add(f)}else c.disabled.push(g)});if(b){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all"); -this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(a._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected= -this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return a.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active"); -if(c.selected>=0&&this.anchors.length){a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");a.element.queue("tabs",function(){a._trigger("show",null,a._ui(a.anchors[c.selected],a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash))[0]))});this.load(c.selected)}d(window).bind("unload",function(){a.lis.add(a.anchors).unbind(".tabs");a.lis=a.anchors=a.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected")); -this.element[c.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);b=0;for(var j;j=this.lis[b];b++)d(j)[d.inArray(b,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+ -g)};this.lis.bind("mouseover.tabs",function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal", -function(){e(f,o);a._trigger("show",null,a._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");a._trigger("show",null,a._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);a.element.dequeue("tabs")})}:function(g,f){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");a.element.dequeue("tabs")}; -this.anchors.bind(c.event+".tabs",function(){var g=this,f=d(g).closest("li"),i=a.panels.filter(":not(.ui-tabs-hide)"),l=a.element.find(a._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||a.panels.filter(":animated").length||a._trigger("select",null,a._ui(this,l[0]))===false){this.blur();return false}c.selected=a.anchors.index(this);a.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected= --1;c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this));this.blur();return false}c.cookie&&a._cookie(c.selected,c.cookie);if(l.length){i.length&&a.element.queue("tabs",function(){s(g,i)});a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier."; -d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(b){if(typeof b=="string")b=this.anchors.index(this.anchors.filter("[href$="+b+"]"));return b},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e= -d.data(this,"href.tabs");if(e)this.href=e;var a=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){a.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});b.cookie&&this._cookie(null,b.cookie);return this},add:function(b, -e,a){if(a===p)a=this.anchors.length;var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,b).replace(/#\{label\}/g,e));b=!b.indexOf("#")?b.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=c.element.find("#"+b);j.length||(j=d(h.panelTemplate).attr("id",b).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(a>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[a]); -j.insertBefore(this.panels[a])}h.disabled=d.map(h.disabled,function(k){return k>=a?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[a],this.panels[a]));return this},remove:function(b){b=this._getIndex(b);var e=this.options,a=this.lis.eq(b).remove(),c=this.panels.eq(b).remove(); -if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1=b?--h:h});this._tabify();this._trigger("remove",null,this._ui(a.find("a")[0],c[0]));return this},enable:function(b){b=this._getIndex(b);var e=this.options;if(d.inArray(b,e.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(a){return a!=b});this._trigger("enable",null, -this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this}, -load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c, -"cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this}, -url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.14"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k'))}function N(a){return a.bind("mouseout",function(b){b= -d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");b.length&&b.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])||!b.length)){b.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");b.addClass("ui-state-hover"); -b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover");b.hasClass("ui-datepicker-next")&&b.addClass("ui-datepicker-next-hover")}})}function H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==C)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.14"}});var A=(new Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){H(this._defaults, -a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1"),input:a,selectedDay:0, -selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:N(d('
    '))}},_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(e,f,h){b.settings[f]= -h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&b.append.remove();if(c){b.append=d(''+c+"");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c=="focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c= -this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('').addClass(this._triggerClass).html(f==""?c:d("").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a, -"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;gh){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker", -function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),true);this._updateDatepicker(b);this._updateAlternate(b);b.dpDiv.show()}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=1;this._dialogInput=d('');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput); -a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}H(a.settings,e||{});b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left", -this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus", -this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span"){b= -b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5", -cursor:"default"})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a); -d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);if(d.datepicker._curInst&&d.datepicker._curInst!=b){d.datepicker._datepickerShowing&&d.datepicker._triggerOnClose(d.datepicker._curInst);d.datepicker._curInst.dpDiv.stop(true,true)}var c= -d.datepicker._get(b,"beforeShow");H(b.settings,c?c.apply(a,[a,b]):{});b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value="";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c= -{left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){var i=b.dpDiv.find("iframe.ui-datepicker-cover"); -if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.datepicker._datepickerShowing=true;d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}},_updateDatepicker:function(a){this.maxRows=4;var b=d.datepicker._getBorders(a.dpDiv); -J=a;a.dpDiv.empty().append(this._generateHTML(a));var c=a.dpDiv.find("iframe.ui-datepicker-cover");c.length&&c.css({left:-b[0],top:-b[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});a.dpDiv.find("."+this._dayOverClass+" a").mouseover();b=this._getNumberOfMonths(a);c=b[1];a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");c>1&&a.dpDiv.addClass("ui-datepicker-multi-"+c).css("width",17*c+"em");a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi"); -a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var e=a.yearshtml;setTimeout(function(){e===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);e=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]|| -c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+ -i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_triggerOnClose:function(a){var b=this._get(a,"onClose");if(b)b.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a])},_hideDatepicker:function(a){var b= -this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();d.datepicker._triggerOnClose(b);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute", -left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&& -d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth= -b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e._selectingMonthYear=false;e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_clickMonthYear:function(a){var b=this._getInst(d(a)[0]);b.input&&b._selectingMonthYear&&setTimeout(function(){b.input.focus()},0);b._selectingMonthYear= -!b._selectingMonthYear},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a); -a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a)); -d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()% -100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=B+1-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,j-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=j||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y", -TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:null)||this._defaults.monthNames;var i=function(o){(o=k+112?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay= -a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(), -b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n= -this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&nn;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a));n=this._canAdjustMonth(a,-1,m,g)?''+n+"":f?"":''+n+"";var s=this._get(a,"nextText");s=!h?s:this.formatDate(s,this._daylightSavingAdjust(new Date(m,g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?''+s+"":f?"":''+s+"";j=this._get(a,"currentText");s=this._get(a,"gotoCurrent")&&a.currentDay?u:b;j=!h?j:this.formatDate(j,s,this._getFormatConfig(a));h=!a.inline?'":"";e=e?'
    '+(c?h:"")+(this._isInRange(a,s)?'":"")+(c?"":h)+"
    ":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");s=this._get(a,"dayNames");this._get(a,"dayNamesShort");var q=this._get(a,"dayNamesMin"),B= -this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),D=this._get(a,"showOtherMonths"),K=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var E=this._getDefaultDate(a),w="",x=0;x1)switch(G){case 0:y+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right": -"left");break;case i[1]-1:y+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:y+=" ui-datepicker-group-middle";t="";break}y+='">'}y+='
    '+(/all|left/.test(t)&&x==0?c?f:n:"")+(/all|right/.test(t)&&x==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,x>0||G>0,B,v)+'
    ';var z=j?'": -"";for(t=0;t<7;t++){var r=(t+h)%7;z+="=5?' class="ui-datepicker-week-end"':"")+'>'+q[r]+""}y+=z+"";z=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,z);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;z=Math.ceil((t+z)/7);this.maxRows=z=l?this.maxRows>z?this.maxRows:z:z;r=this._daylightSavingAdjust(new Date(m,g,1-t));for(var Q=0;Q";var R=!j?"":'";for(t=0;t<7;t++){var I=p?p.apply(a.input?a.input[0]:null,[r]):[true,""],F=r.getMonth()!=g,L=F&&!K||!I[0]||k&&ro;R+='";r.setDate(r.getDate()+1);r=this._daylightSavingAdjust(r)}y+=R+""}g++;if(g>11){g=0;m++}y+="
    '+this._get(a,"weekHeader")+"
    '+ -this._get(a,"calculateWeek")(r)+""+(F&&!D?" ":L?''+r.getDate()+"":''+ -r.getDate()+"")+"
    "+(l?""+(i[0]>0&&G==i[1]-1?'
    ':""):"");O+=y}w+=O}w+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'':"");a._keyEvent=false;return w},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"), -l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='
    ',o="";if(h||!j)o+=''+i[b]+"";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='"}u||(k+=o+(h||!(j&&l)?" ":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+=''+c+"";else{g=this._get(a,"yearRange").split(":");var s=(new Date).getFullYear();i=function(q){q=q.match(/c[+-].*/)?c+parseInt(q.substring(1),10):q.match(/[+-].*/)?s+parseInt(q,10):parseInt(q,10);return isNaN(q)?s:q};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()): -g;for(a.yearshtml+='";k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?" ":"")+o;k+="
    ";return k},_adjustInstDate:function(a,b,c){var e=a.drawYear+(c== -"Y"?b:0),f=a.drawMonth+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&ba?a:b},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear"); -if(b)b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a); -c=this._daylightSavingAdjust(new Date(c,e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a, -"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker= -function(a){if(!this.length)return this;if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker, -[this[0]].concat(b));return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new M;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.14";window["DP_jQuery_"+A]=d})(jQuery); -;/* - * jQuery UI Progressbar 1.8.14 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Progressbar - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - */ -(function(b,d){b.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=b("
    ").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"); -this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===d)return this._value();this._setOption("value",a);return this},_setOption:function(a,c){if(a==="value"){this.options.value=c;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100* -this._value()/this.options.max},_refreshValue:function(){var a=this.value(),c=this._percentage();if(this.oldValue!==a){this.oldValue=a;this._trigger("change")}this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(c.toFixed(0)+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.14"})})(jQuery); -;/* - * jQuery UI Effects 1.8.14 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/ - */ -jQuery.effects||function(f,j){function m(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1], -16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return n.transparent;return n[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return m(b)}function o(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle, -a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function p(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d= -a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function l(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor", -"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=m(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var n={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0, -0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211, -211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},q=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b, -d){if(f.isFunction(b)){d=b;b=null}return this.queue(function(){var e=f(this),g=e.attr("style")||" ",h=p(o.call(this)),r,v=e.attr("class");f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});r=p(o.call(this));e.attr("class",v);e.animate(u(h,r),{queue:false,duration:a,easing:b,complete:function(){f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments);f.dequeue(this)}})})}; -f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this, -[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.14",save:function(c,a){for(var b=0;b").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}); -c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);return c},setTransition:function(c, -a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});return d.call(this,b)},_show:f.fn.show,show:function(c){if(l(c))return this._show.apply(this,arguments);else{var a=k.apply(this,arguments); -a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(l(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(l(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%", -"pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d* -((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/= -e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/= -e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h= 0 ) && focusable( element, !isTabIndexNaN ); + } +}); + +// support: jQuery <1.8 +if ( !$( "" ).outerWidth( 1 ).jquery ) { + $.each( [ "Width", "Height" ], function( i, name ) { + var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ], + type = name.toLowerCase(), + orig = { + innerWidth: $.fn.innerWidth, + innerHeight: $.fn.innerHeight, + outerWidth: $.fn.outerWidth, + outerHeight: $.fn.outerHeight + }; + + function reduce( elem, size, border, margin ) { + $.each( side, function() { + size -= parseFloat( $.css( elem, "padding" + this ) ) || 0; + if ( border ) { + size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0; + } + if ( margin ) { + size -= parseFloat( $.css( elem, "margin" + this ) ) || 0; + } + }); + return size; + } + + $.fn[ "inner" + name ] = function( size ) { + if ( size === undefined ) { + return orig[ "inner" + name ].call( this ); + } + + return this.each(function() { + $( this ).css( type, reduce( this, size ) + "px" ); + }); + }; + + $.fn[ "outer" + name] = function( size, margin ) { + if ( typeof size !== "number" ) { + return orig[ "outer" + name ].call( this, size ); + } + + return this.each(function() { + $( this).css( type, reduce( this, size, true, margin ) + "px" ); + }); + }; + }); +} + +// support: jQuery <1.8 +if ( !$.fn.addBack ) { + $.fn.addBack = function( selector ) { + return this.add( selector == null ? + this.prevObject : this.prevObject.filter( selector ) + ); + }; +} + +// support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413) +if ( $( "" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) { + $.fn.removeData = (function( removeData ) { + return function( key ) { + if ( arguments.length ) { + return removeData.call( this, $.camelCase( key ) ); + } else { + return removeData.call( this ); + } + }; + })( $.fn.removeData ); +} + +// deprecated +$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() ); + +$.fn.extend({ + focus: (function( orig ) { + return function( delay, fn ) { + return typeof delay === "number" ? + this.each(function() { + var elem = this; + setTimeout(function() { + $( elem ).focus(); + if ( fn ) { + fn.call( elem ); + } + }, delay ); + }) : + orig.apply( this, arguments ); + }; + })( $.fn.focus ), + + disableSelection: (function() { + var eventType = "onselectstart" in document.createElement( "div" ) ? + "selectstart" : + "mousedown"; + + return function() { + return this.bind( eventType + ".ui-disableSelection", function( event ) { + event.preventDefault(); + }); + }; + })(), + + enableSelection: function() { + return this.unbind( ".ui-disableSelection" ); + }, + + zIndex: function( zIndex ) { + if ( zIndex !== undefined ) { + return this.css( "zIndex", zIndex ); + } + + if ( this.length ) { + var elem = $( this[ 0 ] ), position, value; + while ( elem.length && elem[ 0 ] !== document ) { + // Ignore z-index if position is set to a value where z-index is ignored by the browser + // This makes behavior of this function consistent across browsers + // WebKit always returns auto if the element is positioned + position = elem.css( "position" ); + if ( position === "absolute" || position === "relative" || position === "fixed" ) { + // IE returns 0 when zIndex is not specified + // other browsers return a string + // we ignore the case of nested elements with an explicit value of 0 + //
    + value = parseInt( elem.css( "zIndex" ), 10 ); + if ( !isNaN( value ) && value !== 0 ) { + return value; + } + } + elem = elem.parent(); + } + } + + return 0; + } +}); + +// $.ui.plugin is deprecated. Use $.widget() extensions instead. +$.ui.plugin = { + add: function( module, option, set ) { + var i, + proto = $.ui[ module ].prototype; + for ( i in set ) { + proto.plugins[ i ] = proto.plugins[ i ] || []; + proto.plugins[ i ].push( [ option, set[ i ] ] ); + } + }, + call: function( instance, name, args, allowDisconnected ) { + var i, + set = instance.plugins[ name ]; + + if ( !set ) { + return; + } + + if ( !allowDisconnected && ( !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) ) { + return; + } + + for ( i = 0; i < set.length; i++ ) { + if ( instance.options[ set[ i ][ 0 ] ] ) { + set[ i ][ 1 ].apply( instance.element, args ); + } + } + } +}; + + +/*! + * jQuery UI Widget 1.11.4 + * http://jqueryui.com * - * Depends: - * jquery.effects.core.js + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + * + * http://api.jqueryui.com/jQuery.widget/ */ -(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","bottom","left","right"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/ -3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g", + options: { + disabled: false, + + // callbacks + create: null + }, + _createWidget: function( options, element ) { + element = $( element || this.defaultElement || this )[ 0 ]; + this.element = $( element ); + this.uuid = widget_uuid++; + this.eventNamespace = "." + this.widgetName + this.uuid; + + this.bindings = $(); + this.hoverable = $(); + this.focusable = $(); + + if ( element !== this ) { + $.data( element, this.widgetFullName, this ); + this._on( true, this.element, { + remove: function( event ) { + if ( event.target === element ) { + this.destroy(); + } + } + }); + this.document = $( element.style ? + // element within the document + element.ownerDocument : + // element is window or document + element.document || element ); + this.window = $( this.document[0].defaultView || this.document[0].parentWindow ); + } + + this.options = $.widget.extend( {}, + this.options, + this._getCreateOptions(), + options ); + + this._create(); + this._trigger( "create", null, this._getCreateEventData() ); + this._init(); + }, + _getCreateOptions: $.noop, + _getCreateEventData: $.noop, + _create: $.noop, + _init: $.noop, + + destroy: function() { + this._destroy(); + // we can probably remove the unbind calls in 2.0 + // all event bindings should go through this._on() + this.element + .unbind( this.eventNamespace ) + .removeData( this.widgetFullName ) + // support: jquery <1.6.3 + // http://bugs.jquery.com/ticket/9413 + .removeData( $.camelCase( this.widgetFullName ) ); + this.widget() + .unbind( this.eventNamespace ) + .removeAttr( "aria-disabled" ) + .removeClass( + this.widgetFullName + "-disabled " + + "ui-state-disabled" ); + + // clean up events and states + this.bindings.unbind( this.eventNamespace ); + this.hoverable.removeClass( "ui-state-hover" ); + this.focusable.removeClass( "ui-state-focus" ); + }, + _destroy: $.noop, + + widget: function() { + return this.element; + }, + + option: function( key, value ) { + var options = key, + parts, + curOption, + i; + + if ( arguments.length === 0 ) { + // don't return a reference to the internal hash + return $.widget.extend( {}, this.options ); + } + + if ( typeof key === "string" ) { + // handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } } + options = {}; + parts = key.split( "." ); + key = parts.shift(); + if ( parts.length ) { + curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] ); + for ( i = 0; i < parts.length - 1; i++ ) { + curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {}; + curOption = curOption[ parts[ i ] ]; + } + key = parts.pop(); + if ( arguments.length === 1 ) { + return curOption[ key ] === undefined ? null : curOption[ key ]; + } + curOption[ key ] = value; + } else { + if ( arguments.length === 1 ) { + return this.options[ key ] === undefined ? null : this.options[ key ]; + } + options[ key ] = value; + } + } + + this._setOptions( options ); + + return this; + }, + _setOptions: function( options ) { + var key; + + for ( key in options ) { + this._setOption( key, options[ key ] ); + } + + return this; + }, + _setOption: function( key, value ) { + this.options[ key ] = value; + + if ( key === "disabled" ) { + this.widget() + .toggleClass( this.widgetFullName + "-disabled", !!value ); + + // If the widget is becoming disabled, then nothing is interactive + if ( value ) { + this.hoverable.removeClass( "ui-state-hover" ); + this.focusable.removeClass( "ui-state-focus" ); + } + } + + return this; + }, + + enable: function() { + return this._setOptions({ disabled: false }); + }, + disable: function() { + return this._setOptions({ disabled: true }); + }, + + _on: function( suppressDisabledCheck, element, handlers ) { + var delegateElement, + instance = this; + + // no suppressDisabledCheck flag, shuffle arguments + if ( typeof suppressDisabledCheck !== "boolean" ) { + handlers = element; + element = suppressDisabledCheck; + suppressDisabledCheck = false; + } + + // no element argument, shuffle and use this.element + if ( !handlers ) { + handlers = element; + element = this.element; + delegateElement = this.widget(); + } else { + element = delegateElement = $( element ); + this.bindings = this.bindings.add( element ); + } + + $.each( handlers, function( event, handler ) { + function handlerProxy() { + // allow widgets to customize the disabled handling + // - disabled as an array instead of boolean + // - disabled class as method for disabling individual parts + if ( !suppressDisabledCheck && + ( instance.options.disabled === true || + $( this ).hasClass( "ui-state-disabled" ) ) ) { + return; + } + return ( typeof handler === "string" ? instance[ handler ] : handler ) + .apply( instance, arguments ); + } + + // copy the guid so direct unbinding works + if ( typeof handler !== "string" ) { + handlerProxy.guid = handler.guid = + handler.guid || handlerProxy.guid || $.guid++; + } + + var match = event.match( /^([\w:-]*)\s*(.*)$/ ), + eventName = match[1] + instance.eventNamespace, + selector = match[2]; + if ( selector ) { + delegateElement.delegate( selector, eventName, handlerProxy ); + } else { + element.bind( eventName, handlerProxy ); + } + }); + }, + + _off: function( element, eventName ) { + eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + + this.eventNamespace; + element.unbind( eventName ).undelegate( eventName ); + + // Clear the stack to avoid memory leaks (#10056) + this.bindings = $( this.bindings.not( element ).get() ); + this.focusable = $( this.focusable.not( element ).get() ); + this.hoverable = $( this.hoverable.not( element ).get() ); + }, + + _delay: function( handler, delay ) { + function handlerProxy() { + return ( typeof handler === "string" ? instance[ handler ] : handler ) + .apply( instance, arguments ); + } + var instance = this; + return setTimeout( handlerProxy, delay || 0 ); + }, + + _hoverable: function( element ) { + this.hoverable = this.hoverable.add( element ); + this._on( element, { + mouseenter: function( event ) { + $( event.currentTarget ).addClass( "ui-state-hover" ); + }, + mouseleave: function( event ) { + $( event.currentTarget ).removeClass( "ui-state-hover" ); + } + }); + }, + + _focusable: function( element ) { + this.focusable = this.focusable.add( element ); + this._on( element, { + focusin: function( event ) { + $( event.currentTarget ).addClass( "ui-state-focus" ); + }, + focusout: function( event ) { + $( event.currentTarget ).removeClass( "ui-state-focus" ); + } + }); + }, + + _trigger: function( type, event, data ) { + var prop, orig, + callback = this.options[ type ]; + + data = data || {}; + event = $.Event( event ); + event.type = ( type === this.widgetEventPrefix ? + type : + this.widgetEventPrefix + type ).toLowerCase(); + // the original event may come from any element + // so we need to reset the target on the new event + event.target = this.element[ 0 ]; + + // copy original event properties over to the new event + orig = event.originalEvent; + if ( orig ) { + for ( prop in orig ) { + if ( !( prop in event ) ) { + event[ prop ] = orig[ prop ]; + } + } + } + + this.element.trigger( event, data ); + return !( $.isFunction( callback ) && + callback.apply( this.element[0], [ event ].concat( data ) ) === false || + event.isDefaultPrevented() ); + } +}; + +$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) { + $.Widget.prototype[ "_" + method ] = function( element, options, callback ) { + if ( typeof options === "string" ) { + options = { effect: options }; + } + var hasOptions, + effectName = !options ? + method : + options === true || typeof options === "number" ? + defaultEffect : + options.effect || defaultEffect; + options = options || {}; + if ( typeof options === "number" ) { + options = { duration: options }; + } + hasOptions = !$.isEmptyObject( options ); + options.complete = callback; + if ( options.delay ) { + element.delay( options.delay ); + } + if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) { + element[ method ]( options ); + } else if ( effectName !== method && element[ effectName ] ) { + element[ effectName ]( options.duration, options.easing, callback ); + } else { + element.queue(function( next ) { + $( this )[ method ](); + if ( callback ) { + callback.call( element[ 0 ] ); + } + next(); + }); + } + }; +}); + +var widget = $.widget; + + +/*! + * jQuery UI Mouse 1.11.4 + * http://jqueryui.com * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. * http://jquery.org/license * - * http://docs.jquery.com/UI/Effects/Clip + * http://api.jqueryui.com/mouse/ + */ + + +var mouseHandled = false; +$( document ).mouseup( function() { + mouseHandled = false; +}); + +var mouse = $.widget("ui.mouse", { + version: "1.11.4", + options: { + cancel: "input,textarea,button,select,option", + distance: 1, + delay: 0 + }, + _mouseInit: function() { + var that = this; + + this.element + .bind("mousedown." + this.widgetName, function(event) { + return that._mouseDown(event); + }) + .bind("click." + this.widgetName, function(event) { + if (true === $.data(event.target, that.widgetName + ".preventClickEvent")) { + $.removeData(event.target, that.widgetName + ".preventClickEvent"); + event.stopImmediatePropagation(); + return false; + } + }); + + this.started = false; + }, + + // TODO: make sure destroying one instance of mouse doesn't mess with + // other instances of mouse + _mouseDestroy: function() { + this.element.unbind("." + this.widgetName); + if ( this._mouseMoveDelegate ) { + this.document + .unbind("mousemove." + this.widgetName, this._mouseMoveDelegate) + .unbind("mouseup." + this.widgetName, this._mouseUpDelegate); + } + }, + + _mouseDown: function(event) { + // don't let more than one widget handle mouseStart + if ( mouseHandled ) { + return; + } + + this._mouseMoved = false; + + // we may have missed mouseup (out of window) + (this._mouseStarted && this._mouseUp(event)); + + this._mouseDownEvent = event; + + var that = this, + btnIsLeft = (event.which === 1), + // event.target.nodeName works around a bug in IE 8 with + // disabled inputs (#7620) + elIsCancel = (typeof this.options.cancel === "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false); + if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) { + return true; + } + + this.mouseDelayMet = !this.options.delay; + if (!this.mouseDelayMet) { + this._mouseDelayTimer = setTimeout(function() { + that.mouseDelayMet = true; + }, this.options.delay); + } + + if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) { + this._mouseStarted = (this._mouseStart(event) !== false); + if (!this._mouseStarted) { + event.preventDefault(); + return true; + } + } + + // Click event may never have fired (Gecko & Opera) + if (true === $.data(event.target, this.widgetName + ".preventClickEvent")) { + $.removeData(event.target, this.widgetName + ".preventClickEvent"); + } + + // these delegates are required to keep context + this._mouseMoveDelegate = function(event) { + return that._mouseMove(event); + }; + this._mouseUpDelegate = function(event) { + return that._mouseUp(event); + }; + + this.document + .bind( "mousemove." + this.widgetName, this._mouseMoveDelegate ) + .bind( "mouseup." + this.widgetName, this._mouseUpDelegate ); + + event.preventDefault(); + + mouseHandled = true; + return true; + }, + + _mouseMove: function(event) { + // Only check for mouseups outside the document if you've moved inside the document + // at least once. This prevents the firing of mouseup in the case of IE<9, which will + // fire a mousemove event if content is placed under the cursor. See #7778 + // Support: IE <9 + if ( this._mouseMoved ) { + // IE mouseup check - mouseup happened when mouse was out of window + if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) { + return this._mouseUp(event); + + // Iframe mouseup check - mouseup occurred in another document + } else if ( !event.which ) { + return this._mouseUp( event ); + } + } + + if ( event.which || event.button ) { + this._mouseMoved = true; + } + + if (this._mouseStarted) { + this._mouseDrag(event); + return event.preventDefault(); + } + + if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) { + this._mouseStarted = + (this._mouseStart(this._mouseDownEvent, event) !== false); + (this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event)); + } + + return !this._mouseStarted; + }, + + _mouseUp: function(event) { + this.document + .unbind( "mousemove." + this.widgetName, this._mouseMoveDelegate ) + .unbind( "mouseup." + this.widgetName, this._mouseUpDelegate ); + + if (this._mouseStarted) { + this._mouseStarted = false; + + if (event.target === this._mouseDownEvent.target) { + $.data(event.target, this.widgetName + ".preventClickEvent", true); + } + + this._mouseStop(event); + } + + mouseHandled = false; + return false; + }, + + _mouseDistanceMet: function(event) { + return (Math.max( + Math.abs(this._mouseDownEvent.pageX - event.pageX), + Math.abs(this._mouseDownEvent.pageY - event.pageY) + ) >= this.options.distance + ); + }, + + _mouseDelayMet: function(/* event */) { + return this.mouseDelayMet; + }, + + // These are placeholder methods, to be overriden by extending plugin + _mouseStart: function(/* event */) {}, + _mouseDrag: function(/* event */) {}, + _mouseStop: function(/* event */) {}, + _mouseCapture: function(/* event */) { return true; } +}); + + +/*! + * jQuery UI Position 1.11.4 + * http://jqueryui.com + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license * - * Depends: - * jquery.effects.core.js + * http://api.jqueryui.com/position/ */ -(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","bottom","left","right","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position, -c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery); -;/* - * jQuery UI Effects Drop 1.8.14 + +(function() { + +$.ui = $.ui || {}; + +var cachedScrollbarWidth, supportsOffsetFractions, + max = Math.max, + abs = Math.abs, + round = Math.round, + rhorizontal = /left|center|right/, + rvertical = /top|center|bottom/, + roffset = /[\+\-]\d+(\.[\d]+)?%?/, + rposition = /^\w+/, + rpercent = /%$/, + _position = $.fn.position; + +function getOffsets( offsets, width, height ) { + return [ + parseFloat( offsets[ 0 ] ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ), + parseFloat( offsets[ 1 ] ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 ) + ]; +} + +function parseCss( element, property ) { + return parseInt( $.css( element, property ), 10 ) || 0; +} + +function getDimensions( elem ) { + var raw = elem[0]; + if ( raw.nodeType === 9 ) { + return { + width: elem.width(), + height: elem.height(), + offset: { top: 0, left: 0 } + }; + } + if ( $.isWindow( raw ) ) { + return { + width: elem.width(), + height: elem.height(), + offset: { top: elem.scrollTop(), left: elem.scrollLeft() } + }; + } + if ( raw.preventDefault ) { + return { + width: 0, + height: 0, + offset: { top: raw.pageY, left: raw.pageX } + }; + } + return { + width: elem.outerWidth(), + height: elem.outerHeight(), + offset: elem.offset() + }; +} + +$.position = { + scrollbarWidth: function() { + if ( cachedScrollbarWidth !== undefined ) { + return cachedScrollbarWidth; + } + var w1, w2, + div = $( "
    " ), + innerDiv = div.children()[0]; + + $( "body" ).append( div ); + w1 = innerDiv.offsetWidth; + div.css( "overflow", "scroll" ); + + w2 = innerDiv.offsetWidth; + + if ( w1 === w2 ) { + w2 = div[0].clientWidth; + } + + div.remove(); + + return (cachedScrollbarWidth = w1 - w2); + }, + getScrollInfo: function( within ) { + var overflowX = within.isWindow || within.isDocument ? "" : + within.element.css( "overflow-x" ), + overflowY = within.isWindow || within.isDocument ? "" : + within.element.css( "overflow-y" ), + hasOverflowX = overflowX === "scroll" || + ( overflowX === "auto" && within.width < within.element[0].scrollWidth ), + hasOverflowY = overflowY === "scroll" || + ( overflowY === "auto" && within.height < within.element[0].scrollHeight ); + return { + width: hasOverflowY ? $.position.scrollbarWidth() : 0, + height: hasOverflowX ? $.position.scrollbarWidth() : 0 + }; + }, + getWithinInfo: function( element ) { + var withinElement = $( element || window ), + isWindow = $.isWindow( withinElement[0] ), + isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9; + return { + element: withinElement, + isWindow: isWindow, + isDocument: isDocument, + offset: withinElement.offset() || { left: 0, top: 0 }, + scrollLeft: withinElement.scrollLeft(), + scrollTop: withinElement.scrollTop(), + + // support: jQuery 1.6.x + // jQuery 1.6 doesn't support .outerWidth/Height() on documents or windows + width: isWindow || isDocument ? withinElement.width() : withinElement.outerWidth(), + height: isWindow || isDocument ? withinElement.height() : withinElement.outerHeight() + }; + } +}; + +$.fn.position = function( options ) { + if ( !options || !options.of ) { + return _position.apply( this, arguments ); + } + + // make a copy, we don't want to modify arguments + options = $.extend( {}, options ); + + var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions, + target = $( options.of ), + within = $.position.getWithinInfo( options.within ), + scrollInfo = $.position.getScrollInfo( within ), + collision = ( options.collision || "flip" ).split( " " ), + offsets = {}; + + dimensions = getDimensions( target ); + if ( target[0].preventDefault ) { + // force left top to allow flipping + options.at = "left top"; + } + targetWidth = dimensions.width; + targetHeight = dimensions.height; + targetOffset = dimensions.offset; + // clone to reuse original targetOffset later + basePosition = $.extend( {}, targetOffset ); + + // force my and at to have valid horizontal and vertical positions + // if a value is missing or invalid, it will be converted to center + $.each( [ "my", "at" ], function() { + var pos = ( options[ this ] || "" ).split( " " ), + horizontalOffset, + verticalOffset; + + if ( pos.length === 1) { + pos = rhorizontal.test( pos[ 0 ] ) ? + pos.concat( [ "center" ] ) : + rvertical.test( pos[ 0 ] ) ? + [ "center" ].concat( pos ) : + [ "center", "center" ]; + } + pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center"; + pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center"; + + // calculate offsets + horizontalOffset = roffset.exec( pos[ 0 ] ); + verticalOffset = roffset.exec( pos[ 1 ] ); + offsets[ this ] = [ + horizontalOffset ? horizontalOffset[ 0 ] : 0, + verticalOffset ? verticalOffset[ 0 ] : 0 + ]; + + // reduce to just the positions without the offsets + options[ this ] = [ + rposition.exec( pos[ 0 ] )[ 0 ], + rposition.exec( pos[ 1 ] )[ 0 ] + ]; + }); + + // normalize collision option + if ( collision.length === 1 ) { + collision[ 1 ] = collision[ 0 ]; + } + + if ( options.at[ 0 ] === "right" ) { + basePosition.left += targetWidth; + } else if ( options.at[ 0 ] === "center" ) { + basePosition.left += targetWidth / 2; + } + + if ( options.at[ 1 ] === "bottom" ) { + basePosition.top += targetHeight; + } else if ( options.at[ 1 ] === "center" ) { + basePosition.top += targetHeight / 2; + } + + atOffset = getOffsets( offsets.at, targetWidth, targetHeight ); + basePosition.left += atOffset[ 0 ]; + basePosition.top += atOffset[ 1 ]; + + return this.each(function() { + var collisionPosition, using, + elem = $( this ), + elemWidth = elem.outerWidth(), + elemHeight = elem.outerHeight(), + marginLeft = parseCss( this, "marginLeft" ), + marginTop = parseCss( this, "marginTop" ), + collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) + scrollInfo.width, + collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) + scrollInfo.height, + position = $.extend( {}, basePosition ), + myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() ); + + if ( options.my[ 0 ] === "right" ) { + position.left -= elemWidth; + } else if ( options.my[ 0 ] === "center" ) { + position.left -= elemWidth / 2; + } + + if ( options.my[ 1 ] === "bottom" ) { + position.top -= elemHeight; + } else if ( options.my[ 1 ] === "center" ) { + position.top -= elemHeight / 2; + } + + position.left += myOffset[ 0 ]; + position.top += myOffset[ 1 ]; + + // if the browser doesn't support fractions, then round for consistent results + if ( !supportsOffsetFractions ) { + position.left = round( position.left ); + position.top = round( position.top ); + } + + collisionPosition = { + marginLeft: marginLeft, + marginTop: marginTop + }; + + $.each( [ "left", "top" ], function( i, dir ) { + if ( $.ui.position[ collision[ i ] ] ) { + $.ui.position[ collision[ i ] ][ dir ]( position, { + targetWidth: targetWidth, + targetHeight: targetHeight, + elemWidth: elemWidth, + elemHeight: elemHeight, + collisionPosition: collisionPosition, + collisionWidth: collisionWidth, + collisionHeight: collisionHeight, + offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ], + my: options.my, + at: options.at, + within: within, + elem: elem + }); + } + }); + + if ( options.using ) { + // adds feedback as second argument to using callback, if present + using = function( props ) { + var left = targetOffset.left - position.left, + right = left + targetWidth - elemWidth, + top = targetOffset.top - position.top, + bottom = top + targetHeight - elemHeight, + feedback = { + target: { + element: target, + left: targetOffset.left, + top: targetOffset.top, + width: targetWidth, + height: targetHeight + }, + element: { + element: elem, + left: position.left, + top: position.top, + width: elemWidth, + height: elemHeight + }, + horizontal: right < 0 ? "left" : left > 0 ? "right" : "center", + vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle" + }; + if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) { + feedback.horizontal = "center"; + } + if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) { + feedback.vertical = "middle"; + } + if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) { + feedback.important = "horizontal"; + } else { + feedback.important = "vertical"; + } + options.using.call( this, props, feedback ); + }; + } + + elem.offset( $.extend( position, { using: using } ) ); + }); +}; + +$.ui.position = { + fit: { + left: function( position, data ) { + var within = data.within, + withinOffset = within.isWindow ? within.scrollLeft : within.offset.left, + outerWidth = within.width, + collisionPosLeft = position.left - data.collisionPosition.marginLeft, + overLeft = withinOffset - collisionPosLeft, + overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset, + newOverRight; + + // element is wider than within + if ( data.collisionWidth > outerWidth ) { + // element is initially over the left side of within + if ( overLeft > 0 && overRight <= 0 ) { + newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - withinOffset; + position.left += overLeft - newOverRight; + // element is initially over right side of within + } else if ( overRight > 0 && overLeft <= 0 ) { + position.left = withinOffset; + // element is initially over both left and right sides of within + } else { + if ( overLeft > overRight ) { + position.left = withinOffset + outerWidth - data.collisionWidth; + } else { + position.left = withinOffset; + } + } + // too far left -> align with left edge + } else if ( overLeft > 0 ) { + position.left += overLeft; + // too far right -> align with right edge + } else if ( overRight > 0 ) { + position.left -= overRight; + // adjust based on position and margin + } else { + position.left = max( position.left - collisionPosLeft, position.left ); + } + }, + top: function( position, data ) { + var within = data.within, + withinOffset = within.isWindow ? within.scrollTop : within.offset.top, + outerHeight = data.within.height, + collisionPosTop = position.top - data.collisionPosition.marginTop, + overTop = withinOffset - collisionPosTop, + overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset, + newOverBottom; + + // element is taller than within + if ( data.collisionHeight > outerHeight ) { + // element is initially over the top of within + if ( overTop > 0 && overBottom <= 0 ) { + newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - withinOffset; + position.top += overTop - newOverBottom; + // element is initially over bottom of within + } else if ( overBottom > 0 && overTop <= 0 ) { + position.top = withinOffset; + // element is initially over both top and bottom of within + } else { + if ( overTop > overBottom ) { + position.top = withinOffset + outerHeight - data.collisionHeight; + } else { + position.top = withinOffset; + } + } + // too far up -> align with top + } else if ( overTop > 0 ) { + position.top += overTop; + // too far down -> align with bottom edge + } else if ( overBottom > 0 ) { + position.top -= overBottom; + // adjust based on position and margin + } else { + position.top = max( position.top - collisionPosTop, position.top ); + } + } + }, + flip: { + left: function( position, data ) { + var within = data.within, + withinOffset = within.offset.left + within.scrollLeft, + outerWidth = within.width, + offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left, + collisionPosLeft = position.left - data.collisionPosition.marginLeft, + overLeft = collisionPosLeft - offsetLeft, + overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft, + myOffset = data.my[ 0 ] === "left" ? + -data.elemWidth : + data.my[ 0 ] === "right" ? + data.elemWidth : + 0, + atOffset = data.at[ 0 ] === "left" ? + data.targetWidth : + data.at[ 0 ] === "right" ? + -data.targetWidth : + 0, + offset = -2 * data.offset[ 0 ], + newOverRight, + newOverLeft; + + if ( overLeft < 0 ) { + newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset; + if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) { + position.left += myOffset + atOffset + offset; + } + } else if ( overRight > 0 ) { + newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft; + if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) { + position.left += myOffset + atOffset + offset; + } + } + }, + top: function( position, data ) { + var within = data.within, + withinOffset = within.offset.top + within.scrollTop, + outerHeight = within.height, + offsetTop = within.isWindow ? within.scrollTop : within.offset.top, + collisionPosTop = position.top - data.collisionPosition.marginTop, + overTop = collisionPosTop - offsetTop, + overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop, + top = data.my[ 1 ] === "top", + myOffset = top ? + -data.elemHeight : + data.my[ 1 ] === "bottom" ? + data.elemHeight : + 0, + atOffset = data.at[ 1 ] === "top" ? + data.targetHeight : + data.at[ 1 ] === "bottom" ? + -data.targetHeight : + 0, + offset = -2 * data.offset[ 1 ], + newOverTop, + newOverBottom; + if ( overTop < 0 ) { + newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset; + if ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) { + position.top += myOffset + atOffset + offset; + } + } else if ( overBottom > 0 ) { + newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop; + if ( newOverTop > 0 || abs( newOverTop ) < overBottom ) { + position.top += myOffset + atOffset + offset; + } + } + } + }, + flipfit: { + left: function() { + $.ui.position.flip.left.apply( this, arguments ); + $.ui.position.fit.left.apply( this, arguments ); + }, + top: function() { + $.ui.position.flip.top.apply( this, arguments ); + $.ui.position.fit.top.apply( this, arguments ); + } + } +}; + +// fraction support test +(function() { + var testElement, testElementParent, testElementStyle, offsetLeft, i, + body = document.getElementsByTagName( "body" )[ 0 ], + div = document.createElement( "div" ); + + //Create a "fake body" for testing based on method used in jQuery.support + testElement = document.createElement( body ? "div" : "body" ); + testElementStyle = { + visibility: "hidden", + width: 0, + height: 0, + border: 0, + margin: 0, + background: "none" + }; + if ( body ) { + $.extend( testElementStyle, { + position: "absolute", + left: "-1000px", + top: "-1000px" + }); + } + for ( i in testElementStyle ) { + testElement.style[ i ] = testElementStyle[ i ]; + } + testElement.appendChild( div ); + testElementParent = body || document.documentElement; + testElementParent.insertBefore( testElement, testElementParent.firstChild ); + + div.style.cssText = "position: absolute; left: 10.7432222px;"; + + offsetLeft = $( div ).offset().left; + supportsOffsetFractions = offsetLeft > 10 && offsetLeft < 11; + + testElement.innerHTML = ""; + testElementParent.removeChild( testElement ); +})(); + +})(); + +var position = $.ui.position; + + +/*! + * jQuery UI Accordion 1.11.4 + * http://jqueryui.com * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. * http://jquery.org/license * - * http://docs.jquery.com/UI/Effects/Drop + * http://api.jqueryui.com/accordion/ + */ + + +var accordion = $.widget( "ui.accordion", { + version: "1.11.4", + options: { + active: 0, + animate: {}, + collapsible: false, + event: "click", + header: "> li > :first-child,> :not(li):even", + heightStyle: "auto", + icons: { + activeHeader: "ui-icon-triangle-1-s", + header: "ui-icon-triangle-1-e" + }, + + // callbacks + activate: null, + beforeActivate: null + }, + + hideProps: { + borderTopWidth: "hide", + borderBottomWidth: "hide", + paddingTop: "hide", + paddingBottom: "hide", + height: "hide" + }, + + showProps: { + borderTopWidth: "show", + borderBottomWidth: "show", + paddingTop: "show", + paddingBottom: "show", + height: "show" + }, + + _create: function() { + var options = this.options; + this.prevShow = this.prevHide = $(); + this.element.addClass( "ui-accordion ui-widget ui-helper-reset" ) + // ARIA + .attr( "role", "tablist" ); + + // don't allow collapsible: false and active: false / null + if ( !options.collapsible && (options.active === false || options.active == null) ) { + options.active = 0; + } + + this._processPanels(); + // handle negative values + if ( options.active < 0 ) { + options.active += this.headers.length; + } + this._refresh(); + }, + + _getCreateEventData: function() { + return { + header: this.active, + panel: !this.active.length ? $() : this.active.next() + }; + }, + + _createIcons: function() { + var icons = this.options.icons; + if ( icons ) { + $( "" ) + .addClass( "ui-accordion-header-icon ui-icon " + icons.header ) + .prependTo( this.headers ); + this.active.children( ".ui-accordion-header-icon" ) + .removeClass( icons.header ) + .addClass( icons.activeHeader ); + this.headers.addClass( "ui-accordion-icons" ); + } + }, + + _destroyIcons: function() { + this.headers + .removeClass( "ui-accordion-icons" ) + .children( ".ui-accordion-header-icon" ) + .remove(); + }, + + _destroy: function() { + var contents; + + // clean up main element + this.element + .removeClass( "ui-accordion ui-widget ui-helper-reset" ) + .removeAttr( "role" ); + + // clean up headers + this.headers + .removeClass( "ui-accordion-header ui-accordion-header-active ui-state-default " + + "ui-corner-all ui-state-active ui-state-disabled ui-corner-top" ) + .removeAttr( "role" ) + .removeAttr( "aria-expanded" ) + .removeAttr( "aria-selected" ) + .removeAttr( "aria-controls" ) + .removeAttr( "tabIndex" ) + .removeUniqueId(); + + this._destroyIcons(); + + // clean up content panels + contents = this.headers.next() + .removeClass( "ui-helper-reset ui-widget-content ui-corner-bottom " + + "ui-accordion-content ui-accordion-content-active ui-state-disabled" ) + .css( "display", "" ) + .removeAttr( "role" ) + .removeAttr( "aria-hidden" ) + .removeAttr( "aria-labelledby" ) + .removeUniqueId(); + + if ( this.options.heightStyle !== "content" ) { + contents.css( "height", "" ); + } + }, + + _setOption: function( key, value ) { + if ( key === "active" ) { + // _activate() will handle invalid values and update this.options + this._activate( value ); + return; + } + + if ( key === "event" ) { + if ( this.options.event ) { + this._off( this.headers, this.options.event ); + } + this._setupEvents( value ); + } + + this._super( key, value ); + + // setting collapsible: false while collapsed; open first panel + if ( key === "collapsible" && !value && this.options.active === false ) { + this._activate( 0 ); + } + + if ( key === "icons" ) { + this._destroyIcons(); + if ( value ) { + this._createIcons(); + } + } + + // #5332 - opacity doesn't cascade to positioned elements in IE + // so we need to add the disabled class to the headers and panels + if ( key === "disabled" ) { + this.element + .toggleClass( "ui-state-disabled", !!value ) + .attr( "aria-disabled", value ); + this.headers.add( this.headers.next() ) + .toggleClass( "ui-state-disabled", !!value ); + } + }, + + _keydown: function( event ) { + if ( event.altKey || event.ctrlKey ) { + return; + } + + var keyCode = $.ui.keyCode, + length = this.headers.length, + currentIndex = this.headers.index( event.target ), + toFocus = false; + + switch ( event.keyCode ) { + case keyCode.RIGHT: + case keyCode.DOWN: + toFocus = this.headers[ ( currentIndex + 1 ) % length ]; + break; + case keyCode.LEFT: + case keyCode.UP: + toFocus = this.headers[ ( currentIndex - 1 + length ) % length ]; + break; + case keyCode.SPACE: + case keyCode.ENTER: + this._eventHandler( event ); + break; + case keyCode.HOME: + toFocus = this.headers[ 0 ]; + break; + case keyCode.END: + toFocus = this.headers[ length - 1 ]; + break; + } + + if ( toFocus ) { + $( event.target ).attr( "tabIndex", -1 ); + $( toFocus ).attr( "tabIndex", 0 ); + toFocus.focus(); + event.preventDefault(); + } + }, + + _panelKeyDown: function( event ) { + if ( event.keyCode === $.ui.keyCode.UP && event.ctrlKey ) { + $( event.currentTarget ).prev().focus(); + } + }, + + refresh: function() { + var options = this.options; + this._processPanels(); + + // was collapsed or no panel + if ( ( options.active === false && options.collapsible === true ) || !this.headers.length ) { + options.active = false; + this.active = $(); + // active false only when collapsible is true + } else if ( options.active === false ) { + this._activate( 0 ); + // was active, but active panel is gone + } else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) { + // all remaining panel are disabled + if ( this.headers.length === this.headers.find(".ui-state-disabled").length ) { + options.active = false; + this.active = $(); + // activate previous panel + } else { + this._activate( Math.max( 0, options.active - 1 ) ); + } + // was active, active panel still exists + } else { + // make sure active index is correct + options.active = this.headers.index( this.active ); + } + + this._destroyIcons(); + + this._refresh(); + }, + + _processPanels: function() { + var prevHeaders = this.headers, + prevPanels = this.panels; + + this.headers = this.element.find( this.options.header ) + .addClass( "ui-accordion-header ui-state-default ui-corner-all" ); + + this.panels = this.headers.next() + .addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" ) + .filter( ":not(.ui-accordion-content-active)" ) + .hide(); + + // Avoid memory leaks (#10056) + if ( prevPanels ) { + this._off( prevHeaders.not( this.headers ) ); + this._off( prevPanels.not( this.panels ) ); + } + }, + + _refresh: function() { + var maxHeight, + options = this.options, + heightStyle = options.heightStyle, + parent = this.element.parent(); + + this.active = this._findActive( options.active ) + .addClass( "ui-accordion-header-active ui-state-active ui-corner-top" ) + .removeClass( "ui-corner-all" ); + this.active.next() + .addClass( "ui-accordion-content-active" ) + .show(); + + this.headers + .attr( "role", "tab" ) + .each(function() { + var header = $( this ), + headerId = header.uniqueId().attr( "id" ), + panel = header.next(), + panelId = panel.uniqueId().attr( "id" ); + header.attr( "aria-controls", panelId ); + panel.attr( "aria-labelledby", headerId ); + }) + .next() + .attr( "role", "tabpanel" ); + + this.headers + .not( this.active ) + .attr({ + "aria-selected": "false", + "aria-expanded": "false", + tabIndex: -1 + }) + .next() + .attr({ + "aria-hidden": "true" + }) + .hide(); + + // make sure at least one header is in the tab order + if ( !this.active.length ) { + this.headers.eq( 0 ).attr( "tabIndex", 0 ); + } else { + this.active.attr({ + "aria-selected": "true", + "aria-expanded": "true", + tabIndex: 0 + }) + .next() + .attr({ + "aria-hidden": "false" + }); + } + + this._createIcons(); + + this._setupEvents( options.event ); + + if ( heightStyle === "fill" ) { + maxHeight = parent.height(); + this.element.siblings( ":visible" ).each(function() { + var elem = $( this ), + position = elem.css( "position" ); + + if ( position === "absolute" || position === "fixed" ) { + return; + } + maxHeight -= elem.outerHeight( true ); + }); + + this.headers.each(function() { + maxHeight -= $( this ).outerHeight( true ); + }); + + this.headers.next() + .each(function() { + $( this ).height( Math.max( 0, maxHeight - + $( this ).innerHeight() + $( this ).height() ) ); + }) + .css( "overflow", "auto" ); + } else if ( heightStyle === "auto" ) { + maxHeight = 0; + this.headers.next() + .each(function() { + maxHeight = Math.max( maxHeight, $( this ).css( "height", "" ).height() ); + }) + .height( maxHeight ); + } + }, + + _activate: function( index ) { + var active = this._findActive( index )[ 0 ]; + + // trying to activate the already active panel + if ( active === this.active[ 0 ] ) { + return; + } + + // trying to collapse, simulate a click on the currently active header + active = active || this.active[ 0 ]; + + this._eventHandler({ + target: active, + currentTarget: active, + preventDefault: $.noop + }); + }, + + _findActive: function( selector ) { + return typeof selector === "number" ? this.headers.eq( selector ) : $(); + }, + + _setupEvents: function( event ) { + var events = { + keydown: "_keydown" + }; + if ( event ) { + $.each( event.split( " " ), function( index, eventName ) { + events[ eventName ] = "_eventHandler"; + }); + } + + this._off( this.headers.add( this.headers.next() ) ); + this._on( this.headers, events ); + this._on( this.headers.next(), { keydown: "_panelKeyDown" }); + this._hoverable( this.headers ); + this._focusable( this.headers ); + }, + + _eventHandler: function( event ) { + var options = this.options, + active = this.active, + clicked = $( event.currentTarget ), + clickedIsActive = clicked[ 0 ] === active[ 0 ], + collapsing = clickedIsActive && options.collapsible, + toShow = collapsing ? $() : clicked.next(), + toHide = active.next(), + eventData = { + oldHeader: active, + oldPanel: toHide, + newHeader: collapsing ? $() : clicked, + newPanel: toShow + }; + + event.preventDefault(); + + if ( + // click on active header, but not collapsible + ( clickedIsActive && !options.collapsible ) || + // allow canceling activation + ( this._trigger( "beforeActivate", event, eventData ) === false ) ) { + return; + } + + options.active = collapsing ? false : this.headers.index( clicked ); + + // when the call to ._toggle() comes after the class changes + // it causes a very odd bug in IE 8 (see #6720) + this.active = clickedIsActive ? $() : clicked; + this._toggle( eventData ); + + // switch classes + // corner classes on the previously active header stay after the animation + active.removeClass( "ui-accordion-header-active ui-state-active" ); + if ( options.icons ) { + active.children( ".ui-accordion-header-icon" ) + .removeClass( options.icons.activeHeader ) + .addClass( options.icons.header ); + } + + if ( !clickedIsActive ) { + clicked + .removeClass( "ui-corner-all" ) + .addClass( "ui-accordion-header-active ui-state-active ui-corner-top" ); + if ( options.icons ) { + clicked.children( ".ui-accordion-header-icon" ) + .removeClass( options.icons.header ) + .addClass( options.icons.activeHeader ); + } + + clicked + .next() + .addClass( "ui-accordion-content-active" ); + } + }, + + _toggle: function( data ) { + var toShow = data.newPanel, + toHide = this.prevShow.length ? this.prevShow : data.oldPanel; + + // handle activating a panel during the animation for another activation + this.prevShow.add( this.prevHide ).stop( true, true ); + this.prevShow = toShow; + this.prevHide = toHide; + + if ( this.options.animate ) { + this._animate( toShow, toHide, data ); + } else { + toHide.hide(); + toShow.show(); + this._toggleComplete( data ); + } + + toHide.attr({ + "aria-hidden": "true" + }); + toHide.prev().attr({ + "aria-selected": "false", + "aria-expanded": "false" + }); + // if we're switching panels, remove the old header from the tab order + // if we're opening from collapsed state, remove the previous header from the tab order + // if we're collapsing, then keep the collapsing header in the tab order + if ( toShow.length && toHide.length ) { + toHide.prev().attr({ + "tabIndex": -1, + "aria-expanded": "false" + }); + } else if ( toShow.length ) { + this.headers.filter(function() { + return parseInt( $( this ).attr( "tabIndex" ), 10 ) === 0; + }) + .attr( "tabIndex", -1 ); + } + + toShow + .attr( "aria-hidden", "false" ) + .prev() + .attr({ + "aria-selected": "true", + "aria-expanded": "true", + tabIndex: 0 + }); + }, + + _animate: function( toShow, toHide, data ) { + var total, easing, duration, + that = this, + adjust = 0, + boxSizing = toShow.css( "box-sizing" ), + down = toShow.length && + ( !toHide.length || ( toShow.index() < toHide.index() ) ), + animate = this.options.animate || {}, + options = down && animate.down || animate, + complete = function() { + that._toggleComplete( data ); + }; + + if ( typeof options === "number" ) { + duration = options; + } + if ( typeof options === "string" ) { + easing = options; + } + // fall back from options to animation in case of partial down settings + easing = easing || options.easing || animate.easing; + duration = duration || options.duration || animate.duration; + + if ( !toHide.length ) { + return toShow.animate( this.showProps, duration, easing, complete ); + } + if ( !toShow.length ) { + return toHide.animate( this.hideProps, duration, easing, complete ); + } + + total = toShow.show().outerHeight(); + toHide.animate( this.hideProps, { + duration: duration, + easing: easing, + step: function( now, fx ) { + fx.now = Math.round( now ); + } + }); + toShow + .hide() + .animate( this.showProps, { + duration: duration, + easing: easing, + complete: complete, + step: function( now, fx ) { + fx.now = Math.round( now ); + if ( fx.prop !== "height" ) { + if ( boxSizing === "content-box" ) { + adjust += fx.now; + } + } else if ( that.options.heightStyle !== "content" ) { + fx.now = Math.round( total - toHide.outerHeight() - adjust ); + adjust = 0; + } + } + }); + }, + + _toggleComplete: function( data ) { + var toHide = data.oldPanel; + + toHide + .removeClass( "ui-accordion-content-active" ) + .prev() + .removeClass( "ui-corner-top" ) + .addClass( "ui-corner-all" ); + + // Work around for rendering bug in IE (#5421) + if ( toHide.length ) { + toHide.parent()[ 0 ].className = toHide.parent()[ 0 ].className; + } + this._trigger( "activate", null, data ); + } +}); + + +/*! + * jQuery UI Menu 1.11.4 + * http://jqueryui.com + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license * - * Depends: - * jquery.effects.core.js + * http://api.jqueryui.com/menu/ */ -(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e== -"show"?1:0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery); -;/* - * jQuery UI Effects Explode 1.8.14 + + +var menu = $.widget( "ui.menu", { + version: "1.11.4", + defaultElement: "
      ", + delay: 300, + options: { + icons: { + submenu: "ui-icon-carat-1-e" + }, + items: "> *", + menus: "ul", + position: { + my: "left-1 top", + at: "right top" + }, + role: "menu", + + // callbacks + blur: null, + focus: null, + select: null + }, + + _create: function() { + this.activeMenu = this.element; + + // Flag used to prevent firing of the click handler + // as the event bubbles up through nested menus + this.mouseHandled = false; + this.element + .uniqueId() + .addClass( "ui-menu ui-widget ui-widget-content" ) + .toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length ) + .attr({ + role: this.options.role, + tabIndex: 0 + }); + + if ( this.options.disabled ) { + this.element + .addClass( "ui-state-disabled" ) + .attr( "aria-disabled", "true" ); + } + + this._on({ + // Prevent focus from sticking to links inside menu after clicking + // them (focus should always stay on UL during navigation). + "mousedown .ui-menu-item": function( event ) { + event.preventDefault(); + }, + "click .ui-menu-item": function( event ) { + var target = $( event.target ); + if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) { + this.select( event ); + + // Only set the mouseHandled flag if the event will bubble, see #9469. + if ( !event.isPropagationStopped() ) { + this.mouseHandled = true; + } + + // Open submenu on click + if ( target.has( ".ui-menu" ).length ) { + this.expand( event ); + } else if ( !this.element.is( ":focus" ) && $( this.document[ 0 ].activeElement ).closest( ".ui-menu" ).length ) { + + // Redirect focus to the menu + this.element.trigger( "focus", [ true ] ); + + // If the active item is on the top level, let it stay active. + // Otherwise, blur the active item since it is no longer visible. + if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) { + clearTimeout( this.timer ); + } + } + } + }, + "mouseenter .ui-menu-item": function( event ) { + // Ignore mouse events while typeahead is active, see #10458. + // Prevents focusing the wrong item when typeahead causes a scroll while the mouse + // is over an item in the menu + if ( this.previousFilter ) { + return; + } + var target = $( event.currentTarget ); + // Remove ui-state-active class from siblings of the newly focused menu item + // to avoid a jump caused by adjacent elements both having a class with a border + target.siblings( ".ui-state-active" ).removeClass( "ui-state-active" ); + this.focus( event, target ); + }, + mouseleave: "collapseAll", + "mouseleave .ui-menu": "collapseAll", + focus: function( event, keepActiveItem ) { + // If there's already an active item, keep it active + // If not, activate the first item + var item = this.active || this.element.find( this.options.items ).eq( 0 ); + + if ( !keepActiveItem ) { + this.focus( event, item ); + } + }, + blur: function( event ) { + this._delay(function() { + if ( !$.contains( this.element[0], this.document[0].activeElement ) ) { + this.collapseAll( event ); + } + }); + }, + keydown: "_keydown" + }); + + this.refresh(); + + // Clicks outside of a menu collapse any open menus + this._on( this.document, { + click: function( event ) { + if ( this._closeOnDocumentClick( event ) ) { + this.collapseAll( event ); + } + + // Reset the mouseHandled flag + this.mouseHandled = false; + } + }); + }, + + _destroy: function() { + // Destroy (sub)menus + this.element + .removeAttr( "aria-activedescendant" ) + .find( ".ui-menu" ).addBack() + .removeClass( "ui-menu ui-widget ui-widget-content ui-menu-icons ui-front" ) + .removeAttr( "role" ) + .removeAttr( "tabIndex" ) + .removeAttr( "aria-labelledby" ) + .removeAttr( "aria-expanded" ) + .removeAttr( "aria-hidden" ) + .removeAttr( "aria-disabled" ) + .removeUniqueId() + .show(); + + // Destroy menu items + this.element.find( ".ui-menu-item" ) + .removeClass( "ui-menu-item" ) + .removeAttr( "role" ) + .removeAttr( "aria-disabled" ) + .removeUniqueId() + .removeClass( "ui-state-hover" ) + .removeAttr( "tabIndex" ) + .removeAttr( "role" ) + .removeAttr( "aria-haspopup" ) + .children().each( function() { + var elem = $( this ); + if ( elem.data( "ui-menu-submenu-carat" ) ) { + elem.remove(); + } + }); + + // Destroy menu dividers + this.element.find( ".ui-menu-divider" ).removeClass( "ui-menu-divider ui-widget-content" ); + }, + + _keydown: function( event ) { + var match, prev, character, skip, + preventDefault = true; + + switch ( event.keyCode ) { + case $.ui.keyCode.PAGE_UP: + this.previousPage( event ); + break; + case $.ui.keyCode.PAGE_DOWN: + this.nextPage( event ); + break; + case $.ui.keyCode.HOME: + this._move( "first", "first", event ); + break; + case $.ui.keyCode.END: + this._move( "last", "last", event ); + break; + case $.ui.keyCode.UP: + this.previous( event ); + break; + case $.ui.keyCode.DOWN: + this.next( event ); + break; + case $.ui.keyCode.LEFT: + this.collapse( event ); + break; + case $.ui.keyCode.RIGHT: + if ( this.active && !this.active.is( ".ui-state-disabled" ) ) { + this.expand( event ); + } + break; + case $.ui.keyCode.ENTER: + case $.ui.keyCode.SPACE: + this._activate( event ); + break; + case $.ui.keyCode.ESCAPE: + this.collapse( event ); + break; + default: + preventDefault = false; + prev = this.previousFilter || ""; + character = String.fromCharCode( event.keyCode ); + skip = false; + + clearTimeout( this.filterTimer ); + + if ( character === prev ) { + skip = true; + } else { + character = prev + character; + } + + match = this._filterMenuItems( character ); + match = skip && match.index( this.active.next() ) !== -1 ? + this.active.nextAll( ".ui-menu-item" ) : + match; + + // If no matches on the current filter, reset to the last character pressed + // to move down the menu to the first item that starts with that character + if ( !match.length ) { + character = String.fromCharCode( event.keyCode ); + match = this._filterMenuItems( character ); + } + + if ( match.length ) { + this.focus( event, match ); + this.previousFilter = character; + this.filterTimer = this._delay(function() { + delete this.previousFilter; + }, 1000 ); + } else { + delete this.previousFilter; + } + } + + if ( preventDefault ) { + event.preventDefault(); + } + }, + + _activate: function( event ) { + if ( !this.active.is( ".ui-state-disabled" ) ) { + if ( this.active.is( "[aria-haspopup='true']" ) ) { + this.expand( event ); + } else { + this.select( event ); + } + } + }, + + refresh: function() { + var menus, items, + that = this, + icon = this.options.icons.submenu, + submenus = this.element.find( this.options.menus ); + + this.element.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length ); + + // Initialize nested menus + submenus.filter( ":not(.ui-menu)" ) + .addClass( "ui-menu ui-widget ui-widget-content ui-front" ) + .hide() + .attr({ + role: this.options.role, + "aria-hidden": "true", + "aria-expanded": "false" + }) + .each(function() { + var menu = $( this ), + item = menu.parent(), + submenuCarat = $( "" ) + .addClass( "ui-menu-icon ui-icon " + icon ) + .data( "ui-menu-submenu-carat", true ); + + item + .attr( "aria-haspopup", "true" ) + .prepend( submenuCarat ); + menu.attr( "aria-labelledby", item.attr( "id" ) ); + }); + + menus = submenus.add( this.element ); + items = menus.find( this.options.items ); + + // Initialize menu-items containing spaces and/or dashes only as dividers + items.not( ".ui-menu-item" ).each(function() { + var item = $( this ); + if ( that._isDivider( item ) ) { + item.addClass( "ui-widget-content ui-menu-divider" ); + } + }); + + // Don't refresh list items that are already adapted + items.not( ".ui-menu-item, .ui-menu-divider" ) + .addClass( "ui-menu-item" ) + .uniqueId() + .attr({ + tabIndex: -1, + role: this._itemRole() + }); + + // Add aria-disabled attribute to any disabled menu item + items.filter( ".ui-state-disabled" ).attr( "aria-disabled", "true" ); + + // If the active item has been removed, blur the menu + if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) { + this.blur(); + } + }, + + _itemRole: function() { + return { + menu: "menuitem", + listbox: "option" + }[ this.options.role ]; + }, + + _setOption: function( key, value ) { + if ( key === "icons" ) { + this.element.find( ".ui-menu-icon" ) + .removeClass( this.options.icons.submenu ) + .addClass( value.submenu ); + } + if ( key === "disabled" ) { + this.element + .toggleClass( "ui-state-disabled", !!value ) + .attr( "aria-disabled", value ); + } + this._super( key, value ); + }, + + focus: function( event, item ) { + var nested, focused; + this.blur( event, event && event.type === "focus" ); + + this._scrollIntoView( item ); + + this.active = item.first(); + focused = this.active.addClass( "ui-state-focus" ).removeClass( "ui-state-active" ); + // Only update aria-activedescendant if there's a role + // otherwise we assume focus is managed elsewhere + if ( this.options.role ) { + this.element.attr( "aria-activedescendant", focused.attr( "id" ) ); + } + + // Highlight active parent menu item, if any + this.active + .parent() + .closest( ".ui-menu-item" ) + .addClass( "ui-state-active" ); + + if ( event && event.type === "keydown" ) { + this._close(); + } else { + this.timer = this._delay(function() { + this._close(); + }, this.delay ); + } + + nested = item.children( ".ui-menu" ); + if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) { + this._startOpening(nested); + } + this.activeMenu = item.parent(); + + this._trigger( "focus", event, { item: item } ); + }, + + _scrollIntoView: function( item ) { + var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight; + if ( this._hasScroll() ) { + borderTop = parseFloat( $.css( this.activeMenu[0], "borderTopWidth" ) ) || 0; + paddingTop = parseFloat( $.css( this.activeMenu[0], "paddingTop" ) ) || 0; + offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop; + scroll = this.activeMenu.scrollTop(); + elementHeight = this.activeMenu.height(); + itemHeight = item.outerHeight(); + + if ( offset < 0 ) { + this.activeMenu.scrollTop( scroll + offset ); + } else if ( offset + itemHeight > elementHeight ) { + this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight ); + } + } + }, + + blur: function( event, fromFocus ) { + if ( !fromFocus ) { + clearTimeout( this.timer ); + } + + if ( !this.active ) { + return; + } + + this.active.removeClass( "ui-state-focus" ); + this.active = null; + + this._trigger( "blur", event, { item: this.active } ); + }, + + _startOpening: function( submenu ) { + clearTimeout( this.timer ); + + // Don't open if already open fixes a Firefox bug that caused a .5 pixel + // shift in the submenu position when mousing over the carat icon + if ( submenu.attr( "aria-hidden" ) !== "true" ) { + return; + } + + this.timer = this._delay(function() { + this._close(); + this._open( submenu ); + }, this.delay ); + }, + + _open: function( submenu ) { + var position = $.extend({ + of: this.active + }, this.options.position ); + + clearTimeout( this.timer ); + this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) ) + .hide() + .attr( "aria-hidden", "true" ); + + submenu + .show() + .removeAttr( "aria-hidden" ) + .attr( "aria-expanded", "true" ) + .position( position ); + }, + + collapseAll: function( event, all ) { + clearTimeout( this.timer ); + this.timer = this._delay(function() { + // If we were passed an event, look for the submenu that contains the event + var currentMenu = all ? this.element : + $( event && event.target ).closest( this.element.find( ".ui-menu" ) ); + + // If we found no valid submenu ancestor, use the main menu to close all sub menus anyway + if ( !currentMenu.length ) { + currentMenu = this.element; + } + + this._close( currentMenu ); + + this.blur( event ); + this.activeMenu = currentMenu; + }, this.delay ); + }, + + // With no arguments, closes the currently active menu - if nothing is active + // it closes all menus. If passed an argument, it will search for menus BELOW + _close: function( startMenu ) { + if ( !startMenu ) { + startMenu = this.active ? this.active.parent() : this.element; + } + + startMenu + .find( ".ui-menu" ) + .hide() + .attr( "aria-hidden", "true" ) + .attr( "aria-expanded", "false" ) + .end() + .find( ".ui-state-active" ).not( ".ui-state-focus" ) + .removeClass( "ui-state-active" ); + }, + + _closeOnDocumentClick: function( event ) { + return !$( event.target ).closest( ".ui-menu" ).length; + }, + + _isDivider: function( item ) { + + // Match hyphen, em dash, en dash + return !/[^\-\u2014\u2013\s]/.test( item.text() ); + }, + + collapse: function( event ) { + var newItem = this.active && + this.active.parent().closest( ".ui-menu-item", this.element ); + if ( newItem && newItem.length ) { + this._close(); + this.focus( event, newItem ); + } + }, + + expand: function( event ) { + var newItem = this.active && + this.active + .children( ".ui-menu " ) + .find( this.options.items ) + .first(); + + if ( newItem && newItem.length ) { + this._open( newItem.parent() ); + + // Delay so Firefox will not hide activedescendant change in expanding submenu from AT + this._delay(function() { + this.focus( event, newItem ); + }); + } + }, + + next: function( event ) { + this._move( "next", "first", event ); + }, + + previous: function( event ) { + this._move( "prev", "last", event ); + }, + + isFirstItem: function() { + return this.active && !this.active.prevAll( ".ui-menu-item" ).length; + }, + + isLastItem: function() { + return this.active && !this.active.nextAll( ".ui-menu-item" ).length; + }, + + _move: function( direction, filter, event ) { + var next; + if ( this.active ) { + if ( direction === "first" || direction === "last" ) { + next = this.active + [ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" ) + .eq( -1 ); + } else { + next = this.active + [ direction + "All" ]( ".ui-menu-item" ) + .eq( 0 ); + } + } + if ( !next || !next.length || !this.active ) { + next = this.activeMenu.find( this.options.items )[ filter ](); + } + + this.focus( event, next ); + }, + + nextPage: function( event ) { + var item, base, height; + + if ( !this.active ) { + this.next( event ); + return; + } + if ( this.isLastItem() ) { + return; + } + if ( this._hasScroll() ) { + base = this.active.offset().top; + height = this.element.height(); + this.active.nextAll( ".ui-menu-item" ).each(function() { + item = $( this ); + return item.offset().top - base - height < 0; + }); + + this.focus( event, item ); + } else { + this.focus( event, this.activeMenu.find( this.options.items ) + [ !this.active ? "first" : "last" ]() ); + } + }, + + previousPage: function( event ) { + var item, base, height; + if ( !this.active ) { + this.next( event ); + return; + } + if ( this.isFirstItem() ) { + return; + } + if ( this._hasScroll() ) { + base = this.active.offset().top; + height = this.element.height(); + this.active.prevAll( ".ui-menu-item" ).each(function() { + item = $( this ); + return item.offset().top - base + height > 0; + }); + + this.focus( event, item ); + } else { + this.focus( event, this.activeMenu.find( this.options.items ).first() ); + } + }, + + _hasScroll: function() { + return this.element.outerHeight() < this.element.prop( "scrollHeight" ); + }, + + select: function( event ) { + // TODO: It should never be possible to not have an active item at this + // point, but the tests don't trigger mouseenter before click. + this.active = this.active || $( event.target ).closest( ".ui-menu-item" ); + var ui = { item: this.active }; + if ( !this.active.has( ".ui-menu" ).length ) { + this.collapseAll( event, true ); + } + this._trigger( "select", event, ui ); + }, + + _filterMenuItems: function(character) { + var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ), + regex = new RegExp( "^" + escapedCharacter, "i" ); + + return this.activeMenu + .find( this.options.items ) + + // Only match on items, not dividers or other content (#10571) + .filter( ".ui-menu-item" ) + .filter(function() { + return regex.test( $.trim( $( this ).text() ) ); + }); + } +}); + + +/*! + * jQuery UI Autocomplete 1.11.4 + * http://jqueryui.com * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. * http://jquery.org/license * - * http://docs.jquery.com/UI/Effects/Explode + * http://api.jqueryui.com/autocomplete/ + */ + + +$.widget( "ui.autocomplete", { + version: "1.11.4", + defaultElement: "", + options: { + appendTo: null, + autoFocus: false, + delay: 300, + minLength: 1, + position: { + my: "left top", + at: "left bottom", + collision: "none" + }, + source: null, + + // callbacks + change: null, + close: null, + focus: null, + open: null, + response: null, + search: null, + select: null + }, + + requestIndex: 0, + pending: 0, + + _create: function() { + // Some browsers only repeat keydown events, not keypress events, + // so we use the suppressKeyPress flag to determine if we've already + // handled the keydown event. #7269 + // Unfortunately the code for & in keypress is the same as the up arrow, + // so we use the suppressKeyPressRepeat flag to avoid handling keypress + // events when we know the keydown event was used to modify the + // search term. #7799 + var suppressKeyPress, suppressKeyPressRepeat, suppressInput, + nodeName = this.element[ 0 ].nodeName.toLowerCase(), + isTextarea = nodeName === "textarea", + isInput = nodeName === "input"; + + this.isMultiLine = + // Textareas are always multi-line + isTextarea ? true : + // Inputs are always single-line, even if inside a contentEditable element + // IE also treats inputs as contentEditable + isInput ? false : + // All other element types are determined by whether or not they're contentEditable + this.element.prop( "isContentEditable" ); + + this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ]; + this.isNewMenu = true; + + this.element + .addClass( "ui-autocomplete-input" ) + .attr( "autocomplete", "off" ); + + this._on( this.element, { + keydown: function( event ) { + if ( this.element.prop( "readOnly" ) ) { + suppressKeyPress = true; + suppressInput = true; + suppressKeyPressRepeat = true; + return; + } + + suppressKeyPress = false; + suppressInput = false; + suppressKeyPressRepeat = false; + var keyCode = $.ui.keyCode; + switch ( event.keyCode ) { + case keyCode.PAGE_UP: + suppressKeyPress = true; + this._move( "previousPage", event ); + break; + case keyCode.PAGE_DOWN: + suppressKeyPress = true; + this._move( "nextPage", event ); + break; + case keyCode.UP: + suppressKeyPress = true; + this._keyEvent( "previous", event ); + break; + case keyCode.DOWN: + suppressKeyPress = true; + this._keyEvent( "next", event ); + break; + case keyCode.ENTER: + // when menu is open and has focus + if ( this.menu.active ) { + // #6055 - Opera still allows the keypress to occur + // which causes forms to submit + suppressKeyPress = true; + event.preventDefault(); + this.menu.select( event ); + } + break; + case keyCode.TAB: + if ( this.menu.active ) { + this.menu.select( event ); + } + break; + case keyCode.ESCAPE: + if ( this.menu.element.is( ":visible" ) ) { + if ( !this.isMultiLine ) { + this._value( this.term ); + } + this.close( event ); + // Different browsers have different default behavior for escape + // Single press can mean undo or clear + // Double press in IE means clear the whole form + event.preventDefault(); + } + break; + default: + suppressKeyPressRepeat = true; + // search timeout should be triggered before the input value is changed + this._searchTimeout( event ); + break; + } + }, + keypress: function( event ) { + if ( suppressKeyPress ) { + suppressKeyPress = false; + if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) { + event.preventDefault(); + } + return; + } + if ( suppressKeyPressRepeat ) { + return; + } + + // replicate some key handlers to allow them to repeat in Firefox and Opera + var keyCode = $.ui.keyCode; + switch ( event.keyCode ) { + case keyCode.PAGE_UP: + this._move( "previousPage", event ); + break; + case keyCode.PAGE_DOWN: + this._move( "nextPage", event ); + break; + case keyCode.UP: + this._keyEvent( "previous", event ); + break; + case keyCode.DOWN: + this._keyEvent( "next", event ); + break; + } + }, + input: function( event ) { + if ( suppressInput ) { + suppressInput = false; + event.preventDefault(); + return; + } + this._searchTimeout( event ); + }, + focus: function() { + this.selectedItem = null; + this.previous = this._value(); + }, + blur: function( event ) { + if ( this.cancelBlur ) { + delete this.cancelBlur; + return; + } + + clearTimeout( this.searching ); + this.close( event ); + this._change( event ); + } + }); + + this._initSource(); + this.menu = $( "
        " ) + .addClass( "ui-autocomplete ui-front" ) + .appendTo( this._appendTo() ) + .menu({ + // disable ARIA support, the live region takes care of that + role: null + }) + .hide() + .menu( "instance" ); + + this._on( this.menu.element, { + mousedown: function( event ) { + // prevent moving focus out of the text field + event.preventDefault(); + + // IE doesn't prevent moving focus even with event.preventDefault() + // so we set a flag to know when we should ignore the blur event + this.cancelBlur = true; + this._delay(function() { + delete this.cancelBlur; + }); + + // clicking on the scrollbar causes focus to shift to the body + // but we can't detect a mouseup or a click immediately afterward + // so we have to track the next mousedown and close the menu if + // the user clicks somewhere outside of the autocomplete + var menuElement = this.menu.element[ 0 ]; + if ( !$( event.target ).closest( ".ui-menu-item" ).length ) { + this._delay(function() { + var that = this; + this.document.one( "mousedown", function( event ) { + if ( event.target !== that.element[ 0 ] && + event.target !== menuElement && + !$.contains( menuElement, event.target ) ) { + that.close(); + } + }); + }); + } + }, + menufocus: function( event, ui ) { + var label, item; + // support: Firefox + // Prevent accidental activation of menu items in Firefox (#7024 #9118) + if ( this.isNewMenu ) { + this.isNewMenu = false; + if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) { + this.menu.blur(); + + this.document.one( "mousemove", function() { + $( event.target ).trigger( event.originalEvent ); + }); + + return; + } + } + + item = ui.item.data( "ui-autocomplete-item" ); + if ( false !== this._trigger( "focus", event, { item: item } ) ) { + // use value to match what will end up in the input, if it was a key event + if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) { + this._value( item.value ); + } + } + + // Announce the value in the liveRegion + label = ui.item.attr( "aria-label" ) || item.value; + if ( label && $.trim( label ).length ) { + this.liveRegion.children().hide(); + $( "
        " ).text( label ).appendTo( this.liveRegion ); + } + }, + menuselect: function( event, ui ) { + var item = ui.item.data( "ui-autocomplete-item" ), + previous = this.previous; + + // only trigger when focus was lost (click on menu) + if ( this.element[ 0 ] !== this.document[ 0 ].activeElement ) { + this.element.focus(); + this.previous = previous; + // #6109 - IE triggers two focus events and the second + // is asynchronous, so we need to reset the previous + // term synchronously and asynchronously :-( + this._delay(function() { + this.previous = previous; + this.selectedItem = item; + }); + } + + if ( false !== this._trigger( "select", event, { item: item } ) ) { + this._value( item.value ); + } + // reset the term after the select event + // this allows custom select handling to work properly + this.term = this._value(); + + this.close( event ); + this.selectedItem = item; + } + }); + + this.liveRegion = $( "", { + role: "status", + "aria-live": "assertive", + "aria-relevant": "additions" + }) + .addClass( "ui-helper-hidden-accessible" ) + .appendTo( this.document[ 0 ].body ); + + // turning off autocomplete prevents the browser from remembering the + // value when navigating through history, so we re-enable autocomplete + // if the page is unloaded before the widget is destroyed. #7790 + this._on( this.window, { + beforeunload: function() { + this.element.removeAttr( "autocomplete" ); + } + }); + }, + + _destroy: function() { + clearTimeout( this.searching ); + this.element + .removeClass( "ui-autocomplete-input" ) + .removeAttr( "autocomplete" ); + this.menu.element.remove(); + this.liveRegion.remove(); + }, + + _setOption: function( key, value ) { + this._super( key, value ); + if ( key === "source" ) { + this._initSource(); + } + if ( key === "appendTo" ) { + this.menu.element.appendTo( this._appendTo() ); + } + if ( key === "disabled" && value && this.xhr ) { + this.xhr.abort(); + } + }, + + _appendTo: function() { + var element = this.options.appendTo; + + if ( element ) { + element = element.jquery || element.nodeType ? + $( element ) : + this.document.find( element ).eq( 0 ); + } + + if ( !element || !element[ 0 ] ) { + element = this.element.closest( ".ui-front" ); + } + + if ( !element.length ) { + element = this.document[ 0 ].body; + } + + return element; + }, + + _initSource: function() { + var array, url, + that = this; + if ( $.isArray( this.options.source ) ) { + array = this.options.source; + this.source = function( request, response ) { + response( $.ui.autocomplete.filter( array, request.term ) ); + }; + } else if ( typeof this.options.source === "string" ) { + url = this.options.source; + this.source = function( request, response ) { + if ( that.xhr ) { + that.xhr.abort(); + } + that.xhr = $.ajax({ + url: url, + data: request, + dataType: "json", + success: function( data ) { + response( data ); + }, + error: function() { + response([]); + } + }); + }; + } else { + this.source = this.options.source; + } + }, + + _searchTimeout: function( event ) { + clearTimeout( this.searching ); + this.searching = this._delay(function() { + + // Search if the value has changed, or if the user retypes the same value (see #7434) + var equalValues = this.term === this._value(), + menuVisible = this.menu.element.is( ":visible" ), + modifierKey = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey; + + if ( !equalValues || ( equalValues && !menuVisible && !modifierKey ) ) { + this.selectedItem = null; + this.search( null, event ); + } + }, this.options.delay ); + }, + + search: function( value, event ) { + value = value != null ? value : this._value(); + + // always save the actual value, not the one passed as an argument + this.term = this._value(); + + if ( value.length < this.options.minLength ) { + return this.close( event ); + } + + if ( this._trigger( "search", event ) === false ) { + return; + } + + return this._search( value ); + }, + + _search: function( value ) { + this.pending++; + this.element.addClass( "ui-autocomplete-loading" ); + this.cancelSearch = false; + + this.source( { term: value }, this._response() ); + }, + + _response: function() { + var index = ++this.requestIndex; + + return $.proxy(function( content ) { + if ( index === this.requestIndex ) { + this.__response( content ); + } + + this.pending--; + if ( !this.pending ) { + this.element.removeClass( "ui-autocomplete-loading" ); + } + }, this ); + }, + + __response: function( content ) { + if ( content ) { + content = this._normalize( content ); + } + this._trigger( "response", null, { content: content } ); + if ( !this.options.disabled && content && content.length && !this.cancelSearch ) { + this._suggest( content ); + this._trigger( "open" ); + } else { + // use ._close() instead of .close() so we don't cancel future searches + this._close(); + } + }, + + close: function( event ) { + this.cancelSearch = true; + this._close( event ); + }, + + _close: function( event ) { + if ( this.menu.element.is( ":visible" ) ) { + this.menu.element.hide(); + this.menu.blur(); + this.isNewMenu = true; + this._trigger( "close", event ); + } + }, + + _change: function( event ) { + if ( this.previous !== this._value() ) { + this._trigger( "change", event, { item: this.selectedItem } ); + } + }, + + _normalize: function( items ) { + // assume all items have the right format when the first item is complete + if ( items.length && items[ 0 ].label && items[ 0 ].value ) { + return items; + } + return $.map( items, function( item ) { + if ( typeof item === "string" ) { + return { + label: item, + value: item + }; + } + return $.extend( {}, item, { + label: item.label || item.value, + value: item.value || item.label + }); + }); + }, + + _suggest: function( items ) { + var ul = this.menu.element.empty(); + this._renderMenu( ul, items ); + this.isNewMenu = true; + this.menu.refresh(); + + // size and position menu + ul.show(); + this._resizeMenu(); + ul.position( $.extend({ + of: this.element + }, this.options.position ) ); + + if ( this.options.autoFocus ) { + this.menu.next(); + } + }, + + _resizeMenu: function() { + var ul = this.menu.element; + ul.outerWidth( Math.max( + // Firefox wraps long text (possibly a rounding bug) + // so we add 1px to avoid the wrapping (#7513) + ul.width( "" ).outerWidth() + 1, + this.element.outerWidth() + ) ); + }, + + _renderMenu: function( ul, items ) { + var that = this; + $.each( items, function( index, item ) { + that._renderItemData( ul, item ); + }); + }, + + _renderItemData: function( ul, item ) { + return this._renderItem( ul, item ).data( "ui-autocomplete-item", item ); + }, + + _renderItem: function( ul, item ) { + return $( "
      • " ).text( item.label ).appendTo( ul ); + }, + + _move: function( direction, event ) { + if ( !this.menu.element.is( ":visible" ) ) { + this.search( null, event ); + return; + } + if ( this.menu.isFirstItem() && /^previous/.test( direction ) || + this.menu.isLastItem() && /^next/.test( direction ) ) { + + if ( !this.isMultiLine ) { + this._value( this.term ); + } + + this.menu.blur(); + return; + } + this.menu[ direction ]( event ); + }, + + widget: function() { + return this.menu.element; + }, + + _value: function() { + return this.valueMethod.apply( this.element, arguments ); + }, + + _keyEvent: function( keyEvent, event ) { + if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) { + this._move( keyEvent, event ); + + // prevents moving cursor to beginning/end of the text field in some browsers + event.preventDefault(); + } + } +}); + +$.extend( $.ui.autocomplete, { + escapeRegex: function( value ) { + return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ); + }, + filter: function( array, term ) { + var matcher = new RegExp( $.ui.autocomplete.escapeRegex( term ), "i" ); + return $.grep( array, function( value ) { + return matcher.test( value.label || value.value || value ); + }); + } +}); + +// live region extension, adding a `messages` option +// NOTE: This is an experimental API. We are still investigating +// a full solution for string manipulation and internationalization. +$.widget( "ui.autocomplete", $.ui.autocomplete, { + options: { + messages: { + noResults: "No search results.", + results: function( amount ) { + return amount + ( amount > 1 ? " results are" : " result is" ) + + " available, use up and down arrow keys to navigate."; + } + } + }, + + __response: function( content ) { + var message; + this._superApply( arguments ); + if ( this.options.disabled || this.cancelSearch ) { + return; + } + if ( content && content.length ) { + message = this.options.messages.results( content.length ); + } else { + message = this.options.messages.noResults; + } + this.liveRegion.children().hide(); + $( "
        " ).text( message ).appendTo( this.liveRegion ); + } +}); + +var autocomplete = $.ui.autocomplete; + + +/*! + * jQuery UI Button 1.11.4 + * http://jqueryui.com * - * Depends: - * jquery.effects.core.js + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + * + * http://api.jqueryui.com/button/ + */ + + +var lastActive, + baseClasses = "ui-button ui-widget ui-state-default ui-corner-all", + typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only", + formResetHandler = function() { + var form = $( this ); + setTimeout(function() { + form.find( ":ui-button" ).button( "refresh" ); + }, 1 ); + }, + radioGroup = function( radio ) { + var name = radio.name, + form = radio.form, + radios = $( [] ); + if ( name ) { + name = name.replace( /'/g, "\\'" ); + if ( form ) { + radios = $( form ).find( "[name='" + name + "'][type=radio]" ); + } else { + radios = $( "[name='" + name + "'][type=radio]", radio.ownerDocument ) + .filter(function() { + return !this.form; + }); + } + } + return radios; + }; + +$.widget( "ui.button", { + version: "1.11.4", + defaultElement: "").addClass(this._triggerClass). + html(!buttonImage ? buttonText : $("").attr( + { src:buttonImage, alt:buttonText, title:buttonText }))); + input[isRTL ? "before" : "after"](inst.trigger); + inst.trigger.click(function() { + if ($.datepicker._datepickerShowing && $.datepicker._lastInput === input[0]) { + $.datepicker._hideDatepicker(); + } else if ($.datepicker._datepickerShowing && $.datepicker._lastInput !== input[0]) { + $.datepicker._hideDatepicker(); + $.datepicker._showDatepicker(input[0]); + } else { + $.datepicker._showDatepicker(input[0]); + } + return false; + }); + } + }, + + /* Apply the maximum length for the date format. */ + _autoSize: function(inst) { + if (this._get(inst, "autoSize") && !inst.inline) { + var findMax, max, maxI, i, + date = new Date(2009, 12 - 1, 20), // Ensure double digits + dateFormat = this._get(inst, "dateFormat"); + + if (dateFormat.match(/[DM]/)) { + findMax = function(names) { + max = 0; + maxI = 0; + for (i = 0; i < names.length; i++) { + if (names[i].length > max) { + max = names[i].length; + maxI = i; + } + } + return maxI; + }; + date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ? + "monthNames" : "monthNamesShort")))); + date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ? + "dayNames" : "dayNamesShort"))) + 20 - date.getDay()); + } + inst.input.attr("size", this._formatDate(inst, date).length); + } + }, + + /* Attach an inline date picker to a div. */ + _inlineDatepicker: function(target, inst) { + var divSpan = $(target); + if (divSpan.hasClass(this.markerClassName)) { + return; + } + divSpan.addClass(this.markerClassName).append(inst.dpDiv); + $.data(target, "datepicker", inst); + this._setDate(inst, this._getDefaultDate(inst), true); + this._updateDatepicker(inst); + this._updateAlternate(inst); + //If disabled option is true, disable the datepicker before showing it (see ticket #5665) + if( inst.settings.disabled ) { + this._disableDatepicker( target ); + } + // Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements + // http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height + inst.dpDiv.css( "display", "block" ); + }, + + /* Pop-up the date picker in a "dialog" box. + * @param input element - ignored + * @param date string or Date - the initial date to display + * @param onSelect function - the function to call when a date is selected + * @param settings object - update the dialog date picker instance's settings (anonymous object) + * @param pos int[2] - coordinates for the dialog's position within the screen or + * event - with x/y coordinates or + * leave empty for default (screen centre) + * @return the manager object + */ + _dialogDatepicker: function(input, date, onSelect, settings, pos) { + var id, browserWidth, browserHeight, scrollX, scrollY, + inst = this._dialogInst; // internal instance + + if (!inst) { + this.uuid += 1; + id = "dp" + this.uuid; + this._dialogInput = $(""); + this._dialogInput.keydown(this._doKeyDown); + $("body").append(this._dialogInput); + inst = this._dialogInst = this._newInst(this._dialogInput, false); + inst.settings = {}; + $.data(this._dialogInput[0], "datepicker", inst); + } + datepicker_extendRemove(inst.settings, settings || {}); + date = (date && date.constructor === Date ? this._formatDate(inst, date) : date); + this._dialogInput.val(date); + + this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null); + if (!this._pos) { + browserWidth = document.documentElement.clientWidth; + browserHeight = document.documentElement.clientHeight; + scrollX = document.documentElement.scrollLeft || document.body.scrollLeft; + scrollY = document.documentElement.scrollTop || document.body.scrollTop; + this._pos = // should use actual width/height below + [(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY]; + } + + // move input on screen for focus, but hidden behind dialog + this._dialogInput.css("left", (this._pos[0] + 20) + "px").css("top", this._pos[1] + "px"); + inst.settings.onSelect = onSelect; + this._inDialog = true; + this.dpDiv.addClass(this._dialogClass); + this._showDatepicker(this._dialogInput[0]); + if ($.blockUI) { + $.blockUI(this.dpDiv); + } + $.data(this._dialogInput[0], "datepicker", inst); + return this; + }, + + /* Detach a datepicker from its control. + * @param target element - the target input field or division or span + */ + _destroyDatepicker: function(target) { + var nodeName, + $target = $(target), + inst = $.data(target, "datepicker"); + + if (!$target.hasClass(this.markerClassName)) { + return; + } + + nodeName = target.nodeName.toLowerCase(); + $.removeData(target, "datepicker"); + if (nodeName === "input") { + inst.append.remove(); + inst.trigger.remove(); + $target.removeClass(this.markerClassName). + unbind("focus", this._showDatepicker). + unbind("keydown", this._doKeyDown). + unbind("keypress", this._doKeyPress). + unbind("keyup", this._doKeyUp); + } else if (nodeName === "div" || nodeName === "span") { + $target.removeClass(this.markerClassName).empty(); + } + + if ( datepicker_instActive === inst ) { + datepicker_instActive = null; + } + }, + + /* Enable the date picker to a jQuery selection. + * @param target element - the target input field or division or span + */ + _enableDatepicker: function(target) { + var nodeName, inline, + $target = $(target), + inst = $.data(target, "datepicker"); + + if (!$target.hasClass(this.markerClassName)) { + return; + } + + nodeName = target.nodeName.toLowerCase(); + if (nodeName === "input") { + target.disabled = false; + inst.trigger.filter("button"). + each(function() { this.disabled = false; }).end(). + filter("img").css({opacity: "1.0", cursor: ""}); + } else if (nodeName === "div" || nodeName === "span") { + inline = $target.children("." + this._inlineClass); + inline.children().removeClass("ui-state-disabled"); + inline.find("select.ui-datepicker-month, select.ui-datepicker-year"). + prop("disabled", false); + } + this._disabledInputs = $.map(this._disabledInputs, + function(value) { return (value === target ? null : value); }); // delete entry + }, + + /* Disable the date picker to a jQuery selection. + * @param target element - the target input field or division or span + */ + _disableDatepicker: function(target) { + var nodeName, inline, + $target = $(target), + inst = $.data(target, "datepicker"); + + if (!$target.hasClass(this.markerClassName)) { + return; + } + + nodeName = target.nodeName.toLowerCase(); + if (nodeName === "input") { + target.disabled = true; + inst.trigger.filter("button"). + each(function() { this.disabled = true; }).end(). + filter("img").css({opacity: "0.5", cursor: "default"}); + } else if (nodeName === "div" || nodeName === "span") { + inline = $target.children("." + this._inlineClass); + inline.children().addClass("ui-state-disabled"); + inline.find("select.ui-datepicker-month, select.ui-datepicker-year"). + prop("disabled", true); + } + this._disabledInputs = $.map(this._disabledInputs, + function(value) { return (value === target ? null : value); }); // delete entry + this._disabledInputs[this._disabledInputs.length] = target; + }, + + /* Is the first field in a jQuery collection disabled as a datepicker? + * @param target element - the target input field or division or span + * @return boolean - true if disabled, false if enabled + */ + _isDisabledDatepicker: function(target) { + if (!target) { + return false; + } + for (var i = 0; i < this._disabledInputs.length; i++) { + if (this._disabledInputs[i] === target) { + return true; + } + } + return false; + }, + + /* Retrieve the instance data for the target control. + * @param target element - the target input field or division or span + * @return object - the associated instance data + * @throws error if a jQuery problem getting data + */ + _getInst: function(target) { + try { + return $.data(target, "datepicker"); + } + catch (err) { + throw "Missing instance data for this datepicker"; + } + }, + + /* Update or retrieve the settings for a date picker attached to an input field or division. + * @param target element - the target input field or division or span + * @param name object - the new settings to update or + * string - the name of the setting to change or retrieve, + * when retrieving also "all" for all instance settings or + * "defaults" for all global defaults + * @param value any - the new value for the setting + * (omit if above is an object or to retrieve a value) + */ + _optionDatepicker: function(target, name, value) { + var settings, date, minDate, maxDate, + inst = this._getInst(target); + + if (arguments.length === 2 && typeof name === "string") { + return (name === "defaults" ? $.extend({}, $.datepicker._defaults) : + (inst ? (name === "all" ? $.extend({}, inst.settings) : + this._get(inst, name)) : null)); + } + + settings = name || {}; + if (typeof name === "string") { + settings = {}; + settings[name] = value; + } + + if (inst) { + if (this._curInst === inst) { + this._hideDatepicker(); + } + + date = this._getDateDatepicker(target, true); + minDate = this._getMinMaxDate(inst, "min"); + maxDate = this._getMinMaxDate(inst, "max"); + datepicker_extendRemove(inst.settings, settings); + // reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided + if (minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined) { + inst.settings.minDate = this._formatDate(inst, minDate); + } + if (maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined) { + inst.settings.maxDate = this._formatDate(inst, maxDate); + } + if ( "disabled" in settings ) { + if ( settings.disabled ) { + this._disableDatepicker(target); + } else { + this._enableDatepicker(target); + } + } + this._attachments($(target), inst); + this._autoSize(inst); + this._setDate(inst, date); + this._updateAlternate(inst); + this._updateDatepicker(inst); + } + }, + + // change method deprecated + _changeDatepicker: function(target, name, value) { + this._optionDatepicker(target, name, value); + }, + + /* Redraw the date picker attached to an input field or division. + * @param target element - the target input field or division or span + */ + _refreshDatepicker: function(target) { + var inst = this._getInst(target); + if (inst) { + this._updateDatepicker(inst); + } + }, + + /* Set the dates for a jQuery selection. + * @param target element - the target input field or division or span + * @param date Date - the new date + */ + _setDateDatepicker: function(target, date) { + var inst = this._getInst(target); + if (inst) { + this._setDate(inst, date); + this._updateDatepicker(inst); + this._updateAlternate(inst); + } + }, + + /* Get the date(s) for the first entry in a jQuery selection. + * @param target element - the target input field or division or span + * @param noDefault boolean - true if no default date is to be used + * @return Date - the current date + */ + _getDateDatepicker: function(target, noDefault) { + var inst = this._getInst(target); + if (inst && !inst.inline) { + this._setDateFromField(inst, noDefault); + } + return (inst ? this._getDate(inst) : null); + }, + + /* Handle keystrokes. */ + _doKeyDown: function(event) { + var onSelect, dateStr, sel, + inst = $.datepicker._getInst(event.target), + handled = true, + isRTL = inst.dpDiv.is(".ui-datepicker-rtl"); + + inst._keyEvent = true; + if ($.datepicker._datepickerShowing) { + switch (event.keyCode) { + case 9: $.datepicker._hideDatepicker(); + handled = false; + break; // hide on tab out + case 13: sel = $("td." + $.datepicker._dayOverClass + ":not(." + + $.datepicker._currentClass + ")", inst.dpDiv); + if (sel[0]) { + $.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]); + } + + onSelect = $.datepicker._get(inst, "onSelect"); + if (onSelect) { + dateStr = $.datepicker._formatDate(inst); + + // trigger custom callback + onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]); + } else { + $.datepicker._hideDatepicker(); + } + + return false; // don't submit the form + case 27: $.datepicker._hideDatepicker(); + break; // hide on escape + case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ? + -$.datepicker._get(inst, "stepBigMonths") : + -$.datepicker._get(inst, "stepMonths")), "M"); + break; // previous month/year on page up/+ ctrl + case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ? + +$.datepicker._get(inst, "stepBigMonths") : + +$.datepicker._get(inst, "stepMonths")), "M"); + break; // next month/year on page down/+ ctrl + case 35: if (event.ctrlKey || event.metaKey) { + $.datepicker._clearDate(event.target); + } + handled = event.ctrlKey || event.metaKey; + break; // clear on ctrl or command +end + case 36: if (event.ctrlKey || event.metaKey) { + $.datepicker._gotoToday(event.target); + } + handled = event.ctrlKey || event.metaKey; + break; // current on ctrl or command +home + case 37: if (event.ctrlKey || event.metaKey) { + $.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), "D"); + } + handled = event.ctrlKey || event.metaKey; + // -1 day on ctrl or command +left + if (event.originalEvent.altKey) { + $.datepicker._adjustDate(event.target, (event.ctrlKey ? + -$.datepicker._get(inst, "stepBigMonths") : + -$.datepicker._get(inst, "stepMonths")), "M"); + } + // next month/year on alt +left on Mac + break; + case 38: if (event.ctrlKey || event.metaKey) { + $.datepicker._adjustDate(event.target, -7, "D"); + } + handled = event.ctrlKey || event.metaKey; + break; // -1 week on ctrl or command +up + case 39: if (event.ctrlKey || event.metaKey) { + $.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), "D"); + } + handled = event.ctrlKey || event.metaKey; + // +1 day on ctrl or command +right + if (event.originalEvent.altKey) { + $.datepicker._adjustDate(event.target, (event.ctrlKey ? + +$.datepicker._get(inst, "stepBigMonths") : + +$.datepicker._get(inst, "stepMonths")), "M"); + } + // next month/year on alt +right + break; + case 40: if (event.ctrlKey || event.metaKey) { + $.datepicker._adjustDate(event.target, +7, "D"); + } + handled = event.ctrlKey || event.metaKey; + break; // +1 week on ctrl or command +down + default: handled = false; + } + } else if (event.keyCode === 36 && event.ctrlKey) { // display the date picker on ctrl+home + $.datepicker._showDatepicker(this); + } else { + handled = false; + } + + if (handled) { + event.preventDefault(); + event.stopPropagation(); + } + }, + + /* Filter entered characters - based on date format. */ + _doKeyPress: function(event) { + var chars, chr, + inst = $.datepicker._getInst(event.target); + + if ($.datepicker._get(inst, "constrainInput")) { + chars = $.datepicker._possibleChars($.datepicker._get(inst, "dateFormat")); + chr = String.fromCharCode(event.charCode == null ? event.keyCode : event.charCode); + return event.ctrlKey || event.metaKey || (chr < " " || !chars || chars.indexOf(chr) > -1); + } + }, + + /* Synchronise manual entry and field/alternate field. */ + _doKeyUp: function(event) { + var date, + inst = $.datepicker._getInst(event.target); + + if (inst.input.val() !== inst.lastVal) { + try { + date = $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"), + (inst.input ? inst.input.val() : null), + $.datepicker._getFormatConfig(inst)); + + if (date) { // only if valid + $.datepicker._setDateFromField(inst); + $.datepicker._updateAlternate(inst); + $.datepicker._updateDatepicker(inst); + } + } + catch (err) { + } + } + return true; + }, + + /* Pop-up the date picker for a given input field. + * If false returned from beforeShow event handler do not show. + * @param input element - the input field attached to the date picker or + * event - if triggered by focus + */ + _showDatepicker: function(input) { + input = input.target || input; + if (input.nodeName.toLowerCase() !== "input") { // find from button/image trigger + input = $("input", input.parentNode)[0]; + } + + if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput === input) { // already here + return; + } + + var inst, beforeShow, beforeShowSettings, isFixed, + offset, showAnim, duration; + + inst = $.datepicker._getInst(input); + if ($.datepicker._curInst && $.datepicker._curInst !== inst) { + $.datepicker._curInst.dpDiv.stop(true, true); + if ( inst && $.datepicker._datepickerShowing ) { + $.datepicker._hideDatepicker( $.datepicker._curInst.input[0] ); + } + } + + beforeShow = $.datepicker._get(inst, "beforeShow"); + beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {}; + if(beforeShowSettings === false){ + return; + } + datepicker_extendRemove(inst.settings, beforeShowSettings); + + inst.lastVal = null; + $.datepicker._lastInput = input; + $.datepicker._setDateFromField(inst); + + if ($.datepicker._inDialog) { // hide cursor + input.value = ""; + } + if (!$.datepicker._pos) { // position below input + $.datepicker._pos = $.datepicker._findPos(input); + $.datepicker._pos[1] += input.offsetHeight; // add the height + } + + isFixed = false; + $(input).parents().each(function() { + isFixed |= $(this).css("position") === "fixed"; + return !isFixed; + }); + + offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]}; + $.datepicker._pos = null; + //to avoid flashes on Firefox + inst.dpDiv.empty(); + // determine sizing offscreen + inst.dpDiv.css({position: "absolute", display: "block", top: "-1000px"}); + $.datepicker._updateDatepicker(inst); + // fix width for dynamic number of date pickers + // and adjust position before showing + offset = $.datepicker._checkOffset(inst, offset, isFixed); + inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ? + "static" : (isFixed ? "fixed" : "absolute")), display: "none", + left: offset.left + "px", top: offset.top + "px"}); + + if (!inst.inline) { + showAnim = $.datepicker._get(inst, "showAnim"); + duration = $.datepicker._get(inst, "duration"); + inst.dpDiv.css( "z-index", datepicker_getZindex( $( input ) ) + 1 ); + $.datepicker._datepickerShowing = true; + + if ( $.effects && $.effects.effect[ showAnim ] ) { + inst.dpDiv.show(showAnim, $.datepicker._get(inst, "showOptions"), duration); + } else { + inst.dpDiv[showAnim || "show"](showAnim ? duration : null); + } + + if ( $.datepicker._shouldFocusInput( inst ) ) { + inst.input.focus(); + } + + $.datepicker._curInst = inst; + } + }, + + /* Generate the date picker content. */ + _updateDatepicker: function(inst) { + this.maxRows = 4; //Reset the max number of rows being displayed (see #7043) + datepicker_instActive = inst; // for delegate hover events + inst.dpDiv.empty().append(this._generateHTML(inst)); + this._attachHandlers(inst); + + var origyearshtml, + numMonths = this._getNumberOfMonths(inst), + cols = numMonths[1], + width = 17, + activeCell = inst.dpDiv.find( "." + this._dayOverClass + " a" ); + + if ( activeCell.length > 0 ) { + datepicker_handleMouseover.apply( activeCell.get( 0 ) ); + } + + inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""); + if (cols > 1) { + inst.dpDiv.addClass("ui-datepicker-multi-" + cols).css("width", (width * cols) + "em"); + } + inst.dpDiv[(numMonths[0] !== 1 || numMonths[1] !== 1 ? "add" : "remove") + + "Class"]("ui-datepicker-multi"); + inst.dpDiv[(this._get(inst, "isRTL") ? "add" : "remove") + + "Class"]("ui-datepicker-rtl"); + + if (inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) { + inst.input.focus(); + } + + // deffered render of the years select (to avoid flashes on Firefox) + if( inst.yearshtml ){ + origyearshtml = inst.yearshtml; + setTimeout(function(){ + //assure that inst.yearshtml didn't change. + if( origyearshtml === inst.yearshtml && inst.yearshtml ){ + inst.dpDiv.find("select.ui-datepicker-year:first").replaceWith(inst.yearshtml); + } + origyearshtml = inst.yearshtml = null; + }, 0); + } + }, + + // #6694 - don't focus the input if it's already focused + // this breaks the change event in IE + // Support: IE and jQuery <1.9 + _shouldFocusInput: function( inst ) { + return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" ); + }, + + /* Check positioning to remain on screen. */ + _checkOffset: function(inst, offset, isFixed) { + var dpWidth = inst.dpDiv.outerWidth(), + dpHeight = inst.dpDiv.outerHeight(), + inputWidth = inst.input ? inst.input.outerWidth() : 0, + inputHeight = inst.input ? inst.input.outerHeight() : 0, + viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft()), + viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop()); + + offset.left -= (this._get(inst, "isRTL") ? (dpWidth - inputWidth) : 0); + offset.left -= (isFixed && offset.left === inst.input.offset().left) ? $(document).scrollLeft() : 0; + offset.top -= (isFixed && offset.top === (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0; + + // now check if datepicker is showing outside window viewport - move to a better place if so. + offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ? + Math.abs(offset.left + dpWidth - viewWidth) : 0); + offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ? + Math.abs(dpHeight + inputHeight) : 0); + + return offset; + }, + + /* Find an object's position on the screen. */ + _findPos: function(obj) { + var position, + inst = this._getInst(obj), + isRTL = this._get(inst, "isRTL"); + + while (obj && (obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden(obj))) { + obj = obj[isRTL ? "previousSibling" : "nextSibling"]; + } + + position = $(obj).offset(); + return [position.left, position.top]; + }, + + /* Hide the date picker from view. + * @param input element - the input field attached to the date picker + */ + _hideDatepicker: function(input) { + var showAnim, duration, postProcess, onClose, + inst = this._curInst; + + if (!inst || (input && inst !== $.data(input, "datepicker"))) { + return; + } + + if (this._datepickerShowing) { + showAnim = this._get(inst, "showAnim"); + duration = this._get(inst, "duration"); + postProcess = function() { + $.datepicker._tidyDialog(inst); + }; + + // DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed + if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) { + inst.dpDiv.hide(showAnim, $.datepicker._get(inst, "showOptions"), duration, postProcess); + } else { + inst.dpDiv[(showAnim === "slideDown" ? "slideUp" : + (showAnim === "fadeIn" ? "fadeOut" : "hide"))]((showAnim ? duration : null), postProcess); + } + + if (!showAnim) { + postProcess(); + } + this._datepickerShowing = false; + + onClose = this._get(inst, "onClose"); + if (onClose) { + onClose.apply((inst.input ? inst.input[0] : null), [(inst.input ? inst.input.val() : ""), inst]); + } + + this._lastInput = null; + if (this._inDialog) { + this._dialogInput.css({ position: "absolute", left: "0", top: "-100px" }); + if ($.blockUI) { + $.unblockUI(); + $("body").append(this.dpDiv); + } + } + this._inDialog = false; + } + }, + + /* Tidy up after a dialog display. */ + _tidyDialog: function(inst) { + inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar"); + }, + + /* Close date picker if clicked elsewhere. */ + _checkExternalClick: function(event) { + if (!$.datepicker._curInst) { + return; + } + + var $target = $(event.target), + inst = $.datepicker._getInst($target[0]); + + if ( ( ( $target[0].id !== $.datepicker._mainDivId && + $target.parents("#" + $.datepicker._mainDivId).length === 0 && + !$target.hasClass($.datepicker.markerClassName) && + !$target.closest("." + $.datepicker._triggerClass).length && + $.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) || + ( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst !== inst ) ) { + $.datepicker._hideDatepicker(); + } + }, + + /* Adjust one of the date sub-fields. */ + _adjustDate: function(id, offset, period) { + var target = $(id), + inst = this._getInst(target[0]); + + if (this._isDisabledDatepicker(target[0])) { + return; + } + this._adjustInstDate(inst, offset + + (period === "M" ? this._get(inst, "showCurrentAtPos") : 0), // undo positioning + period); + this._updateDatepicker(inst); + }, + + /* Action for current link. */ + _gotoToday: function(id) { + var date, + target = $(id), + inst = this._getInst(target[0]); + + if (this._get(inst, "gotoCurrent") && inst.currentDay) { + inst.selectedDay = inst.currentDay; + inst.drawMonth = inst.selectedMonth = inst.currentMonth; + inst.drawYear = inst.selectedYear = inst.currentYear; + } else { + date = new Date(); + inst.selectedDay = date.getDate(); + inst.drawMonth = inst.selectedMonth = date.getMonth(); + inst.drawYear = inst.selectedYear = date.getFullYear(); + } + this._notifyChange(inst); + this._adjustDate(target); + }, + + /* Action for selecting a new month/year. */ + _selectMonthYear: function(id, select, period) { + var target = $(id), + inst = this._getInst(target[0]); + + inst["selected" + (period === "M" ? "Month" : "Year")] = + inst["draw" + (period === "M" ? "Month" : "Year")] = + parseInt(select.options[select.selectedIndex].value,10); + + this._notifyChange(inst); + this._adjustDate(target); + }, + + /* Action for selecting a day. */ + _selectDay: function(id, month, year, td) { + var inst, + target = $(id); + + if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) { + return; + } + + inst = this._getInst(target[0]); + inst.selectedDay = inst.currentDay = $("a", td).html(); + inst.selectedMonth = inst.currentMonth = month; + inst.selectedYear = inst.currentYear = year; + this._selectDate(id, this._formatDate(inst, + inst.currentDay, inst.currentMonth, inst.currentYear)); + }, + + /* Erase the input field and hide the date picker. */ + _clearDate: function(id) { + var target = $(id); + this._selectDate(target, ""); + }, + + /* Update the input field with the selected date. */ + _selectDate: function(id, dateStr) { + var onSelect, + target = $(id), + inst = this._getInst(target[0]); + + dateStr = (dateStr != null ? dateStr : this._formatDate(inst)); + if (inst.input) { + inst.input.val(dateStr); + } + this._updateAlternate(inst); + + onSelect = this._get(inst, "onSelect"); + if (onSelect) { + onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]); // trigger custom callback + } else if (inst.input) { + inst.input.trigger("change"); // fire the change event + } + + if (inst.inline){ + this._updateDatepicker(inst); + } else { + this._hideDatepicker(); + this._lastInput = inst.input[0]; + if (typeof(inst.input[0]) !== "object") { + inst.input.focus(); // restore focus + } + this._lastInput = null; + } + }, + + /* Update any alternate field to synchronise with the main field. */ + _updateAlternate: function(inst) { + var altFormat, date, dateStr, + altField = this._get(inst, "altField"); + + if (altField) { // update alternate field too + altFormat = this._get(inst, "altFormat") || this._get(inst, "dateFormat"); + date = this._getDate(inst); + dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst)); + $(altField).each(function() { $(this).val(dateStr); }); + } + }, + + /* Set as beforeShowDay function to prevent selection of weekends. + * @param date Date - the date to customise + * @return [boolean, string] - is this date selectable?, what is its CSS class? + */ + noWeekends: function(date) { + var day = date.getDay(); + return [(day > 0 && day < 6), ""]; + }, + + /* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition. + * @param date Date - the date to get the week for + * @return number - the number of the week within the year that contains this date + */ + iso8601Week: function(date) { + var time, + checkDate = new Date(date.getTime()); + + // Find Thursday of this week starting on Monday + checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7)); + + time = checkDate.getTime(); + checkDate.setMonth(0); // Compare with Jan 1 + checkDate.setDate(1); + return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1; + }, + + /* Parse a string value into a date object. + * See formatDate below for the possible formats. + * + * @param format string - the expected format of the date + * @param value string - the date in the above format + * @param settings Object - attributes include: + * shortYearCutoff number - the cutoff year for determining the century (optional) + * dayNamesShort string[7] - abbreviated names of the days from Sunday (optional) + * dayNames string[7] - names of the days from Sunday (optional) + * monthNamesShort string[12] - abbreviated names of the months (optional) + * monthNames string[12] - names of the months (optional) + * @return Date - the extracted date value or null if value is blank + */ + parseDate: function (format, value, settings) { + if (format == null || value == null) { + throw "Invalid arguments"; + } + + value = (typeof value === "object" ? value.toString() : value + ""); + if (value === "") { + return null; + } + + var iFormat, dim, extra, + iValue = 0, + shortYearCutoffTemp = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff, + shortYearCutoff = (typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp : + new Date().getFullYear() % 100 + parseInt(shortYearCutoffTemp, 10)), + dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort, + dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames, + monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort, + monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames, + year = -1, + month = -1, + day = -1, + doy = -1, + literal = false, + date, + // Check whether a format character is doubled + lookAhead = function(match) { + var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match); + if (matches) { + iFormat++; + } + return matches; + }, + // Extract a number from the string value + getNumber = function(match) { + var isDoubled = lookAhead(match), + size = (match === "@" ? 14 : (match === "!" ? 20 : + (match === "y" && isDoubled ? 4 : (match === "o" ? 3 : 2)))), + minSize = (match === "y" ? size : 1), + digits = new RegExp("^\\d{" + minSize + "," + size + "}"), + num = value.substring(iValue).match(digits); + if (!num) { + throw "Missing number at position " + iValue; + } + iValue += num[0].length; + return parseInt(num[0], 10); + }, + // Extract a name from the string value and convert to an index + getName = function(match, shortNames, longNames) { + var index = -1, + names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) { + return [ [k, v] ]; + }).sort(function (a, b) { + return -(a[1].length - b[1].length); + }); + + $.each(names, function (i, pair) { + var name = pair[1]; + if (value.substr(iValue, name.length).toLowerCase() === name.toLowerCase()) { + index = pair[0]; + iValue += name.length; + return false; + } + }); + if (index !== -1) { + return index + 1; + } else { + throw "Unknown name at position " + iValue; + } + }, + // Confirm that a literal character matches the string value + checkLiteral = function() { + if (value.charAt(iValue) !== format.charAt(iFormat)) { + throw "Unexpected literal at position " + iValue; + } + iValue++; + }; + + for (iFormat = 0; iFormat < format.length; iFormat++) { + if (literal) { + if (format.charAt(iFormat) === "'" && !lookAhead("'")) { + literal = false; + } else { + checkLiteral(); + } + } else { + switch (format.charAt(iFormat)) { + case "d": + day = getNumber("d"); + break; + case "D": + getName("D", dayNamesShort, dayNames); + break; + case "o": + doy = getNumber("o"); + break; + case "m": + month = getNumber("m"); + break; + case "M": + month = getName("M", monthNamesShort, monthNames); + break; + case "y": + year = getNumber("y"); + break; + case "@": + date = new Date(getNumber("@")); + year = date.getFullYear(); + month = date.getMonth() + 1; + day = date.getDate(); + break; + case "!": + date = new Date((getNumber("!") - this._ticksTo1970) / 10000); + year = date.getFullYear(); + month = date.getMonth() + 1; + day = date.getDate(); + break; + case "'": + if (lookAhead("'")){ + checkLiteral(); + } else { + literal = true; + } + break; + default: + checkLiteral(); + } + } + } + + if (iValue < value.length){ + extra = value.substr(iValue); + if (!/^\s+/.test(extra)) { + throw "Extra/unparsed characters found in date: " + extra; + } + } + + if (year === -1) { + year = new Date().getFullYear(); + } else if (year < 100) { + year += new Date().getFullYear() - new Date().getFullYear() % 100 + + (year <= shortYearCutoff ? 0 : -100); + } + + if (doy > -1) { + month = 1; + day = doy; + do { + dim = this._getDaysInMonth(year, month - 1); + if (day <= dim) { + break; + } + month++; + day -= dim; + } while (true); + } + + date = this._daylightSavingAdjust(new Date(year, month - 1, day)); + if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) { + throw "Invalid date"; // E.g. 31/02/00 + } + return date; + }, + + /* Standard date formats. */ + ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601) + COOKIE: "D, dd M yy", + ISO_8601: "yy-mm-dd", + RFC_822: "D, d M y", + RFC_850: "DD, dd-M-y", + RFC_1036: "D, d M y", + RFC_1123: "D, d M yy", + RFC_2822: "D, d M yy", + RSS: "D, d M y", // RFC 822 + TICKS: "!", + TIMESTAMP: "@", + W3C: "yy-mm-dd", // ISO 8601 + + _ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) + + Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000), + + /* Format a date object into a string value. + * The format can be combinations of the following: + * d - day of month (no leading zero) + * dd - day of month (two digit) + * o - day of year (no leading zeros) + * oo - day of year (three digit) + * D - day name short + * DD - day name long + * m - month of year (no leading zero) + * mm - month of year (two digit) + * M - month name short + * MM - month name long + * y - year (two digit) + * yy - year (four digit) + * @ - Unix timestamp (ms since 01/01/1970) + * ! - Windows ticks (100ns since 01/01/0001) + * "..." - literal text + * '' - single quote + * + * @param format string - the desired format of the date + * @param date Date - the date value to format + * @param settings Object - attributes include: + * dayNamesShort string[7] - abbreviated names of the days from Sunday (optional) + * dayNames string[7] - names of the days from Sunday (optional) + * monthNamesShort string[12] - abbreviated names of the months (optional) + * monthNames string[12] - names of the months (optional) + * @return string - the date in the above format + */ + formatDate: function (format, date, settings) { + if (!date) { + return ""; + } + + var iFormat, + dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort, + dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames, + monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort, + monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames, + // Check whether a format character is doubled + lookAhead = function(match) { + var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match); + if (matches) { + iFormat++; + } + return matches; + }, + // Format a number, with leading zero if necessary + formatNumber = function(match, value, len) { + var num = "" + value; + if (lookAhead(match)) { + while (num.length < len) { + num = "0" + num; + } + } + return num; + }, + // Format a name, short or long as requested + formatName = function(match, value, shortNames, longNames) { + return (lookAhead(match) ? longNames[value] : shortNames[value]); + }, + output = "", + literal = false; + + if (date) { + for (iFormat = 0; iFormat < format.length; iFormat++) { + if (literal) { + if (format.charAt(iFormat) === "'" && !lookAhead("'")) { + literal = false; + } else { + output += format.charAt(iFormat); + } + } else { + switch (format.charAt(iFormat)) { + case "d": + output += formatNumber("d", date.getDate(), 2); + break; + case "D": + output += formatName("D", date.getDay(), dayNamesShort, dayNames); + break; + case "o": + output += formatNumber("o", + Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3); + break; + case "m": + output += formatNumber("m", date.getMonth() + 1, 2); + break; + case "M": + output += formatName("M", date.getMonth(), monthNamesShort, monthNames); + break; + case "y": + output += (lookAhead("y") ? date.getFullYear() : + (date.getYear() % 100 < 10 ? "0" : "") + date.getYear() % 100); + break; + case "@": + output += date.getTime(); + break; + case "!": + output += date.getTime() * 10000 + this._ticksTo1970; + break; + case "'": + if (lookAhead("'")) { + output += "'"; + } else { + literal = true; + } + break; + default: + output += format.charAt(iFormat); + } + } + } + } + return output; + }, + + /* Extract all possible characters from the date format. */ + _possibleChars: function (format) { + var iFormat, + chars = "", + literal = false, + // Check whether a format character is doubled + lookAhead = function(match) { + var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match); + if (matches) { + iFormat++; + } + return matches; + }; + + for (iFormat = 0; iFormat < format.length; iFormat++) { + if (literal) { + if (format.charAt(iFormat) === "'" && !lookAhead("'")) { + literal = false; + } else { + chars += format.charAt(iFormat); + } + } else { + switch (format.charAt(iFormat)) { + case "d": case "m": case "y": case "@": + chars += "0123456789"; + break; + case "D": case "M": + return null; // Accept anything + case "'": + if (lookAhead("'")) { + chars += "'"; + } else { + literal = true; + } + break; + default: + chars += format.charAt(iFormat); + } + } + } + return chars; + }, + + /* Get a setting value, defaulting if necessary. */ + _get: function(inst, name) { + return inst.settings[name] !== undefined ? + inst.settings[name] : this._defaults[name]; + }, + + /* Parse existing date and initialise date picker. */ + _setDateFromField: function(inst, noDefault) { + if (inst.input.val() === inst.lastVal) { + return; + } + + var dateFormat = this._get(inst, "dateFormat"), + dates = inst.lastVal = inst.input ? inst.input.val() : null, + defaultDate = this._getDefaultDate(inst), + date = defaultDate, + settings = this._getFormatConfig(inst); + + try { + date = this.parseDate(dateFormat, dates, settings) || defaultDate; + } catch (event) { + dates = (noDefault ? "" : dates); + } + inst.selectedDay = date.getDate(); + inst.drawMonth = inst.selectedMonth = date.getMonth(); + inst.drawYear = inst.selectedYear = date.getFullYear(); + inst.currentDay = (dates ? date.getDate() : 0); + inst.currentMonth = (dates ? date.getMonth() : 0); + inst.currentYear = (dates ? date.getFullYear() : 0); + this._adjustInstDate(inst); + }, + + /* Retrieve the default date shown on opening. */ + _getDefaultDate: function(inst) { + return this._restrictMinMax(inst, + this._determineDate(inst, this._get(inst, "defaultDate"), new Date())); + }, + + /* A date may be specified as an exact value or a relative one. */ + _determineDate: function(inst, date, defaultDate) { + var offsetNumeric = function(offset) { + var date = new Date(); + date.setDate(date.getDate() + offset); + return date; + }, + offsetString = function(offset) { + try { + return $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"), + offset, $.datepicker._getFormatConfig(inst)); + } + catch (e) { + // Ignore + } + + var date = (offset.toLowerCase().match(/^c/) ? + $.datepicker._getDate(inst) : null) || new Date(), + year = date.getFullYear(), + month = date.getMonth(), + day = date.getDate(), + pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g, + matches = pattern.exec(offset); + + while (matches) { + switch (matches[2] || "d") { + case "d" : case "D" : + day += parseInt(matches[1],10); break; + case "w" : case "W" : + day += parseInt(matches[1],10) * 7; break; + case "m" : case "M" : + month += parseInt(matches[1],10); + day = Math.min(day, $.datepicker._getDaysInMonth(year, month)); + break; + case "y": case "Y" : + year += parseInt(matches[1],10); + day = Math.min(day, $.datepicker._getDaysInMonth(year, month)); + break; + } + matches = pattern.exec(offset); + } + return new Date(year, month, day); + }, + newDate = (date == null || date === "" ? defaultDate : (typeof date === "string" ? offsetString(date) : + (typeof date === "number" ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime())))); + + newDate = (newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate); + if (newDate) { + newDate.setHours(0); + newDate.setMinutes(0); + newDate.setSeconds(0); + newDate.setMilliseconds(0); + } + return this._daylightSavingAdjust(newDate); + }, + + /* Handle switch to/from daylight saving. + * Hours may be non-zero on daylight saving cut-over: + * > 12 when midnight changeover, but then cannot generate + * midnight datetime, so jump to 1AM, otherwise reset. + * @param date (Date) the date to check + * @return (Date) the corrected date + */ + _daylightSavingAdjust: function(date) { + if (!date) { + return null; + } + date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0); + return date; + }, + + /* Set the date(s) directly. */ + _setDate: function(inst, date, noChange) { + var clear = !date, + origMonth = inst.selectedMonth, + origYear = inst.selectedYear, + newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date())); + + inst.selectedDay = inst.currentDay = newDate.getDate(); + inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth(); + inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear(); + if ((origMonth !== inst.selectedMonth || origYear !== inst.selectedYear) && !noChange) { + this._notifyChange(inst); + } + this._adjustInstDate(inst); + if (inst.input) { + inst.input.val(clear ? "" : this._formatDate(inst)); + } + }, + + /* Retrieve the date(s) directly. */ + _getDate: function(inst) { + var startDate = (!inst.currentYear || (inst.input && inst.input.val() === "") ? null : + this._daylightSavingAdjust(new Date( + inst.currentYear, inst.currentMonth, inst.currentDay))); + return startDate; + }, + + /* Attach the onxxx handlers. These are declared statically so + * they work with static code transformers like Caja. + */ + _attachHandlers: function(inst) { + var stepMonths = this._get(inst, "stepMonths"), + id = "#" + inst.id.replace( /\\\\/g, "\\" ); + inst.dpDiv.find("[data-handler]").map(function () { + var handler = { + prev: function () { + $.datepicker._adjustDate(id, -stepMonths, "M"); + }, + next: function () { + $.datepicker._adjustDate(id, +stepMonths, "M"); + }, + hide: function () { + $.datepicker._hideDatepicker(); + }, + today: function () { + $.datepicker._gotoToday(id); + }, + selectDay: function () { + $.datepicker._selectDay(id, +this.getAttribute("data-month"), +this.getAttribute("data-year"), this); + return false; + }, + selectMonth: function () { + $.datepicker._selectMonthYear(id, this, "M"); + return false; + }, + selectYear: function () { + $.datepicker._selectMonthYear(id, this, "Y"); + return false; + } + }; + $(this).bind(this.getAttribute("data-event"), handler[this.getAttribute("data-handler")]); + }); + }, + + /* Generate the HTML for the current state of the date picker. */ + _generateHTML: function(inst) { + var maxDraw, prevText, prev, nextText, next, currentText, gotoDate, + controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin, + monthNames, monthNamesShort, beforeShowDay, showOtherMonths, + selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate, + cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows, + printDate, dRow, tbody, daySettings, otherMonth, unselectable, + tempDate = new Date(), + today = this._daylightSavingAdjust( + new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate())), // clear time + isRTL = this._get(inst, "isRTL"), + showButtonPanel = this._get(inst, "showButtonPanel"), + hideIfNoPrevNext = this._get(inst, "hideIfNoPrevNext"), + navigationAsDateFormat = this._get(inst, "navigationAsDateFormat"), + numMonths = this._getNumberOfMonths(inst), + showCurrentAtPos = this._get(inst, "showCurrentAtPos"), + stepMonths = this._get(inst, "stepMonths"), + isMultiMonth = (numMonths[0] !== 1 || numMonths[1] !== 1), + currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) : + new Date(inst.currentYear, inst.currentMonth, inst.currentDay))), + minDate = this._getMinMaxDate(inst, "min"), + maxDate = this._getMinMaxDate(inst, "max"), + drawMonth = inst.drawMonth - showCurrentAtPos, + drawYear = inst.drawYear; + + if (drawMonth < 0) { + drawMonth += 12; + drawYear--; + } + if (maxDate) { + maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(), + maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate())); + maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw); + while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) { + drawMonth--; + if (drawMonth < 0) { + drawMonth = 11; + drawYear--; + } + } + } + inst.drawMonth = drawMonth; + inst.drawYear = drawYear; + + prevText = this._get(inst, "prevText"); + prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText, + this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)), + this._getFormatConfig(inst))); + + prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ? + "" + prevText + "" : + (hideIfNoPrevNext ? "" : "" + prevText + "")); + + nextText = this._get(inst, "nextText"); + nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText, + this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)), + this._getFormatConfig(inst))); + + next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ? + "" + nextText + "" : + (hideIfNoPrevNext ? "" : "" + nextText + "")); + + currentText = this._get(inst, "currentText"); + gotoDate = (this._get(inst, "gotoCurrent") && inst.currentDay ? currentDate : today); + currentText = (!navigationAsDateFormat ? currentText : + this.formatDate(currentText, gotoDate, this._getFormatConfig(inst))); + + controls = (!inst.inline ? "" : ""); + + buttonPanel = (showButtonPanel) ? "
        " + (isRTL ? controls : "") + + (this._isInRange(inst, gotoDate) ? "" : "") + (isRTL ? "" : controls) + "
        " : ""; + + firstDay = parseInt(this._get(inst, "firstDay"),10); + firstDay = (isNaN(firstDay) ? 0 : firstDay); + + showWeek = this._get(inst, "showWeek"); + dayNames = this._get(inst, "dayNames"); + dayNamesMin = this._get(inst, "dayNamesMin"); + monthNames = this._get(inst, "monthNames"); + monthNamesShort = this._get(inst, "monthNamesShort"); + beforeShowDay = this._get(inst, "beforeShowDay"); + showOtherMonths = this._get(inst, "showOtherMonths"); + selectOtherMonths = this._get(inst, "selectOtherMonths"); + defaultDate = this._getDefaultDate(inst); + html = ""; + dow; + for (row = 0; row < numMonths[0]; row++) { + group = ""; + this.maxRows = 4; + for (col = 0; col < numMonths[1]; col++) { + selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay)); + cornerClass = " ui-corner-all"; + calender = ""; + if (isMultiMonth) { + calender += "
        "; + } + calender += "
        " + + (/all|left/.test(cornerClass) && row === 0 ? (isRTL ? next : prev) : "") + + (/all|right/.test(cornerClass) && row === 0 ? (isRTL ? prev : next) : "") + + this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate, + row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers + "
        " + + ""; + thead = (showWeek ? "" : ""); + for (dow = 0; dow < 7; dow++) { // days of the week + day = (dow + firstDay) % 7; + thead += ""; + } + calender += thead + ""; + daysInMonth = this._getDaysInMonth(drawYear, drawMonth); + if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) { + inst.selectedDay = Math.min(inst.selectedDay, daysInMonth); + } + leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7; + curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate + numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043) + this.maxRows = numRows; + printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays)); + for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows + calender += ""; + tbody = (!showWeek ? "" : ""); + for (dow = 0; dow < 7; dow++) { // create date picker days + daySettings = (beforeShowDay ? + beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, ""]); + otherMonth = (printDate.getMonth() !== drawMonth); + unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] || + (minDate && printDate < minDate) || (maxDate && printDate > maxDate); + tbody += ""; // display selectable date + printDate.setDate(printDate.getDate() + 1); + printDate = this._daylightSavingAdjust(printDate); + } + calender += tbody + ""; + } + drawMonth++; + if (drawMonth > 11) { + drawMonth = 0; + drawYear++; + } + calender += "
        " + this._get(inst, "weekHeader") + "= 5 ? " class='ui-datepicker-week-end'" : "") + ">" + + "" + dayNamesMin[day] + "
        " + + this._get(inst, "calculateWeek")(printDate) + "" + // actions + (otherMonth && !showOtherMonths ? " " : // display for other months + (unselectable ? "" + printDate.getDate() + "" : "" + printDate.getDate() + "")) + "
        " + (isMultiMonth ? "
        " + + ((numMonths[0] > 0 && col === numMonths[1]-1) ? "
        " : "") : ""); + group += calender; + } + html += group; + } + html += buttonPanel; + inst._keyEvent = false; + return html; + }, + + /* Generate the month and year header. */ + _generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate, + secondary, monthNames, monthNamesShort) { + + var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear, + changeMonth = this._get(inst, "changeMonth"), + changeYear = this._get(inst, "changeYear"), + showMonthAfterYear = this._get(inst, "showMonthAfterYear"), + html = "
        ", + monthHtml = ""; + + // month selection + if (secondary || !changeMonth) { + monthHtml += "" + monthNames[drawMonth] + ""; + } else { + inMinYear = (minDate && minDate.getFullYear() === drawYear); + inMaxYear = (maxDate && maxDate.getFullYear() === drawYear); + monthHtml += ""; + } + + if (!showMonthAfterYear) { + html += monthHtml + (secondary || !(changeMonth && changeYear) ? " " : ""); + } + + // year selection + if ( !inst.yearshtml ) { + inst.yearshtml = ""; + if (secondary || !changeYear) { + html += "" + drawYear + ""; + } else { + // determine range of years to display + years = this._get(inst, "yearRange").split(":"); + thisYear = new Date().getFullYear(); + determineYear = function(value) { + var year = (value.match(/c[+\-].*/) ? drawYear + parseInt(value.substring(1), 10) : + (value.match(/[+\-].*/) ? thisYear + parseInt(value, 10) : + parseInt(value, 10))); + return (isNaN(year) ? thisYear : year); + }; + year = determineYear(years[0]); + endYear = Math.max(year, determineYear(years[1] || "")); + year = (minDate ? Math.max(year, minDate.getFullYear()) : year); + endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear); + inst.yearshtml += ""; + + html += inst.yearshtml; + inst.yearshtml = null; + } + } + + html += this._get(inst, "yearSuffix"); + if (showMonthAfterYear) { + html += (secondary || !(changeMonth && changeYear) ? " " : "") + monthHtml; + } + html += "
        "; // Close datepicker_header + return html; + }, + + /* Adjust one of the date sub-fields. */ + _adjustInstDate: function(inst, offset, period) { + var year = inst.drawYear + (period === "Y" ? offset : 0), + month = inst.drawMonth + (period === "M" ? offset : 0), + day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) + (period === "D" ? offset : 0), + date = this._restrictMinMax(inst, this._daylightSavingAdjust(new Date(year, month, day))); + + inst.selectedDay = date.getDate(); + inst.drawMonth = inst.selectedMonth = date.getMonth(); + inst.drawYear = inst.selectedYear = date.getFullYear(); + if (period === "M" || period === "Y") { + this._notifyChange(inst); + } + }, + + /* Ensure a date is within any min/max bounds. */ + _restrictMinMax: function(inst, date) { + var minDate = this._getMinMaxDate(inst, "min"), + maxDate = this._getMinMaxDate(inst, "max"), + newDate = (minDate && date < minDate ? minDate : date); + return (maxDate && newDate > maxDate ? maxDate : newDate); + }, + + /* Notify change of month/year. */ + _notifyChange: function(inst) { + var onChange = this._get(inst, "onChangeMonthYear"); + if (onChange) { + onChange.apply((inst.input ? inst.input[0] : null), + [inst.selectedYear, inst.selectedMonth + 1, inst]); + } + }, + + /* Determine the number of months to show. */ + _getNumberOfMonths: function(inst) { + var numMonths = this._get(inst, "numberOfMonths"); + return (numMonths == null ? [1, 1] : (typeof numMonths === "number" ? [1, numMonths] : numMonths)); + }, + + /* Determine the current maximum date - ensure no time components are set. */ + _getMinMaxDate: function(inst, minMax) { + return this._determineDate(inst, this._get(inst, minMax + "Date"), null); + }, + + /* Find the number of days in a given month. */ + _getDaysInMonth: function(year, month) { + return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate(); + }, + + /* Find the day of the week of the first of a month. */ + _getFirstDayOfMonth: function(year, month) { + return new Date(year, month, 1).getDay(); + }, + + /* Determines if we should allow a "next/prev" month display change. */ + _canAdjustMonth: function(inst, offset, curYear, curMonth) { + var numMonths = this._getNumberOfMonths(inst), + date = this._daylightSavingAdjust(new Date(curYear, + curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1)); + + if (offset < 0) { + date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth())); + } + return this._isInRange(inst, date); + }, + + /* Is the given date in the accepted range? */ + _isInRange: function(inst, date) { + var yearSplit, currentYear, + minDate = this._getMinMaxDate(inst, "min"), + maxDate = this._getMinMaxDate(inst, "max"), + minYear = null, + maxYear = null, + years = this._get(inst, "yearRange"); + if (years){ + yearSplit = years.split(":"); + currentYear = new Date().getFullYear(); + minYear = parseInt(yearSplit[0], 10); + maxYear = parseInt(yearSplit[1], 10); + if ( yearSplit[0].match(/[+\-].*/) ) { + minYear += currentYear; + } + if ( yearSplit[1].match(/[+\-].*/) ) { + maxYear += currentYear; + } + } + + return ((!minDate || date.getTime() >= minDate.getTime()) && + (!maxDate || date.getTime() <= maxDate.getTime()) && + (!minYear || date.getFullYear() >= minYear) && + (!maxYear || date.getFullYear() <= maxYear)); + }, + + /* Provide the configuration settings for formatting/parsing. */ + _getFormatConfig: function(inst) { + var shortYearCutoff = this._get(inst, "shortYearCutoff"); + shortYearCutoff = (typeof shortYearCutoff !== "string" ? shortYearCutoff : + new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10)); + return {shortYearCutoff: shortYearCutoff, + dayNamesShort: this._get(inst, "dayNamesShort"), dayNames: this._get(inst, "dayNames"), + monthNamesShort: this._get(inst, "monthNamesShort"), monthNames: this._get(inst, "monthNames")}; + }, + + /* Format the given date for display. */ + _formatDate: function(inst, day, month, year) { + if (!day) { + inst.currentDay = inst.selectedDay; + inst.currentMonth = inst.selectedMonth; + inst.currentYear = inst.selectedYear; + } + var date = (day ? (typeof day === "object" ? day : + this._daylightSavingAdjust(new Date(year, month, day))) : + this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay))); + return this.formatDate(this._get(inst, "dateFormat"), date, this._getFormatConfig(inst)); + } +}); + +/* + * Bind hover events for datepicker elements. + * Done via delegate so the binding only occurs once in the lifetime of the parent div. + * Global datepicker_instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker. */ -(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e
        ").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+ -e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery); -;/* - * jQuery UI Effects Fade 1.8.14 +function datepicker_bindHover(dpDiv) { + var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a"; + return dpDiv.delegate(selector, "mouseout", function() { + $(this).removeClass("ui-state-hover"); + if (this.className.indexOf("ui-datepicker-prev") !== -1) { + $(this).removeClass("ui-datepicker-prev-hover"); + } + if (this.className.indexOf("ui-datepicker-next") !== -1) { + $(this).removeClass("ui-datepicker-next-hover"); + } + }) + .delegate( selector, "mouseover", datepicker_handleMouseover ); +} + +function datepicker_handleMouseover() { + if (!$.datepicker._isDisabledDatepicker( datepicker_instActive.inline? datepicker_instActive.dpDiv.parent()[0] : datepicker_instActive.input[0])) { + $(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"); + $(this).addClass("ui-state-hover"); + if (this.className.indexOf("ui-datepicker-prev") !== -1) { + $(this).addClass("ui-datepicker-prev-hover"); + } + if (this.className.indexOf("ui-datepicker-next") !== -1) { + $(this).addClass("ui-datepicker-next-hover"); + } + } +} + +/* jQuery extend now ignores nulls! */ +function datepicker_extendRemove(target, props) { + $.extend(target, props); + for (var name in props) { + if (props[name] == null) { + target[name] = props[name]; + } + } + return target; +} + +/* Invoke the datepicker functionality. + @param options string - a command, optionally followed by additional parameters or + Object - settings for attaching new datepicker functionality + @return jQuery object */ +$.fn.datepicker = function(options){ + + /* Verify an empty collection wasn't passed - Fixes #6976 */ + if ( !this.length ) { + return this; + } + + /* Initialise the date picker. */ + if (!$.datepicker.initialized) { + $(document).mousedown($.datepicker._checkExternalClick); + $.datepicker.initialized = true; + } + + /* Append datepicker main container to body if not exist. */ + if ($("#"+$.datepicker._mainDivId).length === 0) { + $("body").append($.datepicker.dpDiv); + } + + var otherArgs = Array.prototype.slice.call(arguments, 1); + if (typeof options === "string" && (options === "isDisabled" || options === "getDate" || options === "widget")) { + return $.datepicker["_" + options + "Datepicker"]. + apply($.datepicker, [this[0]].concat(otherArgs)); + } + if (options === "option" && arguments.length === 2 && typeof arguments[1] === "string") { + return $.datepicker["_" + options + "Datepicker"]. + apply($.datepicker, [this[0]].concat(otherArgs)); + } + return this.each(function() { + typeof options === "string" ? + $.datepicker["_" + options + "Datepicker"]. + apply($.datepicker, [this].concat(otherArgs)) : + $.datepicker._attachDatepicker(this, options); + }); +}; + +$.datepicker = new Datepicker(); // singleton instance +$.datepicker.initialized = false; +$.datepicker.uuid = new Date().getTime(); +$.datepicker.version = "1.11.4"; + +var datepicker = $.datepicker; + + +/*! + * jQuery UI Draggable 1.11.4 + * http://jqueryui.com * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. * http://jquery.org/license * - * http://docs.jquery.com/UI/Effects/Fade + * http://api.jqueryui.com/draggable/ + */ + + +$.widget("ui.draggable", $.ui.mouse, { + version: "1.11.4", + widgetEventPrefix: "drag", + options: { + addClasses: true, + appendTo: "parent", + axis: false, + connectToSortable: false, + containment: false, + cursor: "auto", + cursorAt: false, + grid: false, + handle: false, + helper: "original", + iframeFix: false, + opacity: false, + refreshPositions: false, + revert: false, + revertDuration: 500, + scope: "default", + scroll: true, + scrollSensitivity: 20, + scrollSpeed: 20, + snap: false, + snapMode: "both", + snapTolerance: 20, + stack: false, + zIndex: false, + + // callbacks + drag: null, + start: null, + stop: null + }, + _create: function() { + + if ( this.options.helper === "original" ) { + this._setPositionRelative(); + } + if (this.options.addClasses){ + this.element.addClass("ui-draggable"); + } + if (this.options.disabled){ + this.element.addClass("ui-draggable-disabled"); + } + this._setHandleClassName(); + + this._mouseInit(); + }, + + _setOption: function( key, value ) { + this._super( key, value ); + if ( key === "handle" ) { + this._removeHandleClassName(); + this._setHandleClassName(); + } + }, + + _destroy: function() { + if ( ( this.helper || this.element ).is( ".ui-draggable-dragging" ) ) { + this.destroyOnClear = true; + return; + } + this.element.removeClass( "ui-draggable ui-draggable-dragging ui-draggable-disabled" ); + this._removeHandleClassName(); + this._mouseDestroy(); + }, + + _mouseCapture: function(event) { + var o = this.options; + + this._blurActiveElement( event ); + + // among others, prevent a drag on a resizable-handle + if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) { + return false; + } + + //Quit if we're not on a valid handle + this.handle = this._getHandle(event); + if (!this.handle) { + return false; + } + + this._blockFrames( o.iframeFix === true ? "iframe" : o.iframeFix ); + + return true; + + }, + + _blockFrames: function( selector ) { + this.iframeBlocks = this.document.find( selector ).map(function() { + var iframe = $( this ); + + return $( "
        " ) + .css( "position", "absolute" ) + .appendTo( iframe.parent() ) + .outerWidth( iframe.outerWidth() ) + .outerHeight( iframe.outerHeight() ) + .offset( iframe.offset() )[ 0 ]; + }); + }, + + _unblockFrames: function() { + if ( this.iframeBlocks ) { + this.iframeBlocks.remove(); + delete this.iframeBlocks; + } + }, + + _blurActiveElement: function( event ) { + var document = this.document[ 0 ]; + + // Only need to blur if the event occurred on the draggable itself, see #10527 + if ( !this.handleElement.is( event.target ) ) { + return; + } + + // support: IE9 + // IE9 throws an "Unspecified error" accessing document.activeElement from an