Skip to content

Commit

Permalink
Fixed c:ProtectedStringType -> t:ProtectedStringType
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Oct 27, 2016
1 parent 2b05064 commit 368db18
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 23 deletions.
2 changes: 1 addition & 1 deletion gui/admin-gui/src/test/resources/common/user-jack-repo.xml
View file
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion infra/schema/src/test/resources/diff/resource-after-ns-change.xml
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion infra/schema/src/test/resources/diff/resource-before.xml
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions model/model-intest/src/test/resources/common/connector-dummy.xml
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions model/model-intest/src/test/resources/common/connector-ldap.xml
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -77,15 +78,15 @@
</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>
<a:help>Password Decryption Key</a:help>
</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>
Expand Down
4 changes: 2 additions & 2 deletions model/workflow-impl/src/test/resources/common/connector-dummy.xml
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions model/workflow-impl/src/test/resources/model-context.obsolete.xml
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion model/workflow-impl/src/test/resources/model-contexts/context-dummy-resource.xml
View file
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions model/workflow-impl/src/test/resources/task.obsolete.xml
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion repo/repo-sql-impl-test/src/test/resources/modify/user-with-extension.xml
View file
Expand Up @@ -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> -->
Expand Down
4 changes: 2 additions & 2 deletions samples/objects/connector-dbtable.xml
View file
Expand Up @@ -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#">

Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 368db18

Please sign in to comment.