diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java index 6c5bd7245fb..53cd015db20 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java @@ -812,13 +812,8 @@ public static boolean isPostAuthenticationEnabled(TaskManager taskManager, Model } public static PrismObject loadSystemConfigurationAsPrismObject(PageBase pageBase, Task task, OperationResult result) { - - Collection> options = pageBase.getOperationOptionsBuilder() - .items(SystemConfigurationType.F_DEFAULT_USER_TEMPLATE_REF, SystemConfigurationType.F_GLOBAL_PASSWORD_POLICY_REF).resolve() - .build(); - PrismObject systemConfig = loadObject( - SystemConfigurationType.class, SystemObjectsType.SYSTEM_CONFIGURATION.value(), options, + SystemConfigurationType.class, SystemObjectsType.SYSTEM_CONFIGURATION.value(), null, pageBase, task, result); return systemConfig; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ConstructionWrapperFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ConstructionWrapperFactory.java index 53db77baa76..a1c247fee51 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ConstructionWrapperFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ConstructionWrapperFactory.java @@ -43,8 +43,11 @@ public boolean match(ItemDefinition def) { public PrismContainerValueWrapper createContainerValueWrapper(PrismContainerWrapper objectWrapper, PrismContainerValue objectValue, ValueStatus status, WrapperContext context) { ConstructionValueWrapper constructionValueWrapper = new ConstructionValueWrapper(objectWrapper, objectValue, status); ConstructionType constructionType = objectValue.asContainerable(); - if (constructionType.getResource() != null) { - constructionValueWrapper.setResource(constructionType.getResource().asPrismObject()); + if (constructionType.getResourceRef() != null) { + PrismObject resource = constructionType.getResourceRef().asReferenceValue().getObject(); + if (resource != null) { + constructionValueWrapper.setResource(resource); + } return constructionValueWrapper; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/HeterogenousContainerWrapperFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/HeterogenousContainerWrapperFactory.java index fb3f37fe65d..8063c4a5df1 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/HeterogenousContainerWrapperFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/HeterogenousContainerWrapperFactory.java @@ -22,7 +22,6 @@ import javax.annotation.PostConstruct; import javax.xml.namespace.QName; -import org.slf4j.spi.LocationAwareLogger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -34,8 +33,6 @@ import com.evolveum.midpoint.gui.impl.prism.PrismContainerValueWrapper; import com.evolveum.midpoint.gui.impl.prism.PrismContainerValueWrapperImpl; import com.evolveum.midpoint.gui.impl.prism.PrismContainerWrapperImpl; -import com.evolveum.midpoint.gui.impl.prism.PrismPropertyPanel; -import com.evolveum.midpoint.gui.impl.prism.PrismValueWrapper; import com.evolveum.midpoint.prism.Containerable; import com.evolveum.midpoint.prism.Item; import com.evolveum.midpoint.prism.ItemDefinition; @@ -47,13 +44,6 @@ import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.web.component.prism.ValueStatus; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ExclusionPolicyConstraintType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.HasAssignmentPolicyConstraintType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.LocalizableMessageTemplateType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.PolicyConstraintEnforcementType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.PolicyConstraintPresentationType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.PolicyConstraintsType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.StatePolicyConstraintType; /** * @author katka diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemWrapperImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemWrapperImpl.java index d866832bd7f..657b4c6d3b7 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemWrapperImpl.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemWrapperImpl.java @@ -691,6 +691,11 @@ public A getAnnotation(QName qname) { public void setAnnotation(QName qname, A value) { getItemDefinition().setAnnotation(qname, value); } + + @Override + public List getSchemaMigrations() { + return getItemDefinition().getSchemaMigrations(); + } @Override public void accept(Visitor visitor) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java index 57e5be7054c..5e19044c675 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 Evolveum + * Copyright (c) 2010-2019 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,28 +16,28 @@ package com.evolveum.midpoint.web.application; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Consumer; + +import org.apache.commons.lang3.StringUtils; +import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder; + import com.evolveum.midpoint.security.api.AuthorizationConstants; import com.evolveum.midpoint.util.ClassPathUtil; import com.evolveum.midpoint.util.DebugDumpable; import com.evolveum.midpoint.util.DebugUtil; import com.evolveum.midpoint.util.DisplayableValue; -import com.evolveum.midpoint.util.logging.LoggingUtils; +import com.evolveum.midpoint.util.exception.SystemException; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.web.security.MidPointApplication; import com.evolveum.midpoint.web.util.ExactMatchMountedMapper; -import com.evolveum.midpoint.xml.ns._public.gui.admin_1.DescriptorType; -import com.evolveum.midpoint.xml.ns._public.gui.admin_1.ObjectFactory; -import org.apache.commons.lang3.StringUtils; -import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.Unmarshaller; -import java.io.InputStream; -import java.util.*; -import java.util.function.Consumer; /** * @author lazyman @@ -46,13 +46,33 @@ public final class DescriptorLoader implements DebugDumpable { private static final Trace LOGGER = TraceManager.getTrace(DescriptorLoader.class); + private static final String[] PACKAGES_TO_SCAN = { + "com.evolveum.midpoint.web.page", + "com.evolveum.midpoint.web.page.admin.home", + "com.evolveum.midpoint.web.page.admin.users", + "com.evolveum.midpoint.web.page.admin.services", + "com.evolveum.midpoint.web.page.admin.roles", + "com.evolveum.midpoint.web.page.admin.resources", + "com.evolveum.midpoint.web.page.admin.resources.content", + "com.evolveum.midpoint.web.page.admin.workflow", + "com.evolveum.midpoint.web.page.admin.server", + "com.evolveum.midpoint.web.page.admin.reports", + "com.evolveum.midpoint.web.page.admin.configuration", + "com.evolveum.midpoint.web.page.admin.certification", + "com.evolveum.midpoint.web.page.admin.valuePolicy", + "com.evolveum.midpoint.web.page.admin.cases", + "com.evolveum.midpoint.web.page.admin.archetype", + "com.evolveum.midpoint.web.page.login", + "com.evolveum.midpoint.web.page.error", + "com.evolveum.midpoint.web.page.forgetpassword", + "com.evolveum.midpoint.web.page.self", + "com.evolveum.midpoint.web.component.prism.show" + }; + private static Map[]> actions = new HashMap<>(); private static List permitAllUrls = new ArrayList<>(); private static Map urlClassMap = new HashMap<>(); - private String baseFileName = "/descriptor.xml"; - private String customFileName = "/descriptor.xml"; - public static Map[]> getActions() { return actions; } @@ -61,22 +81,6 @@ public static Map getUrlClassMap() { return urlClassMap; } - public String getBaseFileName() { - return baseFileName; - } - - public void setBaseFileName(String baseFileName) { - this.baseFileName = baseFileName; - } - - public String getCustomFileName() { - return customFileName; - } - - public void setCustomFileName(String customFileName) { - this.customFileName = customFileName; - } - public static Collection getPermitAllUrls() { return permitAllUrls; } @@ -84,42 +88,25 @@ public static Collection getPermitAllUrls() { public void loadData(MidPointApplication application) { LOGGER.debug("Loading data from descriptor files."); - try (InputStream baseInput = DescriptorLoader.class.getResourceAsStream(baseFileName); - InputStream customInput = DescriptorLoader.class.getResourceAsStream(customFileName)) { - if (baseInput == null) { - LOGGER.error("Couldn't find " + baseFileName + " file, can't load application menu and other stuff."); - } - - JAXBContext context = JAXBContext.newInstance(ObjectFactory.class); - Unmarshaller unmarshaller = context.createUnmarshaller(); - JAXBElement element = (JAXBElement) unmarshaller.unmarshal(baseInput); - DescriptorType descriptor = element.getValue(); + try { + scanPackagesForPages(application); + + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("loaded:\n{}", debugDump(1)); + } + } catch (InstantiationException | IllegalAccessException e) { + LOGGER.error("Error scanning packages for pages: {}", e.getMessage(), e); + throw new SystemException("Error scanning packages for pages: "+e.getMessage(), e); + } - LOGGER.debug("Loading menu bar from " + baseFileName + " ."); - DescriptorType customDescriptor = null; - if (customInput != null) { - element = (JAXBElement) unmarshaller.unmarshal(customInput); - customDescriptor = element.getValue(); - } - - scanPackagesForPages(descriptor.getPackagesToScan(), application); - if (customDescriptor != null) { - scanPackagesForPages(customDescriptor.getPackagesToScan(), application); - } - - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("loaded:\n{}", debugDump(1)); - } + - } catch (Exception ex) { - LoggingUtils.logUnexpectedException(LOGGER, "Couldn't process application descriptor", ex); - } } - private void scanPackagesForPages(List packages, MidPointApplication application) + private void scanPackagesForPages(MidPointApplication application) throws InstantiationException, IllegalAccessException { - for (String pac : packages) { + for (String pac : PACKAGES_TO_SCAN) { LOGGER.debug("Scanning package package {} for page annotations", new Object[]{pac}); Set classes = ClassPathUtil.listClasses(pac); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java index 4b50e5ed67f..851dba5374d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2018 Evolveum + * Copyright (c) 2010-2019 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -115,8 +115,7 @@ public class SearchFactory { ItemPath.create(ShadowType.F_DEAD), ItemPath.create(ShadowType.F_INTENT), ItemPath.create(ShadowType.F_EXISTS), - ItemPath.create(ShadowType.F_SYNCHRONIZATION_SITUATION), - ItemPath.create(ShadowType.F_FAILED_OPERATION_TYPE) + ItemPath.create(ShadowType.F_SYNCHRONIZATION_SITUATION) )); SEARCHABLE_OBJECTS.put(TaskType.class, Arrays.asList( ItemPath.create(TaskType.F_TASK_IDENTIFIER), diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java index 123401a9466..6d4077774ae 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java @@ -84,8 +84,9 @@ * @author shood */ public class SchemaHandlingStep extends WizardStep { + private static final long serialVersionUID = 1L; - private static final Trace LOGGER = TraceManager.getTrace(SchemaHandlingStep.class); + private static final Trace LOGGER = TraceManager.getTrace(SchemaHandlingStep.class); private static final String DOT_CLASS = SchemaHandlingStep.class.getName() + "."; private static final String OPERATION_SAVE_SCHEMA_HANDLING = DOT_CLASS + "saveSchemaHandling"; @@ -1037,9 +1038,6 @@ private void removeEmptyContainers(@NotNull PrismObject resourcePr // we know that we lose description for empty filters ... but such filters (description + no clause) cause problems in prisms protectedObject.setFilter(null); } - if (protectedObject.getName() != null || protectedObject.getUid() != null || protectedObject.getFilter() != null) { - newProtectedList.add(protectedObject); - } } replace(objectType.getProtected(), newProtectedList); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java index 4bca3679a06..af9eff47b28 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 Evolveum + * Copyright (c) 2010-2019 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -686,13 +686,6 @@ private void reactionEditPerformed(AjaxRequestTarget target, SynchronizationReac WebMarkupContainer newContainer = new SynchronizationReactionEditor(ID_THIRD_ROW_CONTAINER, new Model<>(reaction), this, parentPage); getThirdRowContainer().replaceWith(newContainer); - for (SynchronizationActionType action : reaction.getAction()) { - if (action.getRef() != null) { - warn(getString("SynchronizationStep.message.unsupportedActionFormat")); - break; - } - } - resetSelections(target); syncDtoModel.getObject().setSelectedReaction(reaction); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java index cfafa3b8e3e..d85bb14f6b7 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java @@ -98,15 +98,6 @@ public String getObject() { StringBuilder sb = new StringBuilder(); ResourceObjectPatternType account = item.getModelObject(); sb.append("#").append(item.getIndex()+1).append(" - "); - - if (account.getUid() != null) { - sb.append(account.getUid()).append(":"); - } - - if (account.getName() != null) { - sb.append(account.getName()); - } - return sb.toString(); } }); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseDto.java index ee6bcd225c2..23578cc9139 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseDto.java @@ -114,10 +114,6 @@ public String getOutcome() { return caseInstance.getOutcome(); } - public ObjectDeltaType getObjectChange() { - return caseInstance.getObjectChange(); - } - public XMLGregorianCalendar getOpenTimestamp() { if (caseInstance.getMetadata() != null) { return caseInstance.getMetadata().getCreateTimestamp(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java index 23c4b4965b8..568320a51d6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 Evolveum + * Copyright (c) 2010-2019 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -631,41 +631,6 @@ public void onClick(AjaxRequestTarget target, IModel> }; columns.add(ownerColumn); - columns.add(new LinkColumn>( - createStringResource("PageAccounts.accounts.result")) { - private static final long serialVersionUID = 1L; - - @Override - protected IModel createLinkModel(final IModel> rowModel) { - return new IModel() { - private static final long serialVersionUID = 1L; - - @Override - public String getObject() { - return getResultLabel(rowModel); - } - }; - } - - @Override - public IModel getDataModel(IModel> rowModel) { - return Model.of(getResultLabel(rowModel)); - } - - @Override - public void onClick(AjaxRequestTarget target, IModel> rowModel) { - OperationResultType resultType = getResult(rowModel); - OperationResult result = OperationResult.createOperationResult(resultType); - - OperationResultPanel body = new OperationResultPanel( - ResourceContentPanel.this.getPageBase().getMainPopupBodyId(), - new Model<>(OpResult.getOpResult(pageBase, result)), getPage()); - body.setOutputMarkupId(true); - ResourceContentPanel.this.getPageBase().showMainPopup(body, target); - - } - }); - columns.add(new AbstractColumn, String>( createStringResource("PageAccounts.accounts.pendingOperations")) { @@ -680,34 +645,6 @@ public void populateItem(Item>> cellIt return columns; } - private OperationResultType getResult(IModel> model) { - ShadowType shadow = getShadow(model); - if (shadow == null) { - return null; - } - OperationResultType result = shadow.getResult(); - if (result == null) { - return null; - } - return result; - } - - private String getResultLabel(IModel> model) { - - OperationResultType result = getResult(model); - if (result == null) { - return ""; - } - - StringBuilder b = new StringBuilder( - createStringResource("FailedOperationTypeType." + getShadow(model).getFailedOperationType()) - .getObject()); - b.append(":"); - b.append(createStringResource("OperationResultStatusType." + result.getStatus()).getObject()); - - return b.toString(); - } - private ShadowType getShadow(IModel> model) { if (model == null || model.getObject() == null || model.getObject().getValue() == null) { return null; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyPanel.html index 29749faee10..cd50314e7e9 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyPanel.html @@ -1,5 +1,5 @@ - - - - com.evolveum.midpoint.web.page - com.evolveum.midpoint.web.page.admin.home - com.evolveum.midpoint.web.page.admin.users - com.evolveum.midpoint.web.page.admin.services - com.evolveum.midpoint.web.page.admin.roles - com.evolveum.midpoint.web.page.admin.resources - com.evolveum.midpoint.web.page.admin.resources.content - com.evolveum.midpoint.web.page.admin.workflow - com.evolveum.midpoint.web.page.admin.server - com.evolveum.midpoint.web.page.admin.reports - com.evolveum.midpoint.web.page.admin.configuration - com.evolveum.midpoint.web.page.admin.certification - com.evolveum.midpoint.web.page.admin.valuePolicy - com.evolveum.midpoint.web.page.admin.cases - com.evolveum.midpoint.web.page.admin.archetype - com.evolveum.midpoint.web.page.login - com.evolveum.midpoint.web.page.error - com.evolveum.midpoint.web.page.forgetpassword - com.evolveum.midpoint.web.page.self - com.evolveum.midpoint.web.component.prism.show - diff --git a/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java b/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java index caf9a7b65af..a39cd91a829 100644 --- a/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java +++ b/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Evolveum + * Copyright (c) 2016-2019 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -112,7 +112,6 @@ public class TestIntegrationObjectWrapperFactory extends AbstractInitializedGuiI OrgType.F_AUTHORIZATION, // OrgType.F_EXCLUSION, OrgType.F_CONDITION, - OrgType.F_POLICY_CONSTRAINTS, OrgType.F_ADMIN_GUI_CONFIGURATION, OrgType.F_DATA_PROTECTION, OrgType.F_AUTOASSIGN); diff --git a/gui/admin-gui/src/test/resources/common/resource-dummy.xml b/gui/admin-gui/src/test/resources/common/resource-dummy.xml index 4b540059df9..c883aa2da35 100644 --- a/gui/admin-gui/src/test/resources/common/resource-dummy.xml +++ b/gui/admin-gui/src/test/resources/common/resource-dummy.xml @@ -107,8 +107,8 @@ weak + true @@ -270,11 +270,21 @@ - daviejones - - - calypso - + + + attributes/name + daviejones + + + + + + + attributes/name + calypso + + + diff --git a/testing/sanity/src/test/resources/repo/resource-dummy.xml b/testing/sanity/src/test/resources/repo/resource-dummy.xml index 1e60e7082ff..851c264cb9b 100644 --- a/testing/sanity/src/test/resources/repo/resource-dummy.xml +++ b/testing/sanity/src/test/resources/repo/resource-dummy.xml @@ -1,6 +1,6 @@ + + + + + + + diff --git a/testing/sanity/src/test/resources/request/account-angelika.xml b/testing/sanity/src/test/resources/request/account-angelika.xml index 5dc70f2dd68..6fbef1db52c 100644 --- a/testing/sanity/src/test/resources/request/account-angelika.xml +++ b/testing/sanity/src/test/resources/request/account-angelika.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> -Angelika Marley - +