Alon Bar-Lev has uploaded a new change for review. Change subject: restapi: move aaa artifact to own subpackage ......................................................................
restapi: move aaa artifact to own subpackage Topic: AAA Change-Id: Idc08ae7bcf8d506569a30c97887bc2534d66cc61 Signed-off-by: Alon Bar-Lev <[email protected]> --- R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainGroupResource.java R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainGroupsResource.java R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainResource.java R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainUserResource.java R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainUsersResource.java R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainsResource.java R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/GroupResource.java R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/GroupsResource.java R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/UserResource.java R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/UsersResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupTagsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUserTagsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java R backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResource.java R backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupsResource.java R backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainResource.java R backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResource.java R backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUsersResource.java R backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainsResource.java R backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupResource.java R backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java R backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUserResource.java R backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResourceTest.java R backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResourceTest.java R backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResourceTest.java R backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupResourceTest.java R backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java R backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUserResourceTest.java R backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java 33 files changed, 111 insertions(+), 65 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/30592/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainGroupResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainGroupResource.java similarity index 90% rename from backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainGroupResource.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainGroupResource.java index 93f496c..01d0602 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainGroupResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainGroupResource.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.ovirt.engine.api.resource; +package org.ovirt.engine.api.resource.aaa; import javax.ws.rs.GET; import javax.ws.rs.Produces; import org.ovirt.engine.api.model.Group; +import org.ovirt.engine.api.resource.ApiMediaType; @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface DomainGroupResource { diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainGroupsResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainGroupsResource.java similarity index 91% rename from backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainGroupsResource.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainGroupsResource.java index 6571efc..da79403 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainGroupsResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainGroupsResource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ovirt.engine.api.resource; +package org.ovirt.engine.api.resource.aaa; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -22,6 +22,7 @@ import javax.ws.rs.Produces; import org.ovirt.engine.api.model.Groups; +import org.ovirt.engine.api.resource.ApiMediaType; @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface DomainGroupsResource { diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainResource.java similarity index 91% rename from backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainResource.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainResource.java index 5edfd80..7f3cbec 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainResource.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.ovirt.engine.api.resource; +package org.ovirt.engine.api.resource.aaa; import javax.ws.rs.GET; import javax.ws.rs.Produces; import org.ovirt.engine.api.model.Domain; +import org.ovirt.engine.api.resource.ApiMediaType; import javax.ws.rs.Path; @Produces( { ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML }) diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainUserResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainUserResource.java similarity index 90% rename from backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainUserResource.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainUserResource.java index 62d1fe8..718ebad 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainUserResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainUserResource.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.ovirt.engine.api.resource; +package org.ovirt.engine.api.resource.aaa; import javax.ws.rs.GET; import javax.ws.rs.Produces; import org.ovirt.engine.api.model.User; +import org.ovirt.engine.api.resource.ApiMediaType; @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface DomainUserResource { diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainUsersResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainUsersResource.java similarity index 91% rename from backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainUsersResource.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainUsersResource.java index 5d59f4a..e1e1a30 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainUsersResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainUsersResource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ovirt.engine.api.resource; +package org.ovirt.engine.api.resource.aaa; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -22,6 +22,7 @@ import javax.ws.rs.Produces; import org.ovirt.engine.api.model.Users; +import org.ovirt.engine.api.resource.ApiMediaType; @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface DomainUsersResource { diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainsResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainsResource.java similarity index 92% rename from backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainsResource.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainsResource.java index b1eab97..9b1a304 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/DomainsResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/DomainsResource.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.ovirt.engine.api.resource; +package org.ovirt.engine.api.resource.aaa; import javax.ws.rs.GET; import javax.ws.rs.Produces; import javax.ws.rs.Path; import org.ovirt.engine.api.model.Domains; +import org.ovirt.engine.api.resource.ApiMediaType; import javax.ws.rs.PathParam; @Path("/domains") diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/GroupResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/GroupResource.java similarity index 80% rename from backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/GroupResource.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/GroupResource.java index d52c728..c8e6709 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/GroupResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/GroupResource.java @@ -14,13 +14,17 @@ * limitations under the License. */ -package org.ovirt.engine.api.resource; +package org.ovirt.engine.api.resource.aaa; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import org.ovirt.engine.api.model.Group; +import org.ovirt.engine.api.resource.ApiMediaType; +import org.ovirt.engine.api.resource.AssignedPermissionsResource; +import org.ovirt.engine.api.resource.AssignedRolesResource; +import org.ovirt.engine.api.resource.AssignedTagsResource; @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface GroupResource { diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/GroupsResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/GroupsResource.java similarity index 94% rename from backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/GroupsResource.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/GroupsResource.java index 0eb53ba..ebc7f84 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/GroupsResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/GroupsResource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ovirt.engine.api.resource; +package org.ovirt.engine.api.resource.aaa; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -27,6 +27,7 @@ import org.ovirt.engine.api.model.Group; import org.ovirt.engine.api.model.Groups; +import org.ovirt.engine.api.resource.ApiMediaType; @Path("/groups") @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/UserResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/UserResource.java similarity index 80% rename from backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/UserResource.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/UserResource.java index 7d2f64d..669d703 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/UserResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/UserResource.java @@ -14,13 +14,17 @@ * limitations under the License. */ -package org.ovirt.engine.api.resource; +package org.ovirt.engine.api.resource.aaa; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import org.ovirt.engine.api.model.User; +import org.ovirt.engine.api.resource.ApiMediaType; +import org.ovirt.engine.api.resource.AssignedRolesResource; +import org.ovirt.engine.api.resource.AssignedPermissionsResource; +import org.ovirt.engine.api.resource.AssignedTagsResource; @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface UserResource { diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/UsersResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/UsersResource.java similarity index 94% rename from backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/UsersResource.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/UsersResource.java index 6c7680c..c2f0dee 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/UsersResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/aaa/UsersResource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ovirt.engine.api.resource; +package org.ovirt.engine.api.resource.aaa; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -27,6 +27,7 @@ import org.ovirt.engine.api.model.User; import org.ovirt.engine.api.model.Users; +import org.ovirt.engine.api.resource.ApiMediaType; @Path("/users") @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java index 25ed205..5b669dd 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java @@ -116,20 +116,12 @@ import org.ovirt.engine.api.resource.DiskSnapshotResource; import org.ovirt.engine.api.resource.DiskSnapshotsResource; import org.ovirt.engine.api.resource.DisksResource; -import org.ovirt.engine.api.resource.DomainGroupResource; -import org.ovirt.engine.api.resource.DomainGroupsResource; -import org.ovirt.engine.api.resource.DomainResource; -import org.ovirt.engine.api.resource.DomainUserResource; -import org.ovirt.engine.api.resource.DomainUsersResource; -import org.ovirt.engine.api.resource.DomainsResource; import org.ovirt.engine.api.resource.EventResource; import org.ovirt.engine.api.resource.EventsResource; import org.ovirt.engine.api.resource.FileResource; import org.ovirt.engine.api.resource.FilesResource; import org.ovirt.engine.api.resource.FilterResource; import org.ovirt.engine.api.resource.FiltersResource; -import org.ovirt.engine.api.resource.GroupResource; -import org.ovirt.engine.api.resource.GroupsResource; import org.ovirt.engine.api.resource.HostHookResource; import org.ovirt.engine.api.resource.HostHooksResource; import org.ovirt.engine.api.resource.HostNicResource; @@ -183,8 +175,6 @@ import org.ovirt.engine.api.resource.TemplateResource; import org.ovirt.engine.api.resource.TemplatesResource; import org.ovirt.engine.api.resource.UpdatableRoleResource; -import org.ovirt.engine.api.resource.UserResource; -import org.ovirt.engine.api.resource.UsersResource; import org.ovirt.engine.api.resource.VmApplicationResource; import org.ovirt.engine.api.resource.VmApplicationsResource; import org.ovirt.engine.api.resource.VmDiskResource; @@ -205,6 +195,16 @@ import org.ovirt.engine.api.resource.WatchdogResource; import org.ovirt.engine.api.resource.WeightResource; import org.ovirt.engine.api.resource.WeightsResource; +import org.ovirt.engine.api.resource.aaa.DomainGroupResource; +import org.ovirt.engine.api.resource.aaa.DomainGroupsResource; +import org.ovirt.engine.api.resource.aaa.DomainResource; +import org.ovirt.engine.api.resource.aaa.DomainUserResource; +import org.ovirt.engine.api.resource.aaa.DomainUsersResource; +import org.ovirt.engine.api.resource.aaa.DomainsResource; +import org.ovirt.engine.api.resource.aaa.GroupResource; +import org.ovirt.engine.api.resource.aaa.GroupsResource; +import org.ovirt.engine.api.resource.aaa.UserResource; +import org.ovirt.engine.api.resource.aaa.UsersResource; import org.ovirt.engine.api.resource.gluster.GlusterBrickResource; import org.ovirt.engine.api.resource.gluster.GlusterBricksResource; import org.ovirt.engine.api.resource.gluster.GlusterHookResource; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java index eaba0e3..8277dff 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java @@ -34,9 +34,7 @@ import org.ovirt.engine.api.restapi.resource.BackendClustersResource; import org.ovirt.engine.api.restapi.resource.BackendDataCentersResource; import org.ovirt.engine.api.restapi.resource.BackendDisksResource; -import org.ovirt.engine.api.restapi.resource.BackendDomainsResource; import org.ovirt.engine.api.restapi.resource.BackendEventsResource; -import org.ovirt.engine.api.restapi.resource.BackendGroupsResource; import org.ovirt.engine.api.restapi.resource.BackendHostsResource; import org.ovirt.engine.api.restapi.resource.BackendInstanceTypesResource; import org.ovirt.engine.api.restapi.resource.BackendJobsResource; @@ -50,10 +48,12 @@ import org.ovirt.engine.api.restapi.resource.BackendSystemPermissionsResource; import org.ovirt.engine.api.restapi.resource.BackendTagsResource; import org.ovirt.engine.api.restapi.resource.BackendTemplatesResource; -import org.ovirt.engine.api.restapi.resource.BackendUsersResource; import org.ovirt.engine.api.restapi.resource.BackendVmPoolsResource; import org.ovirt.engine.api.restapi.resource.BackendVmsResource; import org.ovirt.engine.api.restapi.resource.BackendVnicProfilesResource; +import org.ovirt.engine.api.restapi.resource.aaa.BackendDomainsResource; +import org.ovirt.engine.api.restapi.resource.aaa.BackendGroupsResource; +import org.ovirt.engine.api.restapi.resource.aaa.BackendUsersResource; import org.ovirt.engine.api.restapi.resource.validation.IOExceptionMapper; import org.ovirt.engine.api.restapi.resource.validation.JsonExceptionMapper; import org.ovirt.engine.api.restapi.resource.validation.MalformedIdExceptionMapper; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java index 793fb4b..d34a72d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java @@ -25,7 +25,7 @@ private Guid principalId; - protected BackendAssignedRolesResource(Guid principalId) { + public BackendAssignedRolesResource(Guid principalId) { super(Role.class, Permissions.class); this.principalId = principalId; } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupTagsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupTagsResource.java index e9d928b..686f644 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupTagsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupTagsResource.java @@ -5,10 +5,10 @@ import org.ovirt.engine.api.model.Group; import org.ovirt.engine.api.model.Tag; import org.ovirt.engine.api.resource.AssignedTagsResource; -import org.ovirt.engine.core.common.businessentities.Tags; import org.ovirt.engine.core.common.action.AttachEntityToTagParameters; import org.ovirt.engine.core.common.action.TagsActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.core.common.businessentities.Tags; import org.ovirt.engine.core.common.queries.GetTagsByUserGroupIdParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUserTagsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUserTagsResource.java index d333bc0..b79538f 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUserTagsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUserTagsResource.java @@ -5,10 +5,10 @@ import org.ovirt.engine.api.model.Tag; import org.ovirt.engine.api.model.User; import org.ovirt.engine.api.resource.AssignedTagsResource; -import org.ovirt.engine.core.common.businessentities.Tags; import org.ovirt.engine.core.common.action.AttachEntityToTagParameters; import org.ovirt.engine.core.common.action.TagsActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.core.common.businessentities.Tags; import org.ovirt.engine.core.common.queries.GetTagsByUserIdParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java index a75e911..0adb122 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java @@ -8,9 +8,11 @@ import org.ovirt.engine.api.model.Session; import org.ovirt.engine.api.model.Sessions; import org.ovirt.engine.api.model.User; -import org.ovirt.engine.api.resource.UserResource; import org.ovirt.engine.api.resource.VmSessionResource; import org.ovirt.engine.api.resource.VmSessionsResource; +import org.ovirt.engine.api.resource.aaa.UserResource; +import org.ovirt.engine.api.restapi.resource.aaa.BackendUserResource; +import org.ovirt.engine.api.restapi.resource.aaa.BackendUsersResource; import org.ovirt.engine.api.restapi.types.VmMapper; import org.ovirt.engine.api.restapi.utils.GuidUtils; import org.ovirt.engine.core.common.businessentities.VM; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResource.java similarity index 91% rename from backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResource.java rename to backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResource.java index 5b6bdc7..3449e6a 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResource.java @@ -1,8 +1,9 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; import org.ovirt.engine.api.model.BaseResource; import org.ovirt.engine.api.model.Group; -import org.ovirt.engine.api.resource.DomainGroupResource; +import org.ovirt.engine.api.resource.aaa.DomainGroupResource; +import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource; import org.ovirt.engine.api.restapi.utils.DirectoryEntryIdUtils; import org.ovirt.engine.core.aaa.DirectoryGroup; import org.ovirt.engine.core.common.queries.DirectoryIdQueryParameters; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupsResource.java similarity index 89% rename from backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupsResource.java rename to backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupsResource.java index a8277ba..615540f 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupsResource.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; import java.text.MessageFormat; import java.util.List; @@ -8,8 +8,10 @@ import org.ovirt.engine.api.model.Domain; import org.ovirt.engine.api.model.Group; import org.ovirt.engine.api.model.Groups; -import org.ovirt.engine.api.resource.DomainGroupResource; -import org.ovirt.engine.api.resource.DomainGroupsResource; +import org.ovirt.engine.api.resource.aaa.DomainGroupResource; +import org.ovirt.engine.api.resource.aaa.DomainGroupsResource; +import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource; +import org.ovirt.engine.api.restapi.resource.SingleEntityResource; import org.ovirt.engine.core.aaa.DirectoryGroup; import org.ovirt.engine.core.common.interfaces.SearchType; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainResource.java similarity index 77% rename from backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainResource.java rename to backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainResource.java index 9a7d072..2812c31 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainResource.java @@ -1,13 +1,14 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; import static org.ovirt.engine.api.utils.ReflectionHelper.assignChildModel; -import static org.ovirt.engine.api.restapi.resource.BackendDomainsResource.SUB_COLLECTIONS; +import static org.ovirt.engine.api.restapi.resource.aaa.BackendDomainsResource.SUB_COLLECTIONS; import org.ovirt.engine.api.model.Domain; -import org.ovirt.engine.api.resource.DomainGroupsResource; -import org.ovirt.engine.api.resource.DomainUsersResource; -import org.ovirt.engine.api.resource.DomainResource; +import org.ovirt.engine.api.resource.aaa.DomainGroupsResource; +import org.ovirt.engine.api.resource.aaa.DomainResource; +import org.ovirt.engine.api.resource.aaa.DomainUsersResource; import org.ovirt.engine.api.restapi.model.Directory; +import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource; public class BackendDomainResource extends AbstractBackendSubResource<Domain, Directory> implements DomainResource { diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResource.java similarity index 90% rename from backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResource.java rename to backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResource.java index 0faacf2..77ef514 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResource.java @@ -1,8 +1,9 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; import org.ovirt.engine.api.model.BaseResource; import org.ovirt.engine.api.model.User; -import org.ovirt.engine.api.resource.DomainUserResource; +import org.ovirt.engine.api.resource.aaa.DomainUserResource; +import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource; import org.ovirt.engine.api.restapi.utils.DirectoryEntryIdUtils; import org.ovirt.engine.core.aaa.DirectoryUser; import org.ovirt.engine.core.common.queries.DirectoryIdQueryParameters; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainUsersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUsersResource.java similarity index 89% rename from backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainUsersResource.java rename to backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUsersResource.java index f93c723..f19a7c2 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainUsersResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUsersResource.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; import java.text.MessageFormat; import java.util.List; @@ -8,8 +8,10 @@ import org.ovirt.engine.api.model.Domain; import org.ovirt.engine.api.model.User; import org.ovirt.engine.api.model.Users; -import org.ovirt.engine.api.resource.DomainUserResource; -import org.ovirt.engine.api.resource.DomainUsersResource; +import org.ovirt.engine.api.resource.aaa.DomainUserResource; +import org.ovirt.engine.api.resource.aaa.DomainUsersResource; +import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource; +import org.ovirt.engine.api.restapi.resource.SingleEntityResource; import org.ovirt.engine.core.aaa.DirectoryUser; import org.ovirt.engine.core.common.interfaces.SearchType; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainsResource.java similarity index 91% rename from backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainsResource.java rename to backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainsResource.java index 3a38e33..a7b4f35 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainsResource.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; import static org.ovirt.engine.api.utils.ReflectionHelper.assignChildModel; @@ -9,9 +9,11 @@ import org.ovirt.engine.api.model.Domain; import org.ovirt.engine.api.model.Domains; -import org.ovirt.engine.api.resource.DomainResource; -import org.ovirt.engine.api.resource.DomainsResource; +import org.ovirt.engine.api.resource.aaa.DomainResource; +import org.ovirt.engine.api.resource.aaa.DomainsResource; import org.ovirt.engine.api.restapi.model.Directory; +import org.ovirt.engine.api.restapi.resource.AbstractBackendCollectionResource; +import org.ovirt.engine.api.restapi.resource.SingleEntityResource; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupResource.java similarity index 78% rename from backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupResource.java rename to backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupResource.java index edbb4f9..87f7bd4 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupResource.java @@ -1,13 +1,17 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; -import static org.ovirt.engine.api.restapi.resource.BackendGroupsResource.SUB_COLLECTIONS; +import static org.ovirt.engine.api.restapi.resource.aaa.BackendGroupsResource.SUB_COLLECTIONS; import org.ovirt.engine.api.model.BaseResource; import org.ovirt.engine.api.model.Group; import org.ovirt.engine.api.resource.AssignedPermissionsResource; import org.ovirt.engine.api.resource.AssignedRolesResource; import org.ovirt.engine.api.resource.AssignedTagsResource; -import org.ovirt.engine.api.resource.GroupResource; +import org.ovirt.engine.api.resource.aaa.GroupResource; +import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource; +import org.ovirt.engine.api.restapi.resource.BackendAssignedPermissionsResource; +import org.ovirt.engine.api.restapi.resource.BackendAssignedRolesResource; +import org.ovirt.engine.api.restapi.resource.BackendGroupTagsResource; import org.ovirt.engine.core.common.businessentities.aaa.DbGroup; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java similarity index 96% rename from backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResource.java rename to backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java index 5275da0..6936fc0 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; import java.text.MessageFormat; import java.util.List; @@ -11,8 +11,10 @@ import org.ovirt.engine.api.model.BaseResource; import org.ovirt.engine.api.model.Group; import org.ovirt.engine.api.model.Groups; -import org.ovirt.engine.api.resource.GroupResource; -import org.ovirt.engine.api.resource.GroupsResource; +import org.ovirt.engine.api.resource.aaa.GroupResource; +import org.ovirt.engine.api.resource.aaa.GroupsResource; +import org.ovirt.engine.api.restapi.resource.AbstractBackendCollectionResource; +import org.ovirt.engine.api.restapi.resource.SingleEntityResource; import org.ovirt.engine.core.aaa.DirectoryGroup; import org.ovirt.engine.core.common.action.AddGroupParameters; import org.ovirt.engine.core.common.action.IdParameters; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUserResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUserResource.java similarity index 82% rename from backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUserResource.java rename to backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUserResource.java index c973129..f635a70 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUserResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUserResource.java @@ -1,13 +1,17 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; -import static org.ovirt.engine.api.restapi.resource.BackendUsersResource.SUB_COLLECTIONS; +import static org.ovirt.engine.api.restapi.resource.aaa.BackendUsersResource.SUB_COLLECTIONS; import org.ovirt.engine.api.model.BaseResource; import org.ovirt.engine.api.model.User; import org.ovirt.engine.api.resource.AssignedPermissionsResource; import org.ovirt.engine.api.resource.AssignedRolesResource; import org.ovirt.engine.api.resource.AssignedTagsResource; -import org.ovirt.engine.api.resource.UserResource; +import org.ovirt.engine.api.resource.aaa.UserResource; +import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource; +import org.ovirt.engine.api.restapi.resource.BackendAssignedPermissionsResource; +import org.ovirt.engine.api.restapi.resource.BackendAssignedRolesResource; +import org.ovirt.engine.api.restapi.resource.BackendUserTagsResource; import org.ovirt.engine.core.common.businessentities.aaa.DbUser; import org.ovirt.engine.core.common.queries.GetDbUserByUserNameAndDomainQueryParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java similarity index 95% rename from backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java rename to backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java index dfd993e..422501c 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; import static org.ovirt.engine.api.utils.ReflectionHelper.assignChildModel; @@ -13,8 +13,10 @@ import org.ovirt.engine.api.model.BaseResource; import org.ovirt.engine.api.model.User; import org.ovirt.engine.api.model.Users; -import org.ovirt.engine.api.resource.UserResource; -import org.ovirt.engine.api.resource.UsersResource; +import org.ovirt.engine.api.resource.aaa.UserResource; +import org.ovirt.engine.api.resource.aaa.UsersResource; +import org.ovirt.engine.api.restapi.resource.AbstractBackendCollectionResource; +import org.ovirt.engine.api.restapi.resource.SingleEntityResource; import org.ovirt.engine.core.aaa.DirectoryUser; import org.ovirt.engine.core.common.action.AddUserParameters; import org.ovirt.engine.core.common.action.IdParameters; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResourceTest.java index 637d801..8b64d8d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResourceTest.java @@ -5,6 +5,7 @@ import org.ovirt.engine.api.model.Session; import org.ovirt.engine.api.model.Sessions; import org.ovirt.engine.api.model.User; +import org.ovirt.engine.api.restapi.resource.aaa.BackendUserResource; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VmDynamic; import org.ovirt.engine.core.common.queries.IdQueryParameters; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResourceTest.java similarity index 95% rename from backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResourceTest.java rename to backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResourceTest.java index f08c110..18d3bf4 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResourceTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; import static org.easymock.EasyMock.expect; @@ -11,6 +11,7 @@ import org.junit.Test; import org.ovirt.engine.api.model.Domain; import org.ovirt.engine.api.model.Group; +import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResourceTest; import org.ovirt.engine.core.aaa.DirectoryGroup; import org.ovirt.engine.core.common.queries.DirectoryIdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResourceTest.java similarity index 95% rename from backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResourceTest.java rename to backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResourceTest.java index 62017f5..d3903e7 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResourceTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; import static org.easymock.EasyMock.expect; @@ -8,6 +8,7 @@ import org.junit.Test; import org.ovirt.engine.api.model.Domain; import org.ovirt.engine.api.model.User; +import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResourceTest; import org.ovirt.engine.api.restapi.utils.DirectoryEntryIdUtils; import org.ovirt.engine.core.aaa.DirectoryUser; import org.ovirt.engine.core.common.queries.DirectoryIdQueryParameters; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupResourceTest.java similarity index 95% rename from backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupResourceTest.java rename to backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupResourceTest.java index 22f76bd..ffcc282 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupResourceTest.java @@ -1,9 +1,10 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; import javax.ws.rs.WebApplicationException; import org.junit.Test; import org.ovirt.engine.api.model.Group; +import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResourceTest; import org.ovirt.engine.core.common.businessentities.aaa.DbGroup; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java similarity index 98% rename from backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java rename to backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java index 4fa979f..e1ba5ea 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; import java.util.List; @@ -10,6 +10,7 @@ import org.ovirt.engine.api.model.Domain; import org.ovirt.engine.api.model.Fault; import org.ovirt.engine.api.model.Group; +import org.ovirt.engine.api.restapi.resource.AbstractBackendCollectionResourceTest; import org.ovirt.engine.core.aaa.DirectoryGroup; import org.ovirt.engine.core.common.action.AddGroupParameters; import org.ovirt.engine.core.common.action.IdParameters; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUserResourceTest.java similarity index 92% rename from backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserResourceTest.java rename to backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUserResourceTest.java index 21942ad..4d0ee3e 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUserResourceTest.java @@ -1,7 +1,7 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; -import static org.ovirt.engine.api.restapi.resource.BackendUsersResourceTest.GROUPS; -import static org.ovirt.engine.api.restapi.resource.BackendUsersResourceTest.PARSED_GROUPS; +import static org.ovirt.engine.api.restapi.resource.aaa.BackendUsersResourceTest.GROUPS; +import static org.ovirt.engine.api.restapi.resource.aaa.BackendUsersResourceTest.PARSED_GROUPS; import java.util.Arrays; import java.util.HashSet; @@ -11,6 +11,7 @@ import org.junit.Test; import org.ovirt.engine.api.model.Group; import org.ovirt.engine.api.model.User; +import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResourceTest; import org.ovirt.engine.core.common.businessentities.aaa.DbUser; import org.ovirt.engine.core.common.queries.GetDbUserByUserNameAndDomainQueryParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java similarity index 98% rename from backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java rename to backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java index e7c4227..8051409 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.api.restapi.resource; +package org.ovirt.engine.api.restapi.resource.aaa; import java.util.Arrays; import java.util.HashSet; @@ -14,6 +14,7 @@ import org.ovirt.engine.api.model.Fault; import org.ovirt.engine.api.model.Group; import org.ovirt.engine.api.model.User; +import org.ovirt.engine.api.restapi.resource.AbstractBackendCollectionResourceTest; import org.ovirt.engine.core.aaa.DirectoryUser; import org.ovirt.engine.core.common.action.AddUserParameters; import org.ovirt.engine.core.common.action.IdParameters; -- To view, visit http://gerrit.ovirt.org/30592 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc08ae7bcf8d506569a30c97887bc2534d66cc61 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
