From 368db185253212dd049f06a57be5274609576a79 Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Thu, 27 Oct 2016 19:52:22 +0200
Subject: [PATCH] Fixed c:ProtectedStringType -> t:ProtectedStringType

---
 .../src/test/resources/common/user-jack-repo.xml       |  2 +-
 .../test/resources/diff/resource-after-ns-change.xml   |  3 ++-
 .../schema/src/test/resources/diff/resource-before.xml |  3 ++-
 .../src/test/resources/common/connector-dummy.xml      |  4 ++--
 .../src/test/resources/common/connector-ldap.xml       |  5 +++--
 .../src/test/resources/common/connector-dummy.xml      |  4 ++--
 .../src/test/resources/model-context.obsolete.xml      | 10 +++++-----
 .../model-contexts/context-dummy-resource.xml          |  2 +-
 .../workflow-impl/src/test/resources/task.obsolete.xml | 10 +++++-----
 .../src/test/resources/modify/user-with-extension.xml  |  2 +-
 samples/objects/connector-dbtable.xml                  |  4 ++--
 11 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/gui/admin-gui/src/test/resources/common/user-jack-repo.xml b/gui/admin-gui/src/test/resources/common/user-jack-repo.xml
index e7b3f162c3b..f4920887da6 100644
--- a/gui/admin-gui/src/test/resources/common/user-jack-repo.xml
+++ b/gui/admin-gui/src/test/resources/common/user-jack-repo.xml
@@ -100,7 +100,7 @@
     </locality>
     <credentials>
         <password>
-            <value xsi:type="c:ProtectedStringType">
+            <value xsi:type="t:ProtectedStringType">
                 <enc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
                     <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
                     <ds:KeyInfo>
diff --git a/infra/schema/src/test/resources/diff/resource-after-ns-change.xml b/infra/schema/src/test/resources/diff/resource-after-ns-change.xml
index 855a2642eb5..24759056a7a 100644
--- a/infra/schema/src/test/resources/diff/resource-after-ns-change.xml
+++ b/infra/schema/src/test/resources/diff/resource-after-ns-change.xml
@@ -20,6 +20,7 @@
 
 <resource 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:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance/ef2bc95b-76e0-59e2-86d6-3d4f02d3ffff"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           oid="ef2bc95b-76e0-59e2-86d6-3d4f02d3ffff"
@@ -107,7 +108,7 @@
 							<xsd:element maxOccurs="unbounded" minOccurs="0" name="ou" type="xsd:string" />
 							<!-- Moved the c prefix declaration here -->
 							<xsd:element xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" name="fakePassword"
-										type="c:ProtectedStringType" minOccurs="0" maxOccurs="unbounded">
+										type="t:ProtectedStringType" minOccurs="0" maxOccurs="unbounded">
 								<xsd:annotation>
 									<xsd:documentation>
 										This is fake. It is only for namespace testing and similar wild things.
diff --git a/infra/schema/src/test/resources/diff/resource-before.xml b/infra/schema/src/test/resources/diff/resource-before.xml
index 7822d99c7d3..ce85b19cb47 100644
--- a/infra/schema/src/test/resources/diff/resource-before.xml
+++ b/infra/schema/src/test/resources/diff/resource-before.xml
@@ -17,6 +17,7 @@
 
 <resource 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:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance/ef2bc95b-76e0-59e2-86d6-3d4f02d3ffff"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           oid="ef2bc95b-76e0-59e2-86d6-3d4f02d3ffff"
@@ -99,7 +100,7 @@
 							<xsd:element ref="icfs:uid" />
 							<xsd:element maxOccurs="unbounded" minOccurs="0" name="businessCategory" type="xsd:string" />
 							<xsd:element maxOccurs="unbounded" minOccurs="0" name="ou" type="xsd:string" />
-							<xsd:element name="fakePassword" type="c:ProtectedStringType" minOccurs="0" maxOccurs="unbounded">
+							<xsd:element name="fakePassword" type="t:ProtectedStringType" minOccurs="0" maxOccurs="unbounded">
 								<xsd:annotation>
 									<xsd:documentation>
 										This is fake. It is only for namespace testing and similar wild things.
diff --git a/model/model-intest/src/test/resources/common/connector-dummy.xml b/model/model-intest/src/test/resources/common/connector-dummy.xml
index 25e71f280ee..e3bea282790 100644
--- a/model/model-intest/src/test/resources/common/connector-dummy.xml
+++ b/model/model-intest/src/test/resources/common/connector-dummy.xml
@@ -19,7 +19,7 @@
 	xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
 	xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
 	xmlns:ns2="http://www.w3.org/2001/04/xmlenc#"
-	
+           xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
 	xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
 	
    <c:name>ICF com.evolveum.icf.dummy.connector.DummyConnector</c:name>
@@ -74,7 +74,7 @@
                         </xsd:appinfo>
                      </xsd:annotation>
                   </xsd:element>
-                  <xsd:element minOccurs="0" name="uselessGuardedString" type="c:ProtectedStringType">
+                  <xsd:element minOccurs="0" name="uselessGuardedString" type="t:ProtectedStringType">
                      <xsd:annotation>
                         <xsd:appinfo>
                            <a:displayName>UI_INSTANCE_USELESS_GUARDED_STRING</a:displayName>
diff --git a/model/model-intest/src/test/resources/common/connector-ldap.xml b/model/model-intest/src/test/resources/common/connector-ldap.xml
index 95952f4fc5f..59637581de8 100644
--- a/model/model-intest/src/test/resources/common/connector-ldap.xml
+++ b/model/model-intest/src/test/resources/common/connector-ldap.xml
@@ -16,6 +16,7 @@
   -->
 
 <c:connector xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+             xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
              oid="14e63399-8869-4787-9369-93f9d1311671">
    <c:name>ICF org.identityconnectors.ldap.LdapConnector</c:name>
    <c:namespace>http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/com.evolveum.polygon.connector-ldap/org.identityconnectors.ldap.LdapConnector</c:namespace>
@@ -77,7 +78,7 @@
                         </xsd:appinfo>
                      </xsd:annotation>
                   </xsd:element>
-                  <xsd:element minOccurs="0" name="passwordDecryptionKey" type="c:ProtectedByteArrayType">
+                  <xsd:element minOccurs="0" name="passwordDecryptionKey" type="t:ProtectedByteArrayType">
                      <xsd:annotation>
                         <xsd:appinfo>
                            <a:displayName>Password Decryption Key</a:displayName>
@@ -85,7 +86,7 @@
                         </xsd:appinfo>
                      </xsd:annotation>
                   </xsd:element>
-                  <xsd:element minOccurs="0" name="credentials" type="c:ProtectedStringType">
+                  <xsd:element minOccurs="0" name="credentials" type="t:ProtectedStringType">
                      <xsd:annotation>
                         <xsd:appinfo>
                            <a:displayName>Password</a:displayName>
diff --git a/model/workflow-impl/src/test/resources/common/connector-dummy.xml b/model/workflow-impl/src/test/resources/common/connector-dummy.xml
index 02f95f41859..c3830460117 100644
--- a/model/workflow-impl/src/test/resources/common/connector-dummy.xml
+++ b/model/workflow-impl/src/test/resources/common/connector-dummy.xml
@@ -19,7 +19,7 @@
 	xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
 	xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
 	xmlns:ns2="http://www.w3.org/2001/04/xmlenc#"
-	
+           xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
 	xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
 	
    <c:name>ICF com.evolveum.icf.dummy.connector.DummyConnector</c:name>
@@ -66,7 +66,7 @@
                         </xsd:appinfo>
                      </xsd:annotation>
                   </xsd:element>
-                  <xsd:element minOccurs="0" name="uselessGuardedString" type="c:ProtectedStringType">
+                  <xsd:element minOccurs="0" name="uselessGuardedString" type="t:ProtectedStringType">
                      <xsd:annotation>
                         <xsd:appinfo>
                            <a:displayName>UI_INSTANCE_USELESS_GUARDED_STRING</a:displayName>
diff --git a/model/workflow-impl/src/test/resources/model-context.obsolete.xml b/model/workflow-impl/src/test/resources/model-context.obsolete.xml
index 6cbff767fea..80a770dd882 100644
--- a/model/workflow-impl/src/test/resources/model-context.obsolete.xml
+++ b/model/workflow-impl/src/test/resources/model-context.obsolete.xml
@@ -121,7 +121,7 @@
                                  xmlns:wfpis="http://midpoint.evolveum.com/xml/ns/model/workflow/process-instance-state-3"
                                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
                                  xmlns:enc="http://www.w3.org/2001/04/xmlenc#"
-                                 xsi:type="c:ProtectedStringType">
+                                 xsi:type="t:ProtectedStringType">
                             <enc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
                                 <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
                                 <ds:KeyInfo>
@@ -229,7 +229,7 @@
                                  xmlns:wfpis="http://midpoint.evolveum.com/xml/ns/model/workflow/process-instance-state-3"
                                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
                                  xmlns:enc="http://www.w3.org/2001/04/xmlenc#"
-                                 xsi:type="c:ProtectedStringType">
+                                 xsi:type="t:ProtectedStringType">
                             <enc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
                                 <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
                                 <ds:KeyInfo>
@@ -368,7 +368,7 @@
                                  xmlns:wfpis="http://midpoint.evolveum.com/xml/ns/model/workflow/process-instance-state-3"
                                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
                                  xmlns:enc="http://www.w3.org/2001/04/xmlenc#"
-                                 xsi:type="c:ProtectedStringType">
+                                 xsi:type="t:ProtectedStringType">
                             <enc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
                                 <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
                                 <ds:KeyInfo>
@@ -532,7 +532,7 @@
                     <t:path>c:credentials/c:password</t:path>
                     <t:value>
                         <c:value xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                                 xsi:type="c:ProtectedStringType">
+                                 xsi:type="t:ProtectedStringType">
                             <enc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
                                 <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
                                 <ds:KeyInfo>
@@ -597,7 +597,7 @@
                                 </activation>
                                 <credentials>
                                     <password>
-                                        <c:value xsi:type="c:ProtectedStringType">
+                                        <c:value xsi:type="t:ProtectedStringType">
                                             <enc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
                                                 <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
                                                 <ds:KeyInfo>
diff --git a/model/workflow-impl/src/test/resources/model-contexts/context-dummy-resource.xml b/model/workflow-impl/src/test/resources/model-contexts/context-dummy-resource.xml
index 8627121cfdc..370c99a75c3 100644
--- a/model/workflow-impl/src/test/resources/model-contexts/context-dummy-resource.xml
+++ b/model/workflow-impl/src/test/resources/model-contexts/context-dummy-resource.xml
@@ -299,7 +299,7 @@
                 <t:modificationType>replace</t:modificationType>
                 <t:path>c:credentials/c:password</t:path>
                 <t:value>
-                    <c:value xsi:type="c:ProtectedStringType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                    <c:value xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" xsi:type="t:ProtectedStringType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
                         <enc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
                             <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
                             <ds:KeyInfo>
diff --git a/model/workflow-impl/src/test/resources/task.obsolete.xml b/model/workflow-impl/src/test/resources/task.obsolete.xml
index bd23ea349c9..1bc087f4f9f 100644
--- a/model/workflow-impl/src/test/resources/task.obsolete.xml
+++ b/model/workflow-impl/src/test/resources/task.obsolete.xml
@@ -127,7 +127,7 @@
                                      xmlns:wfpis="http://midpoint.evolveum.com/xml/ns/model/workflow/process-instance-state-3"
                                      xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
                                      xmlns:enc="http://www.w3.org/2001/04/xmlenc#"
-                                     xsi:type="c:ProtectedStringType">
+                                     xsi:type="t:ProtectedStringType">
                                 <enc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
                                     <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
                                     <ds:KeyInfo>
@@ -234,7 +234,7 @@
                                      xmlns:wfpis="http://midpoint.evolveum.com/xml/ns/model/workflow/process-instance-state-3"
                                      xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
                                      xmlns:enc="http://www.w3.org/2001/04/xmlenc#"
-                                     xsi:type="c:ProtectedStringType">
+                                     xsi:type="t:ProtectedStringType">
                                 <enc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
                                     <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
                                     <ds:KeyInfo>
@@ -368,7 +368,7 @@
                                      xmlns:wfpis="http://midpoint.evolveum.com/xml/ns/model/workflow/process-instance-state-3"
                                      xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
                                      xmlns:enc="http://www.w3.org/2001/04/xmlenc#"
-                                     xsi:type="c:ProtectedStringType">
+                                     xsi:type="t:ProtectedStringType">
                                 <enc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
                                     <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
                                     <ds:KeyInfo>
@@ -528,7 +528,7 @@
                         <t:path>c:credentials/c:password</t:path>
                         <t:value>
                             <c:value xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                                     xsi:type="c:ProtectedStringType">
+                                     xsi:type="t:ProtectedStringType">
                                 <enc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
                                     <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
                                     <ds:KeyInfo>
@@ -592,7 +592,7 @@
                                     </activation>
                                     <credentials>
                                         <password>
-                                            <c:value xsi:type="c:ProtectedStringType">
+                                            <c:value xsi:type="t:ProtectedStringType">
                                                 <enc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
                                                     <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
                                                     <ds:KeyInfo>
diff --git a/repo/repo-sql-impl-test/src/test/resources/modify/user-with-extension.xml b/repo/repo-sql-impl-test/src/test/resources/modify/user-with-extension.xml
index 63c9f54f88b..ea3f06fea8f 100644
--- a/repo/repo-sql-impl-test/src/test/resources/modify/user-with-extension.xml
+++ b/repo/repo-sql-impl-test/src/test/resources/modify/user-with-extension.xml
@@ -57,7 +57,7 @@
 <!--                      xmlns:ds="http://www.w3.org/2000/09/xmldsig#" -->
 <!--                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -->
 <!--                      xmlns:enc="http://www.w3.org/2001/04/xmlenc#" -->
-<!--                      xsi:type="c:ProtectedStringType"> -->
+<!--                      xsi:type="t:ProtectedStringType"> -->
 <!--                 <enc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element"> -->
 <!--                     <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/> -->
 <!--                     <ds:KeyInfo> -->
diff --git a/samples/objects/connector-dbtable.xml b/samples/objects/connector-dbtable.xml
index 5a950f727cf..95895ce6118 100644
--- a/samples/objects/connector-dbtable.xml
+++ b/samples/objects/connector-dbtable.xml
@@ -22,7 +22,7 @@
      discovered during system initialization.  -->
 
 <connector xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-           
+           xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
            xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
            xmlns:enc="http://www.w3.org/2001/04/xmlenc#">
            
@@ -158,7 +158,7 @@
                      </xsd:appinfo>
                   </xsd:annotation>
                </xsd:element>
-               <xsd:element minOccurs="0" name="password" type="c:ProtectedStringType">
+               <xsd:element minOccurs="0" name="password" type="t:ProtectedStringType">
                   <xsd:annotation>
                      <xsd:appinfo>
                         <a:displayName>User Password</a:displayName>