CCM NG: Fixed some compilion failures

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5016 8810af33-2d31-482b-a856-94f89814c4df
jensp 2017-09-27 19:57:37 +00:00
parent e4bbfc3e41
commit f117574c8f
1 changed files with 45 additions and 3 deletions

View File

@ -18,13 +18,39 @@
*/ */
package org.libreccm.portation; package org.libreccm.portation;
import org.libreccm.categorization.*; import org.libreccm.categorization.Categorization;
import org.libreccm.categorization.CategorizationMarshaller;
import org.libreccm.categorization.Category;
import org.libreccm.categorization.CategoryMarshaller;
import org.libreccm.categorization.Domain;
import org.libreccm.categorization.DomainMarshaller;
import org.libreccm.categorization.DomainOwnership;
import org.libreccm.categorization.DomainOwnershipMarshaller;
import org.libreccm.core.ResourceType; import org.libreccm.core.ResourceType;
import org.libreccm.core.ResourceTypeMarshaller; import org.libreccm.core.ResourceTypeMarshaller;
import org.libreccm.security.*; import org.libreccm.security.Group;
import org.libreccm.security.GroupMarshaller;
import org.libreccm.security.GroupMembership;
import org.libreccm.security.GroupMembershipMarshaller;
import org.libreccm.security.Permission;
import org.libreccm.security.PermissionMarshaller;
import org.libreccm.security.Role;
import org.libreccm.security.RoleMarshaller;
import org.libreccm.security.RoleMembership;
import org.libreccm.security.RoleMembershipMarshaller;
import org.libreccm.security.User;
import org.libreccm.security.UserMarshaller;
import org.libreccm.web.CcmApplication; import org.libreccm.web.CcmApplication;
import org.libreccm.web.ApplicationMarshaller; import org.libreccm.web.ApplicationMarshaller;
import org.libreccm.workflow.*; import org.libreccm.workflow.AssignableTask;
import org.libreccm.workflow.AssignableTaskMarshaller;
import org.libreccm.workflow.TaskAssignment;
import org.libreccm.workflow.TaskAssignmentMarshaller;
import org.libreccm.workflow.TaskComment;
import org.libreccm.workflow.TaskCommentMarshaller;
import org.libreccm.workflow.Workflow;
import org.libreccm.workflow.WorkflowMarshaller;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Inject; import javax.inject.Inject;
@ -47,34 +73,47 @@ class ImportHelper {
@Inject @Inject
@Marshals(User.class) @Marshals(User.class)
private UserMarshaller userMarshaller; private UserMarshaller userMarshaller;
@Inject @Inject
@Marshals(Group.class) @Marshals(Group.class)
private GroupMarshaller groupMarshaller; private GroupMarshaller groupMarshaller;
@Inject @Inject
@Marshals(GroupMembership.class) @Marshals(GroupMembership.class)
private GroupMembershipMarshaller groupMembershipMarshaller; private GroupMembershipMarshaller groupMembershipMarshaller;
@Inject @Inject
@Marshals(Role.class) @Marshals(Role.class)
private RoleMarshaller roleMarshaller; private RoleMarshaller roleMarshaller;
@Inject @Inject
@Marshals(RoleMembership.class) @Marshals(RoleMembership.class)
private RoleMembershipMarshaller roleMembershipMarshaller; private RoleMembershipMarshaller roleMembershipMarshaller;
@Inject
@Marshals(Permission.class)
private PermissionMarshaller permissionMarshaller;
@Inject @Inject
@Marshals(Category.class) @Marshals(Category.class)
private CategoryMarshaller categoryMarshaller; private CategoryMarshaller categoryMarshaller;
@Inject @Inject
@Marshals(Categorization.class) @Marshals(Categorization.class)
private CategorizationMarshaller categorizationMarshaller; private CategorizationMarshaller categorizationMarshaller;
@Inject @Inject
@Marshals(ResourceType.class) @Marshals(ResourceType.class)
private ResourceTypeMarshaller resourceTypeMarshaller; private ResourceTypeMarshaller resourceTypeMarshaller;
@Inject @Inject
@Marshals(CcmApplication.class) @Marshals(CcmApplication.class)
private ApplicationMarshaller applicationMarshaller; private ApplicationMarshaller applicationMarshaller;
@Inject @Inject
@Marshals(Domain.class) @Marshals(Domain.class)
private DomainMarshaller domainMarshaller; private DomainMarshaller domainMarshaller;
@Inject @Inject
@Marshals(DomainOwnership.class) @Marshals(DomainOwnership.class)
private DomainOwnershipMarshaller domainOwnershipMarshaller; private DomainOwnershipMarshaller domainOwnershipMarshaller;
@ -82,12 +121,15 @@ class ImportHelper {
@Inject @Inject
@Marshals(Workflow.class) @Marshals(Workflow.class)
private WorkflowMarshaller workflowMarshaller; private WorkflowMarshaller workflowMarshaller;
@Inject @Inject
@Marshals(TaskComment.class) @Marshals(TaskComment.class)
private TaskCommentMarshaller taskCommentMarshaller; private TaskCommentMarshaller taskCommentMarshaller;
@Inject @Inject
@Marshals(AssignableTask.class) @Marshals(AssignableTask.class)
private AssignableTaskMarshaller assignableTaskMarshaller; private AssignableTaskMarshaller assignableTaskMarshaller;
@Inject @Inject
@Marshals(TaskAssignment.class) @Marshals(TaskAssignment.class)
private TaskAssignmentMarshaller taskAssignmentMarshaller; private TaskAssignmentMarshaller taskAssignmentMarshaller;