Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'support-3.7' of https://github.com/Evolveum/midpoint in…
…to support-3.7
- Loading branch information
Showing
30 changed files
with
821 additions
and
74 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
61 changes: 61 additions & 0 deletions
61
infra/schema/src/test/resources/misc/role-remove-items.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,61 @@ | ||
| <!-- | ||
| ~ Copyright (c) 2010-2018 Evolveum | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| --> | ||
|
|
||
| <role xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" | ||
| xmlns:q="http://prism.evolveum.com/xml/ns/public/query-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:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" | ||
| xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" | ||
| xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns:my="http://example.com/xml/ns/mySchema" | ||
| oid="oid-1"> | ||
| <name>name-1</name> | ||
| <description>description-1</description> | ||
| <lifecycleState>active</lifecycleState> | ||
| <metadata> | ||
| <certifierComment>hello world</certifierComment> | ||
| </metadata> | ||
| <activation> | ||
| <administrativeStatus>enabled</administrativeStatus> | ||
| <effectiveStatus>enabled</effectiveStatus> | ||
| </activation> | ||
| <assignment id="1"> | ||
| <targetRef oid="role-approver-meta-role" relation="org:default" type="c:RoleType"/> | ||
| <activation> | ||
| <effectiveStatus>enabled</effectiveStatus> | ||
| </activation> | ||
| </assignment> | ||
| <assignment> | ||
| <targetRef oid="manager-approved-meta-role" relation="org:default" type="c:RoleType"/> | ||
| <activation> | ||
| <effectiveStatus>enabled</effectiveStatus> | ||
| </activation> | ||
| </assignment> | ||
| <assignment> | ||
| <targetRef oid="unassign-role-workflow-meta-role" relation="org:default" type="c:RoleType"/> | ||
| <activation> | ||
| <effectiveStatus>enabled</effectiveStatus> | ||
| </activation> | ||
| </assignment> | ||
| <assignment> | ||
| <targetRef oid="org-aplikacni-role" relation="org:default" type="c:OrgType"/> | ||
| <activation> | ||
| <effectiveStatus>enabled</effectiveStatus> | ||
| </activation> | ||
| </assignment> | ||
| <requestable>false</requestable> | ||
| <idempotence>conservative</idempotence> | ||
| </role> |
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
60 changes: 60 additions & 0 deletions
60
model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ContextMapKey.java
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,60 @@ | ||
| /* | ||
| * Copyright (c) 2010-2018 Evolveum | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.evolveum.midpoint.model.impl.integrity; | ||
|
|
||
| import javax.xml.namespace.QName; | ||
| import java.io.Serializable; | ||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * @author mederly | ||
| */ | ||
|
|
||
| class ContextMapKey implements Serializable { | ||
|
|
||
| final String resourceOid; | ||
| final QName objectClassName; | ||
|
|
||
| ContextMapKey(String resourceOid, QName objectClassName) { | ||
| this.resourceOid = resourceOid; | ||
| this.objectClassName = objectClassName; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) | ||
| return true; | ||
| if (!(o instanceof ContextMapKey)) | ||
| return false; | ||
| ContextMapKey that = (ContextMapKey) o; | ||
| return Objects.equals(resourceOid, that.resourceOid) && | ||
| Objects.equals(objectClassName, that.objectClassName); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(resourceOid, objectClassName); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "ContextMapKey{" + | ||
| "resourceOid='" + resourceOid + '\'' + | ||
| ", objectClassName=" + objectClassName + | ||
| '}'; | ||
| } | ||
| } |
Oops, something went wrong.