Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@skublik
skublik committed Mar 23, 2020
2 parents 645f16b + e5e959f commit 2d2928f
Show file tree
Hide file tree
Showing 45 changed files with 26,812 additions and 26,527 deletions.
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
View file
Expand Up @@ -606,7 +606,7 @@ private AssignmentItemDto createAssignmentItem(PrismContainerValue<AssignmentTyp

PrismObject resource = WebModelServiceUtils.loadObject(ResourceType.class,
resourceRef.getOid(), this, task, result);
name = WebComponentUtil.getName(resource);
name = WebComponentUtil.getName(resource, false);
description = constr.getDescription();
}
}
Expand Down
52,986 changes: 26,514 additions & 26,472 deletions infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
View file

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .../evolveum/midpoint/certification/impl/AccessCertificationCampaignCreationTaskHandler.java
View file
Expand Up @@ -16,6 +16,7 @@
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationCampaignType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;

import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -111,4 +112,9 @@ public TaskRunResult run(RunningTask task, TaskPartitionDefinitionType partition
public String getCategoryName(Task task) {
return TaskCategory.ACCESS_CERTIFICATION;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_CERTIFICATION_TASK.value();
}
}
5 changes: 5 additions & 0 deletions .../java/com/evolveum/midpoint/certification/impl/AccessCertificationClosingTaskHandler.java
View file
Expand Up @@ -245,6 +245,11 @@ public String getCategoryName(Task task) {
return TaskCategory.ACCESS_CERTIFICATION;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_CERTIFICATION_TASK.value();
}

public void launch(AccessCertificationCampaignType campaign, OperationResult parentResult) throws SchemaException, ObjectNotFoundException {

LOGGER.debug("Launching closing task handler for campaign {} as asynchronous task", toShortString(campaign));
Expand Down
5 changes: 5 additions & 0 deletions ...a/com/evolveum/midpoint/certification/impl/AccessCertificationRemediationTaskHandler.java
View file
Expand Up @@ -165,6 +165,11 @@ public String getCategoryName(Task task) {
return TaskCategory.ACCESS_CERTIFICATION;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_CERTIFICATION_TASK.value();
}

public void launch(AccessCertificationCampaignType campaign, OperationResult parentResult) throws SchemaException, ObjectNotFoundException {

LOGGER.info("Launching remediation task handler for campaign {} as asynchronous task", ObjectTypeUtil.toShortString(campaign));
Expand Down
8 changes: 7 additions & 1 deletion ...model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanUpTaskHandler.java
View file
Expand Up @@ -29,6 +29,7 @@

import javax.annotation.PostConstruct;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

@Component
Expand Down Expand Up @@ -195,6 +196,11 @@ public String getCategoryName(Task task) {

@Override
public List<String> getCategoryNames() {
return Arrays.asList(TaskCategory.UTIL, TaskCategory.SYSTEM);
return Collections.singletonList(TaskCategory.CLEANUP);
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.TASK_CLEANUP.value();
}
}
7 changes: 7 additions & 0 deletions ...impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/ShadowRefreshTaskHandler.java
View file
Expand Up @@ -9,6 +9,8 @@
import javax.annotation.PostConstruct;

import com.evolveum.midpoint.task.api.RunningTask;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

Expand Down Expand Up @@ -104,4 +106,9 @@ protected boolean handleObject(PrismObject<ShadowType> object, RunningTask worke
handler.setStopOnError(false);
return handler;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_UTILITY_TASK.value();
}
}
6 changes: 6 additions & 0 deletions ...l/src/main/java/com/evolveum/midpoint/model/impl/controller/ExecuteDeltasTaskHandler.java
View file
Expand Up @@ -22,6 +22,7 @@
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ModelExecuteOptionsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;
import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -98,4 +99,9 @@ public String getCategoryName(Task task) {
private void initialize() {
taskManager.registerHandler(ModelPublicConstants.EXECUTE_DELTAS_TASK_HANDLER_URI, this);
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_UTILITY_TASK.value(); // todo reconsider
}
}
6 changes: 6 additions & 0 deletions .../src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
View file
Expand Up @@ -22,6 +22,7 @@
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.LensContextType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;

import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -147,4 +148,9 @@ public String getCategoryName(Task task) {
private void initialize() {
taskManager.registerHandler(MODEL_OPERATION_TASK_URI, this);
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_UTILITY_TASK.value();
}
}
12 changes: 7 additions & 5 deletions ...java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
View file
Expand Up @@ -16,7 +16,8 @@
import com.evolveum.midpoint.prism.*;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.task.api.*;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -51,10 +52,6 @@
import com.evolveum.midpoint.util.exception.SecurityViolationException;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.LayerType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;
import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;

/**
Expand Down Expand Up @@ -338,4 +335,9 @@ public boolean importSingleShadow(String shadowOid, Task task, OperationResult p

return true;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_IMPORT_TASK.value();
}
}
6 changes: 6 additions & 0 deletions ...main/java/com/evolveum/midpoint/model/impl/importer/ImportObjectsFromFileTaskHandler.java
View file
Expand Up @@ -22,6 +22,7 @@
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;
import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;

Expand Down Expand Up @@ -200,4 +201,9 @@ public void refreshStatus(Task task) {
public String getCategoryName(Task task) {
return TaskCategory.IMPORT_FROM_FILE;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_UTILITY_TASK.value();
}
}
6 changes: 6 additions & 0 deletions ...main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckTaskHandler.java
View file
Expand Up @@ -23,6 +23,7 @@
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;

import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -100,4 +101,9 @@ protected boolean requiresDirectRepositoryAccess(ObjectIntegrityCheckResultHandl
public String getCategoryName(Task task) {
return TaskCategory.UTIL;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_UTILITY_TASK.value();
}
}
6 changes: 6 additions & 0 deletions ...main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckTaskHandler.java
View file
Expand Up @@ -21,6 +21,7 @@
import com.evolveum.midpoint.task.api.TaskRunResult;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;

import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -89,4 +90,9 @@ protected boolean requiresDirectRepositoryAccess(ShadowIntegrityCheckResultHandl
public String getCategoryName(Task task) {
return TaskCategory.UTIL;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_UTILITY_TASK.value();
}
}
6 changes: 6 additions & 0 deletions .../java/com/evolveum/midpoint/model/impl/scripting/IterativeScriptExecutionTaskHandler.java
View file
Expand Up @@ -24,6 +24,7 @@
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;
import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ExecuteScriptType;
import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ValueListType;
Expand Down Expand Up @@ -104,4 +105,9 @@ static ExecuteScriptType getExecuteScriptRequest(RunningTask coordinatorTask) {
public String getCategoryName(Task task) {
return TaskCategory.BULK_ACTIONS;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_ITERATIVE_BULK_ACTION_TASK.value();
}
}
6 changes: 6 additions & 0 deletions .../src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptExecutionTaskHandler.java
View file
Expand Up @@ -23,6 +23,7 @@
import com.evolveum.midpoint.util.logging.LoggingUtils;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;
import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ExecuteScriptType;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -86,4 +87,9 @@ public String getCategoryName(Task task) {
private void initialize() {
taskManager.registerHandler(ModelPublicConstants.SCRIPT_EXECUTION_TASK_HANDLER_URI, this);
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_SINGLE_BULK_ACTION_TASK.value();
}
}
6 changes: 6 additions & 0 deletions ...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/AsyncUpdateTaskHandler.java
View file
Expand Up @@ -18,6 +18,7 @@
import com.evolveum.midpoint.util.exception.*;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -89,4 +90,9 @@ public TaskRunResult run(RunningTask task, TaskPartitionDefinitionType partition
public String getCategoryName(Task task) {
return TaskCategory.ASYNCHRONOUS_UPDATE;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_ASYNC_UPDATE_TASK.value();
}
}
14 changes: 7 additions & 7 deletions ...rc/main/java/com/evolveum/midpoint/model/impl/sync/DeleteNotUpdatedShadowTaskHandler.java
View file
Expand Up @@ -20,6 +20,8 @@

import com.evolveum.midpoint.util.exception.*;

import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

Expand All @@ -45,13 +47,6 @@
import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AvailabilityStatusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.LayerType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationalStateType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;

/**
* @author skublik
Expand Down Expand Up @@ -238,4 +233,9 @@ public String getCategoryName(Task task) {
protected String getDefaultChannel() {
return SchemaConstants.CHANGE_CHANNEL_DEL_NOT_UPDATED_SHADOWS_URI;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_UTILITY_TASK.value();
}
}
11 changes: 7 additions & 4 deletions ...l-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ExecuteChangesTaskHandler.java
View file
Expand Up @@ -11,6 +11,8 @@
import javax.annotation.PostConstruct;

import com.evolveum.midpoint.task.api.*;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
Expand Down Expand Up @@ -38,10 +40,6 @@
import com.evolveum.midpoint.util.exception.SecurityViolationException;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType;

@Component
Expand Down Expand Up @@ -119,4 +117,9 @@ private <T extends ObjectType> ObjectDelta<T> createDeltaFromTask(Task task) thr
public String getCategoryName(Task task) {
return TaskCategory.EXECUTE_CHANGES;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_UTILITY_TASK.value();
}
}
16 changes: 6 additions & 10 deletions .../src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
View file
Expand Up @@ -35,15 +35,7 @@
import com.evolveum.midpoint.util.exception.*;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.NotificationPolicyActionType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.PolicyConstraintKindType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.PolicyRuleType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TimeValidityPolicyConstraintType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;

import org.apache.commons.collections.CollectionUtils;
Expand Down Expand Up @@ -114,7 +106,7 @@ private void initialize() {
taskManager.registerHandler(ModelPublicConstants.FOCUS_VALIDITY_SCANNER_TASK_HANDLER_URI, this);
taskManager.registerAdditionalHandlerUri(ModelPublicConstants.PARTITIONED_FOCUS_VALIDITY_SCANNER_TASK_HANDLER_URI_1, this);
taskManager.registerAdditionalHandlerUri(ModelPublicConstants.PARTITIONED_FOCUS_VALIDITY_SCANNER_TASK_HANDLER_URI_2, this);
taskManager.registerAdditionalHandlerUri(ModelPublicConstants.DEPRECATED_FOCUS_VALIDITY_SCANNER_TASK_HANDLER_URI, this);
taskManager.registerDeprecatedHandlerUri(ModelPublicConstants.DEPRECATED_FOCUS_VALIDITY_SCANNER_TASK_HANDLER_URI, this);
}

@Override
Expand Down Expand Up @@ -334,4 +326,8 @@ private boolean isTimeValidityConstraint(Task coordinatorTask) {
return getValidityPolicyConstraint(coordinatorTask) != null;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_SYSTEM_TASK.value();
}
}
7 changes: 7 additions & 0 deletions ...l/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
View file
Expand Up @@ -8,6 +8,8 @@

import javax.annotation.PostConstruct;

import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;

import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
Expand Down Expand Up @@ -105,4 +107,9 @@ public TaskRunResult run(RunningTask task, TaskPartitionDefinitionType partition
public String getCategoryName(Task task) {
return TaskCategory.LIVE_SYNCHRONIZATION;
}

@Override
public String getArchetypeOid() {
return SystemObjectsType.ARCHETYPE_LIVE_SYNC_TASK.value();
}
}

0 comments on commit 2d2928f

Please sign in to comment.