Merge remote-tracking branch 'origin/master' into closure

Evolveum · May 5, 2014 · 98d92e4 · 98d92e4
2 parents a94f45e + bde2064
commit 98d92e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/testing/story/src/test/resources/trafo/resource-dummy-ad.xml b/testing/story/src/test/resources/trafo/resource-dummy-ad.xml
@@ -1,6 +1,6 @@
 <?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.
@@ -85,8 +85,8 @@
 					<limitations>
 						<minOccurs>0</minOccurs>
 						<access>
-							<add>true</add>
 							<read>true</read>
+							<add>true</add>
 							<modify>true</modify>
 						</access>
 					</limitations>
@@ -175,8 +175,8 @@ else {
 
 					<limitations>
 						<access>
-							<add>true</add>
 							<read>true</read>
+							<add>true</add>
 							<modify>true</modify>
 						</access>
 					</limitations>
@@ -223,8 +223,8 @@ return null;
 
 					<limitations>
 						<access>
-							<add>true</add>
 							<read>true</read>
+							<add>true</add>
 							<modify>true</modify>
 						</access>
 					</limitations>

diff --git a/testing/story/src/test/resources/trafo/resource-dummy-mail.xml b/testing/story/src/test/resources/trafo/resource-dummy-mail.xml
@@ -1,6 +1,6 @@
 <?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.
@@ -78,8 +78,8 @@
                     <displayName>Name</displayName>
 					<limitations>
 						<access>
-							<add>true</add>
 							<read>true</read>
+							<add>true</add>
 							<modify>true</modify>
 						</access>
 					</limitations>
@@ -259,8 +259,8 @@ log.info('XXXXX got here, input = {}', input)
 		    <limitations>
 				<minOccurs>0</minOccurs>
 				<access>
-					<add>true</add>
 					<read>true</read>
+					<add>true</add>
 					<modify>false</modify>
 				</access>
 		    </limitations>