Merge branch 'master' of https://github.com/Evolveum/midpoint

infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

@@ -325,7 +325,7 @@
 							<li>archived: Inactive historical definition. It is no longer used.
 										It is maintained only for historical, auditing and
 										sentimental reasons.</li>
-							<li>failed: Unexpected error has occured during object lifecycle. Result
+							<li>failed: Unexpected error has occurred during object lifecycle. Result
 										of that event is that the object is rendered inactive.
 										The situation cannot be automatically remedied. Manual action
 										is needed.</li>

model/model-intest/src/test/resources/rbac/role-immutable-assign.xml

@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright (c) 2015-2016 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 oid="a6b10a7c-b57e-11e6-bcb3-1ba47cb07e2e"
+        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:piracy="http://midpoint.evolveum.com/xml/ns/samples/piracy">
+    <name>Immutable Assign</name>
+    <assignment>
+    	<!-- Untouchable metarole -->
+    	<targetRef oid="a80c9572-b57d-11e6-80a9-6fdae1dc39bc" type="RoleType"/>
+    </assignment>
+</role>