Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@katkav
katkav committed Sep 2, 2020
2 parents 385d5ae + a463426 commit d12148b
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 237 deletions.
137 changes: 61 additions & 76 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
View file
Expand Up @@ -149,8 +149,6 @@ private void registerBuiltinSchemas(SchemaRegistryImpl schemaRegistry) throws Sc
schemaRegistry.registerPrismDefaultSchemaResource("xml/ns/public/common/common-3.xsd", "c",
com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectFactory.class.getPackage()); // declared by default

schemaRegistry.registerPrismSchemaResource("xml/ns/public/common/extension-metadata-3.xsd", "meta-ext");

schemaRegistry.registerPrismSchemaResource("xml/ns/public/common/audit-3.xsd", "aud",
com.evolveum.midpoint.xml.ns._public.common.audit_3.ObjectFactory.class.getPackage());

Expand Down
2 changes: 0 additions & 2 deletions infra/schema/src/main/resources/META-INF/schemas-in-this-module.xml
View file
Expand Up @@ -47,8 +47,6 @@ Notes:
<system systemId="http://midpoint.evolveum.com/xml/ns/public/common/common-security-3" uri="../xml/ns/public/common/common-security-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/common/common-metadata-3" uri="../xml/ns/public/common/common-metadata-3.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/common/extension-metadata-3" uri="../xml/ns/public/common/extension-metadata-3.xsd" />

<!-- WSDLs -->
<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/model-3" uri="../xml/ns/public/model/model-3.wsdl" />
<public publicId="http://midpoint.evolveum.com/xml/ns/public/report/report-3" uri="../xml/ns/public/report/report-3.wsdl" />
Expand Down
42 changes: 0 additions & 42 deletions infra/schema/src/main/resources/xml/ns/public/common/extension-metadata-3.axiom
View file

This file was deleted.

93 changes: 0 additions & 93 deletions infra/schema/src/main/resources/xml/ns/public/common/extension-metadata-3.xsd
View file

This file was deleted.

6 changes: 6 additions & 0 deletions model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
View file
Expand Up @@ -250,36 +250,42 @@ public void test020ParsingMetadata() throws Exception {
.end()
.end()
.end()
.assertPropertyValuesEqual(LOA_PATH, 10)
.end()
.end()
.valueMetadata(UserType.F_GIVEN_NAME)
.assertHasDefinition()
.singleValue()
.display()
.assertPropertyValuesEqual(LOA_PATH, 7)
.end()
.end()
.valueMetadata(UserType.F_FAMILY_NAME)
.assertHasDefinition()
.singleValue()
.display()
.assertPropertyValuesEqual(LOA_PATH, 7)
.end()
.end()
.valueMetadata(UserType.F_FULL_NAME)
.assertHasDefinition()
.singleValue()
.display()
.assertPropertyValuesEqual(LOA_PATH, 5)
.end()
.end()
.valueMetadata(UserType.F_ORGANIZATIONAL_UNIT, ppv -> "Development".equals(PolyString.getOrig((PolyString) ppv.getRealValue())))
.assertHasDefinition()
.singleValue()
.display()
.assertPropertyValuesEqual(LOA_PATH, 7)
.end()
.end()
.valueMetadata(ItemPath.create(UserType.F_ASSIGNMENT, 111L))
.assertHasDefinition()
.singleValue()
.display()
.assertPropertyValuesEqual(LOA_PATH, 5)
.end()
.end()
.valueMetadata(ItemPath.create(UserType.F_ASSIGNMENT, 111L, AssignmentType.F_SUBTYPE), ppv -> "manual".equals(ppv.getRealValue()))
Expand Down
30 changes: 8 additions & 22 deletions model/model-intest/src/test/resources/metadata/user-alice.xml
View file
Expand Up @@ -10,7 +10,7 @@
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:m="http://midpoint.evolveum.com/xml/ns/public/common/extension-metadata-3"
xmlns:m="http://midpoint.evolveum.com/xml/ns/samples/metadata"
oid="9fc389be-5b47-4e9d-90b5-33fffd87b3ca">
<_metadata>
<process>
Expand All @@ -30,18 +30,14 @@
</source>
</transformation>
<c:extension>
<m:assurance>
<m:levelOfAssurance>http://example.com/identity/loa#official</m:levelOfAssurance>
</m:assurance>
<m:loa>10</m:loa>
</c:extension>
</_metadata>
</name>
<assignment id="111">
<_metadata>
<c:extension>
<m:assurance>
<m:levelOfAssurance>http://example.com/identity/loa#none</m:levelOfAssurance>
</m:assurance>
<m:loa>5</m:loa>
</c:extension>
<transformation>
<source>
Expand Down Expand Up @@ -97,9 +93,7 @@
</source>
</transformation>
<c:extension>
<m:assurance>
<m:levelOfAssurance>http://example.com/identity/loa#official</m:levelOfAssurance>
</m:assurance>
<m:loa>7</m:loa>
</c:extension>
</_metadata>
</givenName>
Expand All @@ -116,9 +110,7 @@
</source>
</transformation>
<c:extension>
<m:assurance>
<m:levelOfAssurance>http://example.com/identity/loa#official</m:levelOfAssurance>
</m:assurance>
<m:loa>7</m:loa>
</c:extension>
</_metadata>
</familyName>
Expand All @@ -135,9 +127,7 @@
</source>
</transformation>
<c:extension>
<m:assurance>
<m:levelOfAssurance>http://example.com/identity/loa#official</m:levelOfAssurance>
</m:assurance>
<m:loa>5</m:loa>
</c:extension>
</_metadata>
</honorificSuffix>
Expand Down Expand Up @@ -173,9 +163,7 @@
</transformer>
</transformation>
<c:extension>
<m:assurance>
<m:levelOfAssurance>http://example.com/identity/loa#official</m:levelOfAssurance>
</m:assurance>
<m:loa>5</m:loa>
</c:extension>
</_metadata>
</fullName>
Expand All @@ -192,9 +180,7 @@
</source>
</transformation>
<c:extension>
<m:assurance>
<m:levelOfAssurance>http://example.com/identity/loa#absolute</m:levelOfAssurance>
</m:assurance>
<m:loa>7</m:loa>
</c:extension>
</_metadata>
</organizationalUnit>
Expand Down

0 comments on commit d12148b

Please sign in to comment.