Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improved handling of archetypeRef during imports (MID-5909)
- Loading branch information
Showing
8 changed files
with
191 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
model/model-intest/src/test/resources/archetypes/user-fraudster.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
~ Copyright (c) 2019 Evolveum and contributors | ||
~ | ||
~ This work is dual-licensed under the Apache License 2.0 | ||
~ and European Union Public License. See LICENSE file for details. | ||
--> | ||
|
||
<user oid="99b36382-078e-11ea-b9a9-b393552ec165" | ||
xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3' | ||
xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3' | ||
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:piracy='http://midpoint.evolveum.com/xml/ns/samples/piracy'> | ||
<name>fraudster</name> | ||
<assignment> | ||
<targetRef oid="3911cac2-78a6-11e9-8b5e-4b5bdb0c81d5" type="ArchetypeType"/> <!-- Contractor --> | ||
</assignment> | ||
<!-- Those do not match with assignment: MID-5909 --> | ||
<archetypeRef oid="a8df34a8-f6f0-11e8-b98e-eb03652d943f"/> | ||
<roleMembershipRef oid="a8df34a8-f6f0-11e8-b98e-eb03652d943f"/> | ||
<fullName>Fraudster</fullName> | ||
</user> |
23 changes: 23 additions & 0 deletions
23
model/model-intest/src/test/resources/archetypes/user-self-made-man.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
~ Copyright (c) 2019 Evolveum and contributors | ||
~ | ||
~ This work is dual-licensed under the Apache License 2.0 | ||
~ and European Union Public License. See LICENSE file for details. | ||
--> | ||
|
||
<user oid="065c4592-0787-11ea-af06-f7eae18b6b4a" | ||
xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3' | ||
xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3' | ||
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:piracy='http://midpoint.evolveum.com/xml/ns/samples/piracy'> | ||
<name>selfmademan</name> | ||
<assignment> | ||
<targetRef oid="3911cac2-78a6-11e9-8b5e-4b5bdb0c81d5" type="ArchetypeType"/> <!-- Contractor --> | ||
</assignment> | ||
<archetypeRef oid="3911cac2-78a6-11e9-8b5e-4b5bdb0c81d5"/> <!-- MID-5909 --> | ||
<roleMembershipRef oid="3911cac2-78a6-11e9-8b5e-4b5bdb0c81d5"/> <!-- MID-5909 --> | ||
<fullName>Self Made Man</fullName> | ||
</user> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters