Change in ovirt-engine[master]: core: Remove dead JPA implementation
amureini at redhat.com
amureini at redhat.com
Thu Jan 31 12:54:22 UTC 2013
Allon Mureinik has submitted this change and it was merged.
Change subject: core: Remove dead JPA implementation
......................................................................
core: Remove dead JPA implementation
Following a discussion on engine-devel
(http://lists.ovirt.org/pipermail/engine-devel/2012-December/003313.html,
http://lists.ovirt.org/pipermail/engine-devel/2013-January/003431.html)
and the partial removal of JPA-based DAOs as part of different
patches (e.g., change-id I1c1adda55bd27beef2907bf0ed8a0f8bc274e495),
this patch completely removes JPA implementation for the project.
Note this is code is unused in the system and is no longer maintained
anyway, so even it it were enabled, it would no longer work.
This patch removes the following:
* JPA annotations from business entities
* Hibernate-specific mapping annotations from said business entities
(validation annotations were left in tact, just to be on the safe
side).
* Fields in said business entities that were not used, but only
referenced by said annotations.
* JPA context configuration for said classes.
* Classes only used by said annotations - GuidType and GuidGenerator.
* Methods in ReflectionUtils that were only relevant to the removed
@Table and @column annotations.
* Testing code in GeneralDbDAOTest that tested said annotations.
* JPA based DAOs - *DaoHibernateImpl and *WrapperDaoImpl
* Testing code in the DAO test framework only used to set up JPA
sessions.
* Resources and documentation for those tests.
* References to unused JPA and hibernate jars in the relevant pom.xml
files. The removal of JPA from the common project forced the addition
of JTA to the bll and vdsbroker projects, since they were no longer
implicitly dependant on it (via common->jpa->jta). However, this
addition makes bll and vdsbroker's pom.xmls clearer, as they do
explicitly use JTA classes.
Change-Id: I6ea15c96900f0c23d2fd5d5174bd8e90a44aa53a
Signed-off-by: Allon Mureinik <amureini at redhat.com>
---
M backend/manager/modules/bll/pom.xml
M backend/manager/modules/common/pom.xml
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionVersionMap.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTasks.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Bookmark.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventMap.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventMapId.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventNotificationMethod.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageStorageDomainMapId.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUN_storage_server_connection_map.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUN_storage_server_connection_map_id.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUNs.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapGroup.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RoleGroupMap.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RoleGroupMapId.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMapId.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageServerConnections.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsUserGroupMap.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsUserMap.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVdsMap.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVdsMapId.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmMap.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmMapId.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmPoolMap.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmPoolMapId.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdcOption.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDeviceId.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPoolMap.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.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/businessentities/event_notification_hist.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber_id.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/image_storage_domain_map.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/image_vm_map.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/image_vm_map_id.java
D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/mapping/GuidType.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/permissions.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domains.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool_iso_map_id.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pools.java
D backend/manager/modules/common/src/main/resources/engine-common-context.xml
M backend/manager/modules/dal/README
M backend/manager/modules/dal/pom.xml
D backend/manager/modules/dal/src/main/hibernate-resources/engine-daos.properties
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/user_sessions.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/user_sessions_id.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAO.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAOWrapperImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BaseDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BaseDAOWrapperImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BusinessEntitySnapshotDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAOWrapperImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAO.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAOWrapperImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAOWrapperImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/GuidGenerator.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/LunDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkClusterDaoHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkDaoHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleGroupMapDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAOWrapperImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainStaticDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionLunMapDAOHibernateImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdcOptionDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAOHibernateImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAO.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/actiongroup/ActionVersionMapDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/actiongroup/RoleGroupMapDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/dialect/EnginePostgreSQLDialect.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/events/MapDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/events/NotificationHistoryDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/events/NotificationMethodsDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/events/SubscriberDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/images/DiskImageDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/images/DiskImageDynamicDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagUserGroupMapDAO.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagUserMapDAO.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagVdsMapDAO.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagVmMapDAO.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/users/SessionDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/users/UserDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/vds/VdsDynamicDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/vds/VdsStaticDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/vds/VdsStatisticsDAOHibernateImpl.java
D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/vmpools/VmPoolMapDAOHibernateImpl.java
M backend/manager/modules/dal/src/test/filters/pgsql.properties
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ActionGroupDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AdGroupDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AsyncTaskDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AuditLogDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDiskDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BookmarkDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BusinessEntitySnapshotDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbUserDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDynamicDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskLunMapDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/EventDAOTest.java
D backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/GeneralDbDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ImageDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ImageStorageDomainMapDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/JobDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/JobSubjectEntityDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/LunDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/MultiThreadedDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PermissionDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleGroupMapDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/SnapshotDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StepDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java
D backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOWrapperImplTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainStaticDAOTest.java
D backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolDAOHibernateImplTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionLunMapDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdcOptionDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsGroupDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStatisticsDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDeviceDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmGuestAgentInterfaceDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmPoolDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/InterfaceDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkClusterDaoTest.java
D backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoHibernateImplTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkViewDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/VmNetworkInterfaceDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/VmNetworkStatisticsDaoTest.java
D backend/manager/modules/dal/src/test/resources/hibernate.cfg.xml
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReflectionUtils.java
M backend/manager/modules/vdsbroker/pom.xml
171 files changed, 91 insertions(+), 4,866 deletions(-)
Approvals:
Allon Mureinik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/11590
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ea15c96900f0c23d2fd5d5174bd8e90a44aa53a
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Daniel Erez <derez at redhat.com>
Gerrit-Reviewer: Laszlo Hornyak <lhornyak at redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk at redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin at redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni at redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan at redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs at redhat.com>
More information about the Engine-commits
mailing list