More namespace changes

Evolveum · May 2, 2014 · 59cabb0 · 59cabb0
1 parent 52e01f1
commit 59cabb0
Show file tree

Hide file tree

Showing 93 changed files with 403 additions and 403 deletions.
diff --git a/gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml b/gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml
@@ -19,6 +19,6 @@
     <name>Superuser</name>
     <description>Role that gives user full authorization in MidPoint.</description>
     <authorization>
-        <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-2#all</action>
+        <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-3#all</action>
     </authorization>
 </role>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml b/gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
@@ -19,7 +19,7 @@
     <name>End user</name>
     <description>Role authorizing end users to log in, change their passwords and review assigned accounts.</description>
     <authorization>
-        <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-2#dashboard</action>
-        <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-2#myPasswords</action>
+        <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-3#dashboard</action>
+        <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-3#myPasswords</action>
     </authorization>
 </role>
diff --git a/infra/common/src/test/resources/refinery/resource-complex-deprecated.xml b/infra/common/src/test/resources/refinery/resource-complex-deprecated.xml
@@ -362,30 +362,30 @@
 		</correlation>
 		<reaction>
 			<situation>confirmed</situation>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#modifyUser" />
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#modifyUser" />
 		</reaction>
 		<reaction>
 			<situation>deleted</situation>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#unlinkAccount" />
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlinkAccount" />
 		</reaction>
 		<reaction>
 			<situation>missing</situation>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#addAccount" />
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addAccount" />
 		</reaction>
 		<reaction>
 			<situation>found</situation>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#linkAccount" />
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount" />
 		</reaction>
 		<reaction>
 			<situation>unassigned</situation>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#linkAccount" />
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount" />
 		</reaction>
 		<reaction>
 			<situation>unmatched</situation>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#addUser">
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addUser">
 				<userTemplateRef oid="10000000-0000-0000-0000-000000000002"/>
 			</action>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#linkAccount" />
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount" />
 		</reaction>
 	</synchronization>
 </object>
diff --git a/infra/common/src/test/resources/refinery/resource-complex.xml b/infra/common/src/test/resources/refinery/resource-complex.xml
@@ -409,30 +409,30 @@
 		</correlation>
 		<reaction>
 			<situation>confirmed</situation>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#modifyUser" />
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#modifyUser" />
 		</reaction>
 		<reaction>
 			<situation>deleted</situation>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#unlinkAccount" />
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlinkAccount" />
 		</reaction>
 		<reaction>
 			<situation>missing</situation>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#addAccount" />
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addAccount" />
 		</reaction>
 		<reaction>
 			<situation>found</situation>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#linkAccount" />
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount" />
 		</reaction>
 		<reaction>
 			<situation>unassigned</situation>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#linkAccount" />
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount" />
 		</reaction>
 		<reaction>
 			<situation>unmatched</situation>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#addUser">
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addUser">
 				<userTemplateRef oid="10000000-0000-0000-0000-000000000002"/>
 			</action>
-			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#linkAccount" />
+			<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount" />
 		</reaction>
 	</synchronization>
 </object>
diff --git a/infra/schema/src/test/resources/common/resource-opendj.xml b/infra/schema/src/test/resources/common/resource-opendj.xml
@@ -645,16 +645,16 @@ This is now the only account type that midPoint can work with. -->
 	        <reaction>
 	            <situation>deleted</situation>
 	            <action>
-	            	<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-2#unlinkAccount</handlerUri>
+	            	<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlinkAccount</handlerUri>
 	            </action>
 	        </reaction>
 	        <c:reaction>
 	            <c:situation>unlinked</c:situation>
-	            <c:action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#linkAccount"/>
+	            <c:action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount"/>
 	        </c:reaction>
 	        <c:reaction>
 	            <c:situation>unmatched</c:situation>
-	            <c:action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#addUser">
+	            <c:action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addUser">
 	                <!-- Reference to the User Template is here. If the user would be
 	             created as a result of this action, it will be created according
 	             to this template. -->

diff --git a/model/model-impl/src/main/resources/ctx-model.xml b/model/model-impl/src/main/resources/ctx-model.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2014 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -234,64 +234,64 @@
     <bean id="actionManager" class="com.evolveum.midpoint.model.sync.ActionManagerImpl">
         <property name="actionMapping">
             <map>
-            	<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#link">
+            	<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#link">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.LinkAction</value>
                 </entry>
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#addFocus">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.AddFocusAction</value>
                 </entry>
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#deleteFocus">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteFocus">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.DeleteFocusAction</value>
                 </entry>
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#unlink">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlink">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.UnlinkAction</value>
                 </entry>
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#deleteShadow">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteShadow">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.DeleteShadowAction</value>
                 </entry>
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#inactivateShadow">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#inactivateShadow">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.InactivateShadowAction</value>
                 </entry>
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#inactivateFocus">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#inactivateFocus">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.InactivateFocusAction</value>
                 </entry>
 
 
 				<!-- DEPRECATED. for compatibility only. -->
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#linkAccount">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.LinkAction</value>
                 </entry>
-            	<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#modifyUser">
+            	<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#modifyUser">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.EmptyAction</value>
                 </entry>
-            	<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#synchronize">
+            	<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#synchronize">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.EmptyAction</value>
                 </entry>
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#addUser">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addUser">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.AddFocusAction</value>
                 </entry>
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#deleteUser">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteUser">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.DeleteFocusAction</value>
                 </entry>
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#unlinkAccount">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlinkAccount">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.UnlinkAction</value>
                 </entry>
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#deleteAccount">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteAccount">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.DeleteShadowAction</value>
                 </entry>
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#disableAccount">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#disableAccount">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.InactivateShadowAction</value>
                 </entry>
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#disableUser">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#disableUser">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.InactivateFocusAction</value>
                 </entry>
 
                 <!-- TODO -->
                 <!-- 
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#enableUser">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#enableUser">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.EnableUserAction</value>
                 </entry>
-                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-2#addAccount">
+                <entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addAccount">
                     <value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.AddAccountAction</value>
                 </entry>
                  -->

diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/ActionManagerImplTest.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/ActionManagerImplTest.java
@@ -54,7 +54,7 @@ public void getctionInstanceEmptyUri() {
 	@Test
 	public void getActionInstanceNullParameters() {
 		Action filter = manager
-				.getActionInstance("http://midpoint.evolveum.com/xml/ns/public/model/action-2#addUser");
+				.getActionInstance("http://midpoint.evolveum.com/xml/ns/public/model/action-3#addUser");
 		assertNotNull(filter);
 	}
 

diff --git a/model/model-impl/src/test/resources/common/resource-dummy-deprecated.xml b/model/model-impl/src/test/resources/common/resource-dummy-deprecated.xml
@@ -396,20 +396,20 @@ return tmpSuffix
 			</correlation>
 			<reaction>
 	            <situation>linked</situation>
-	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#modifyUser"/>
+	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#modifyUser"/>
 	        </reaction>
 	        <reaction>
 	            <situation>deleted</situation>
-	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#unlinkAccount"/>
+	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlinkAccount"/>
 	        </reaction>
 	        <reaction>
 	            <situation>unlinked</situation>
-	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#linkAccount"/>
+	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount"/>
 	        </reaction>
 	        <reaction>
 	            <situation>unmatched</situation>
 <!-- 	            <channel>http://midpoint.evolveum.com/xml/ns/public/provisioning/channels-3#import</channel> -->
-	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#addUser"/>
+	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addUser"/>
 	        </reaction>
         </objectSynchronization>
 
@@ -428,19 +428,19 @@ return tmpSuffix
 			</correlation>
 			<reaction>
 	            <situation>linked</situation>
-	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#modifyUser"/>
+	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#modifyUser"/>
 	        </reaction>
 	        <reaction>
 	            <situation>deleted</situation>
-	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#unlinkAccount"/>
+	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlinkAccount"/>
 	        </reaction>
 	        <reaction>
 	            <situation>unlinked</situation>
-	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#linkAccount"/>
+	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount"/>
 	        </reaction>
 	        <reaction>
 	            <situation>unmatched</situation>
-	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#addUser"/>
+	            <action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addUser"/>
 	        </reaction>
         </objectSynchronization>
 	</synchronization>

diff --git a/model/model-impl/src/test/resources/common/resource-dummy.xml b/model/model-impl/src/test/resources/common/resource-dummy.xml
@@ -408,15 +408,15 @@ return tmpSuffix
 	            <situation>unlinked</situation>
 	            <synchronize>true</synchronize>
 	            <action>
-	             	<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-2#link</handlerUri>
+	             	<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#link</handlerUri>
              	</action>
 	        </reaction>
 	        <reaction>
 	            <situation>unmatched</situation>
 	            <synchronize>true</synchronize>
 <!-- 	        <channel>http://midpoint.evolveum.com/xml/ns/public/provisioning/channels-3#import</channel> -->
 	            <action>
-	            	<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-2#addFocus</handlerUri>
+	            	<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus</handlerUri>
 	            </action>
 	        </reaction>
         </objectSynchronization>
@@ -444,21 +444,21 @@ return tmpSuffix
 	            <situation>deleted</situation>
 	            <synchronize>true</synchronize>
 	            <action>
-	            	<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-2#unlink</handlerUri>
+	            	<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlink</handlerUri>
 	            </action>
 	        </reaction>
 	        <reaction>
 	            <situation>unlinked</situation>
 	            <synchronize>true</synchronize>
 	            <action>
-	            	<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-2#link</handlerUri>
+	            	<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#link</handlerUri>
 	            </action>
 	        </reaction>
 	        <reaction>
 	            <situation>unmatched</situation>
 	            <synchronize>true</synchronize>
 	            <action>
-	            	<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-2#addFocus</handlerUri>
+	            	<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus</handlerUri>
 	            </action>
 	        </reaction>
         </objectSynchronization>

diff --git a/model/model-impl/src/test/resources/common/role-superuser.xml b/model/model-impl/src/test/resources/common/role-superuser.xml
@@ -19,6 +19,6 @@
         xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
     <name>Superuser</name>    
     <authorization>
-    	<action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-2#all</action>
+    	<action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-3#all</action>
     </authorization>
 </role>
diff --git a/model/model-impl/src/test/resources/controller/modify/account.xml b/model/model-impl/src/test/resources/controller/modify/account.xml
@@ -379,32 +379,32 @@
 			</correlation>
 			<reaction>
 				<situation>confirmed</situation>
-				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#modifyUser" />
+				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#modifyUser" />
 			</reaction>
 			<reaction>
 				<situation>deleted</situation>
-				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#unlinkAccount" />
+				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlinkAccount" />
 			</reaction>
 			<reaction>
 				<situation>missing</situation>
-				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#addAccount" />
+				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addAccount" />
 			</reaction>
 			<reaction>
 				<situation>found</situation>
-				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#linkAccount" />
+				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount" />
 			</reaction>
 			<reaction>
 				<situation>unassigned</situation>
-				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#linkAccount" />
+				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount" />
 			</reaction>
 			<reaction>
 				<situation>unmatched</situation>
-				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#addUser">
+				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addUser">
 					<c:userTemplateRef oid="c0c010c0-d34d-b33f-f00d-777222222222" xmlns:idfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
 						xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instances/ef2bc95b-76e0-48e2-86d6-3d4f02d3e1a2"
 						xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:my="http://myself.me/schemas/whatever" />
 				</action>
-				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-2#linkAccount" />
+				<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount" />
 			</reaction>
 		</synchronization>
 	</resource>