5:32 a.m.
Omer Frenkel has submitted this change and it was merged.
Change subject: core: Vm Icons - backend part
......................................................................
core: Vm Icons - backend part
http://www.ovirt.org/Features/VM_Icons
Backand part of introduction of Vm Icons. It replaces current system of
providing operating system icons for browser and allows users to
customize icons.
Database:
* vm_icons table added, it stores the icons
* columns referencing small and large icon added to vm_static
* vm_icon_defaults table added, it maps operating systems and their
default icons
Code:
* VmIcon, VmIconDefault business entities added, VmBase, VmTemplate
changed + appropriade DAO changes
* VM, Template and Pool manipulation commands can handle icon changes
* GetVmIconsQuery allows to resolve icon ids to image data
* GetVmIconDefaultsQuery provides mapping of operating system to their
default icons.
* IconLoader class (re)loads operating system default icons during
engine startup
Packaging:
* New dir containig icons added:
packaging/icons -> /usr/share/ovirt-engine/icons
Change-Id: I98ad0d76285af3b2913e477a340bfd1ac09a296e
Bug-Url: https://bugzilla.redhat.com/1103175
Signed-off-by: Jakub Niedermertl <jniederm(a)redhat.com>
---
M Makefile
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmPoolWithVmsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
A
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmIconDefaultsQuery.java
A
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmIconsQuery.java
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IconLoader.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
A
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/IconUtils.java
A
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/IconValidator.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmPoolWithVmsParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/UpdateVmTemplateParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmManagementParametersBase.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmIcon.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmIconDefault.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmIconsParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VmIconIdSizePair.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmBaseDaoDbFacade.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
A backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmIconDao.java
A backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmIconDaoImpl.java
A
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmIconDefaultDao.java
A
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmIconDefaultDaoImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmStaticDAOTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
M ovirt-engine.spec.in
M packaging/dbscripts/create_views.sql
A packaging/dbscripts/upgrade/03_06_1310_add_vm_icons_vm_icon_defaults_tables.sql
A packaging/dbscripts/vm_icons_sp.sql
M packaging/dbscripts/vm_templates_sp.sql
M packaging/dbscripts/vms_sp.sql
A packaging/icons/large/debian_7.png
A packaging/icons/large/freebsd.png
A packaging/icons/large/freebsdx64.png
A packaging/icons/large/other.png
A packaging/icons/large/other_linux.png
A packaging/icons/large/rhel_3.png
A packaging/icons/large/rhel_3x64.png
A packaging/icons/large/rhel_4.png
A packaging/icons/large/rhel_4x64.png
A packaging/icons/large/rhel_5.png
A packaging/icons/large/rhel_5x64.png
A packaging/icons/large/rhel_6.png
A packaging/icons/large/rhel_6x64.png
A packaging/icons/large/rhel_7x64.png
A packaging/icons/large/sles_11.png
A packaging/icons/large/ubuntu_12_04.png
A packaging/icons/large/ubuntu_12_10.png
A packaging/icons/large/ubuntu_13_04.png
A packaging/icons/large/ubuntu_13_10.png
A packaging/icons/large/ubuntu_14_04.jpg
A packaging/icons/large/windows_2003.png
A packaging/icons/large/windows_2003x64.png
A packaging/icons/large/windows_2008.png
A packaging/icons/large/windows_2008R2.png
A packaging/icons/large/windows_2008R2x64.png
A packaging/icons/large/windows_2008x64.png
A packaging/icons/large/windows_2012R2x64.png
A packaging/icons/large/windows_2012x64.png
A packaging/icons/large/windows_7.png
A packaging/icons/large/windows_7x64.png
A packaging/icons/large/windows_8.png
A packaging/icons/large/windows_8x64.png
A packaging/icons/large/windows_xp.png
A packaging/icons/small/debian_7.png
A packaging/icons/small/freebsd.png
A packaging/icons/small/freebsdx64.png
A packaging/icons/small/other.jpg
A packaging/icons/small/other_linux.jpg
A packaging/icons/small/rhel_3.jpg
A packaging/icons/small/rhel_3x64.jpg
A packaging/icons/small/rhel_4.jpg
A packaging/icons/small/rhel_4x64.jpg
A packaging/icons/small/rhel_5.jpg
A packaging/icons/small/rhel_5x64.jpg
A packaging/icons/small/rhel_6.jpg
A packaging/icons/small/rhel_6x64.jpg
A packaging/icons/small/rhel_7x64.jpg
A packaging/icons/small/sles_11.png
A packaging/icons/small/ubuntu_12_04.png
A packaging/icons/small/ubuntu_12_10.png
A packaging/icons/small/ubuntu_13_04.png
A packaging/icons/small/ubuntu_13_10.png
A packaging/icons/small/ubuntu_14_04.jpg
A packaging/icons/small/windows_2003.jpg
A packaging/icons/small/windows_2003x64.jpg
A packaging/icons/small/windows_2008.jpg
A packaging/icons/small/windows_2008R2x64.jpg
A packaging/icons/small/windows_2008x64.jpg
A packaging/icons/small/windows_2012R2x64.png
A packaging/icons/small/windows_2012x64.png
A packaging/icons/small/windows_7.jpg
A packaging/icons/small/windows_7x64.jpg
A packaging/icons/small/windows_8.png
A packaging/icons/small/windows_8x64.png
A packaging/icons/small/windows_xp.jpg
113 files changed, 1,859 insertions(+), 27 deletions(-)
Approvals:
Jakub Niedermertl: Verified
Omer Frenkel: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/38600
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I98ad0d76285af3b2913e477a340bfd1ac09a296e
Gerrit-PatchSet: 29
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Jakub Niedermertl <jniederm(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Jakub Niedermertl <jniederm(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server