Come XML cleanup

Evolveum · Apr 17, 2014 · a9a3fc4 · a9a3fc4
1 parent 9cc9ab1
commit a9a3fc4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/model/model-intest/src/test/resources/common/resource-dummy-red.xml b/model/model-intest/src/test/resources/common/resource-dummy-red.xml
@@ -20,7 +20,6 @@
 
 <resource oid="10000000-0000-0000-0000-000000000104"
 		  xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-2a"
-          xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-2a"
           xmlns:t="http://prism.evolveum.com/xml/ns/public/types-2"
           xmlns:q="http://prism.evolveum.com/xml/ns/public/query-2"
           xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-2"
@@ -29,7 +28,7 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<name>Dummy Resource Red</name>
-	<connectorRef type="c:ConnectorType">
+	<connectorRef type="ConnectorType">
 		<filter>
 			<q:and>
 				<q:equal>
@@ -140,7 +139,7 @@
 				<inbound>
 					<strength>weak</strength>
 					<target>
-						<path>$c:user/c:name</path>
+						<path>$user/name</path>
 					</target>
 				</inbound>
 			</attribute>
@@ -192,7 +191,7 @@
 				<outbound>
 					<strength>strong</strength>
 					<source>
-						<path>$c:user/c:organizationalUnit</path>
+						<path>$user/organizationalUnit</path>
 					</source>
 				</outbound>
 			</attribute>

diff --git a/model/model-intest/src/test/resources/common/resource-dummy.xml b/model/model-intest/src/test/resources/common/resource-dummy.xml
@@ -17,7 +17,6 @@
 
 <resource oid="10000000-0000-0000-0000-000000000004"
 		  xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-2a"
-          xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-2a"
           xmlns:q="http://prism.evolveum.com/xml/ns/public/query-2"
           xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-2"
           xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance/10000000-0000-0000-0000-000000000004"
@@ -26,7 +25,7 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<name>Dummy Resource</name>
-	<connectorRef type="c:ConnectorType">
+	<connectorRef type="ConnectorType">
 		<filter>
 			<q:and>
 				<q:equal>
@@ -560,7 +559,7 @@ end
 			<enabled>true</enabled>
 			<correlation>
 				<q:equal>
-					<q:path>c:name</q:path>
+					<q:path>name</q:path>
 					<valueExpression>
 						<path>declare namespace icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-2";
                             $account/attributes/icfs:name</path>

diff --git a/model/model-intest/src/test/resources/common/role-judge.xml b/model/model-intest/src/test/resources/common/role-judge.xml
@@ -15,13 +15,12 @@
   -->
 <role oid="12345111-1111-2222-1111-121212111111"
         xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-2a"
-        xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-2a"
         xmlns:t="http://prism.evolveum.com/xml/ns/public/types-2"
         xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance/10000000-0000-0000-0000-000000000004">
     <name>Judge</name>    
     <inducement id="1111">
     	<construction>
-    		<resourceRef oid="10000000-0000-0000-0000-000000000004" type="c:ResourceType"/>
+    		<resourceRef oid="10000000-0000-0000-0000-000000000004" type="ResourceType"/>
     		<kind>account</kind>
     		<attribute>
                 <ref>ri:title</ref>
@@ -35,7 +34,7 @@
     </inducement>
     <exclusion>
     	<description>A judge cannot be a pirate at the same time. At least not openly.</description>
-    	<targetRef oid="12345678-d34d-b33f-f00d-555555556666" type="c:RoleType"/>
+    	<targetRef oid="12345678-d34d-b33f-f00d-555555556666" type="RoleType"/>
     	<policy>enforce</policy>
     </exclusion>
 </role>
diff --git a/model/model-intest/src/test/resources/logback-test.xml b/model/model-intest/src/test/resources/logback-test.xml
@@ -41,7 +41,7 @@
     <!-- "TRACE" is just too much info, "DEBUG" should be enough for the following talkative components ... 
          if any of the following is set to "TRACE" then it was changed by mistake and should be changed back -->
 	<logger name="com.evolveum.midpoint.model.lens.projector" level="DEBUG" />
-	<logger name="com.evolveum.midpoint.model.lens.projector.Projector" level="DEBUG" />
+	<logger name="com.evolveum.midpoint.model.lens.projector.Projector" level="TRACE" />
 	<logger name="com.evolveum.midpoint.model.lens" level="DEBUG" />
 	<logger name="com.evolveum.midpoint.model.lens.Clockwork" level="DEBUG" />
 	<logger name="com.evolveum.midpoint.model.lens.ChangeExecutor" level="DEBUG" />
@@ -62,7 +62,7 @@
 	<logger name="com.evolveum.midpoint.common.monitor" level="DEBUG" />
 	<logger name="com.evolveum.midpoint.model.controller.SystemConfigurationHandler" level="DEBUG" />
     <logger name="com.evolveum.midpoint.notifications" level="DEBUG" />
-    <logger name="com.evolveum.midpoint.security" level="TRACE" />
+    <logger name="com.evolveum.midpoint.security" level="DEBUG" />
     <logger name="com.evolveum.midpoint.model.lens.projector.FocusConstraintsChecker" level="DEBUG" />
     <logger name="com.evolveum.midpoint.model.lens.projector.FocusPolicyProcessor" level="DEBUG" />
     <logger name="com.evolveum.midpoint.model.sync.FocusValidityScannerTaskHandler" level="DEBUG" />