Skip to content

Commit

Permalink
Even more namespace renames
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed May 1, 2014
1 parent a3970cb commit 854e929
Show file tree
Hide file tree
Showing 150 changed files with 204 additions and 204 deletions.
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
View file
Expand Up @@ -17,7 +17,7 @@
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
oid="RECONCIL-3333-3333-TEST-10000000000"
version="0">
<name>
Expand Down
2 changes: 1 addition & 1 deletion infra/common/src/test/resources/validator/not-well-formed.xml
View file
Expand Up @@ -19,7 +19,7 @@
<!-- schemaHandling is not terminated properly -->

<objects xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2">
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">

<resource oid="ef2bc95b-76e0-48e2-86d6-3d4f02d3e1a2">
<name>Localhost OpenDJ</name>
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/pom.xml
View file
Expand Up @@ -360,7 +360,7 @@
<schemaFile>src/main/resources/xml/ns/public/common/common-3.xsd</schemaFile>
<schemaFile>src/main/resources/xml/ns/public/common/api-types-3.xsd</schemaFile>
<schemaFile>src/main/resources/xml/ns/public/connector/icf-1/resource-schema-3.xsd</schemaFile>
<schemaFile>src/main/resources/xml/ns/public/model/scripting/scripting-2.xsd</schemaFile>
<schemaFile>src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd</schemaFile>
</schemaFiles>
<templateDir>src/main/schemadoc/templates</templateDir>
</configuration>
Expand Down
10 changes: 5 additions & 5 deletions infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/MidPointConstants.java
View file
@@ -1,5 +1,5 @@
/*
* 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.
Expand All @@ -26,7 +26,7 @@ public class MidPointConstants {
public static final String NS_MIDPOINT_PUBLIC_PREFIX = "http://midpoint.evolveum.com/xml/ns/public";
public static final String NS_MIDPOINT_TEST_PREFIX = "http://midpoint.evolveum.com/xml/ns/test";

public static final String NS_RA = NS_MIDPOINT_PUBLIC_PREFIX+"/resource/annotation-2";
public static final String NS_RA = NS_MIDPOINT_PUBLIC_PREFIX+"/resource/annotation-3";
public static final String PREFIX_NS_RA = "ra";
public static final QName RA_RESOURCE_OBJECT = new QName(NS_RA, "resourceObject");
public static final QName RA_KIND = new QName(NS_RA, "kind");
Expand All @@ -46,7 +46,7 @@ public class MidPointConstants {
@Deprecated
public static final QName RA_ACCOUNT_TYPE = new QName(NS_RA, "accountType");

public static final String NS_RI = NS_MIDPOINT_PUBLIC_PREFIX+"/resource/instance-2";
public static final String NS_RI = NS_MIDPOINT_PUBLIC_PREFIX+"/resource/instance-3";
public static final String PREFIX_NS_RI = "ri";

/**
Expand All @@ -58,9 +58,9 @@ public class MidPointConstants {
public static final String DEFAULT_ACCOUNT_TYPE_NAME = "default";

public static final String FUNCTION_LIBRARY_BASIC_VARIABLE_NAME = "basic";
public static final String NS_FUNC_BASIC = NS_MIDPOINT_PUBLIC_PREFIX+"/function/basic-2";
public static final String NS_FUNC_BASIC = NS_MIDPOINT_PUBLIC_PREFIX+"/function/basic-3";

public static final String FUNCTION_LIBRARY_LOG_VARIABLE_NAME = "log";
public static final String NS_FUNC_LOG = NS_MIDPOINT_PUBLIC_PREFIX+"/function/log-2";
public static final String NS_FUNC_LOG = NS_MIDPOINT_PUBLIC_PREFIX+"/function/log-3";

}
4 changes: 2 additions & 2 deletions infra/schema/src/main/resources/META-INF/catalog.xml
View file
Expand Up @@ -43,8 +43,8 @@
<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-2" uri="../xml/ns/public/model/import/extension-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-2" uri="../xml/ns/public/model/import/extension-3.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-2.xsd" />
<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3" uri="../xml/ns/public/model/scripting/extension-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3" uri="../xml/ns/public/model/scripting/extension-3.xsd" />
Expand Down
4 changes: 2 additions & 2 deletions infra/schema/src/main/resources/META-INF/jax-ws-catalog-model-context.xml
View file
Expand Up @@ -38,8 +38,8 @@
<public publicId="http://prism.evolveum.com/xml/ns/public/query-3" uri="../../../../../../infra/prism/src/main/resources/xml/ns/public/query-3.xsd" />
<system systemId="http://prism.evolveum.com/xml/ns/public/query-3" uri="../../../../../../infra/prism/src/main/resources/xml/ns/public/query-3.xsd" />

<!--<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-2.xsd" />-->
<!--<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-2.xsd" />-->
<!--<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />-->
<!--<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />-->

<!--<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3" uri="../xml/ns/public/model/scripting/extension-3.xsd" />-->
<!--<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3" uri="../xml/ns/public/model/scripting/extension-3.xsd" />-->
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/main/resources/xml/ns/private/fake/fake-1.wsdl
View file
Expand Up @@ -48,7 +48,7 @@
<xsd:import namespace="http://midpoint.evolveum.com/xml/ns/model/workflow/process-instance-state-3"
schemaLocation="../../public/model/workflow/process-instance-state-3.xsd"/>
<xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3"
schemaLocation="../../public/model/scripting/scripting-2.xsd"/>
schemaLocation="../../public/model/scripting/scripting-3.xsd"/>

<xsd:import namespace="http://prism.evolveum.com/xml/ns/public/query-3"
schemaLocation="http://prism.evolveum.com/xml/ns/public/query-3"/>
Expand Down
4 changes: 2 additions & 2 deletions model/model-client/src/compile/resources/catalog.xml
View file
Expand Up @@ -40,8 +40,8 @@
<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-2" uri="../../../target/midpoint-schema/xml/ns/public/model/import/extension-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-2" uri="../../../target/midpoint-schema/xml/ns/public/model/import/extension-3.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-2.xsd" />
<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3" uri="../xml/ns/public/model/scripting/extension-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3" uri="../xml/ns/public/model/scripting/extension-3.xsd" />
Expand Down
4 changes: 2 additions & 2 deletions model/model-client/src/compile/resources/jax-ws-catalog.xml
View file
Expand Up @@ -21,8 +21,8 @@
<public publicId="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3" uri="../../../target/midpoint-schema/xml/ns/public/common/api-types-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3" uri="../../../target/midpoint-schema/xml/ns/public/common/api-types-3.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../../../target/midpoint-schema/xml/ns/public/model/scripting/scripting-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../../../target/midpoint-schema/xml/ns/public/model/scripting/scripting-2.xsd" />
<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../../../target/midpoint-schema/xml/ns/public/model/scripting/scripting-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../../../target/midpoint-schema/xml/ns/public/model/scripting/scripting-3.xsd" />

<nextCatalog catalog="./catalog.xml"/>
</catalog>
4 changes: 2 additions & 2 deletions model/model-client/src/main/resources/META-INF/catalog.xml
View file
Expand Up @@ -40,8 +40,8 @@
<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-2" uri="../xml/ns/public/model/import/extension-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-2" uri="../xml/ns/public/model/import/extension-3.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-2.xsd" />
<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3" uri="../xml/ns/public/model/scripting/extension-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3" uri="../xml/ns/public/model/scripting/extension-3.xsd" />
Expand Down
4 changes: 2 additions & 2 deletions model/model-client/src/main/resources/META-INF/jax-ws-catalog.xml
View file
Expand Up @@ -21,8 +21,8 @@
<public publicId="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3" uri="../xml/ns/public/common/api-types-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3" uri="../xml/ns/public/common/api-types-3.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-2.xsd" />
<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />

<nextCatalog catalog="catalog.xml"/>
</catalog>
2 changes: 1 addition & 1 deletion model/model-common/src/test/resources/expression/expression/iteration-condition.xml
View file
Expand Up @@ -20,7 +20,7 @@
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
xmlns:piracy="http://midpoint.evolveum.com/xml/ns/samples/piracy"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
Expand Down
2 changes: 1 addition & 1 deletion model/model-common/src/test/resources/expression/functions/account-jack.xml
View file
Expand Up @@ -20,7 +20,7 @@
xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

Expand Down
2 changes: 1 addition & 1 deletion model/model-common/src/test/resources/expression/functions/resource-opendj.xml
View file
Expand Up @@ -19,7 +19,7 @@
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:t='http://prism.evolveum.com/xml/ns/public/types-3'
xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand Down
2 changes: 1 addition & 1 deletion model/model-common/src/test/resources/expression/xpath/expression-func-concatname.xml
View file
Expand Up @@ -17,7 +17,7 @@

<script
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:func="http://midpoint.evolveum.com/xml/ns/public/function/basic-2">
xmlns:func="http://midpoint.evolveum.com/xml/ns/public/function/basic-3">
<language>http://www.w3.org/TR/xpath/</language>
<code>
func:concatName(' Horatio ', 'Torquemada', 'Marley ')
Expand Down
2 changes: 1 addition & 1 deletion model/model-common/src/test/resources/expression/xpath/expression-func.xml
View file
Expand Up @@ -17,7 +17,7 @@

<script
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:func="http://midpoint.evolveum.com/xml/ns/public/function/basic-2">
xmlns:func="http://midpoint.evolveum.com/xml/ns/public/function/basic-3">
<language>http://www.w3.org/TR/xpath/</language>
<code>
func:norm('Guľôčka v jamôčke!')
Expand Down
2 changes: 1 addition & 1 deletion .../model-common/src/test/resources/expression/xpath/expression-user-stringify-full-name.xml
View file
Expand Up @@ -18,7 +18,7 @@
<script
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:basic="http://midpoint.evolveum.com/xml/ns/public/function/basic-2">
xmlns:basic="http://midpoint.evolveum.com/xml/ns/public/function/basic-3">
<language>http://www.w3.org/TR/xpath/</language>
<code>
declare namespace c="http://midpoint.evolveum.com/xml/ns/public/common/common-3";
Expand Down
4 changes: 2 additions & 2 deletions model/model-impl/src/main/resources/ctx-model.xml
View file
Expand Up @@ -57,7 +57,7 @@
<bean id="basicFunctionLibrary" class="com.evolveum.midpoint.model.common.expression.functions.FunctionLibrary"
scope="singleton">
<property name="variableName" value="basic"/>
<property name="namespace" value="http://midpoint.evolveum.com/xml/ns/public/function/basic-2"/>
<property name="namespace" value="http://midpoint.evolveum.com/xml/ns/public/function/basic-3"/>
<property name="genericFunctions">
<ref bean="basicFunctionObject"/>
</property>
Expand All @@ -74,7 +74,7 @@
<bean id="logFunctionLibrary" class="com.evolveum.midpoint.model.common.expression.functions.FunctionLibrary"
scope="singleton">
<property name="variableName" value="log"/>
<property name="namespace" value="http://midpoint.evolveum.com/xml/ns/public/function/log-2"/>
<property name="namespace" value="http://midpoint.evolveum.com/xml/ns/public/function/log-3"/>
<property name="genericFunctions">
<ref bean="logFunctionObject"/>
</property>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/common/account-elaine-dummy.xml
View file
Expand Up @@ -20,7 +20,7 @@
xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2">
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
<name>elaine</name>
<resourceRef oid="10000000-0000-0000-0000-000000000004"/>
<objectClass>ri:AccountObjectClass</objectClass>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/common/account-guybrush-dummy.xml
View file
Expand Up @@ -20,7 +20,7 @@
xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2">
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
<name>guybrush</name>
<resourceRef oid="10000000-0000-0000-0000-000000000004"/>
<objectClass>ri:AccountObjectClass</objectClass>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/common/account-hbarbossa-dummy.xml
View file
Expand Up @@ -20,7 +20,7 @@
<account oid="c0c010c0-d34d-b33f-f00d-222211111112"
xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
xmlns:piracy="http://pirates.com/xml/ns"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/common/account-herman-dummy.xml
View file
Expand Up @@ -20,7 +20,7 @@
xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2">
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
<resourceRef oid="10000000-0000-0000-0000-000000000004"/>
<objectClass>ri:AccountObjectClass</objectClass>
<attributes>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/common/account-shadow-guybrush-dummy.xml
View file
Expand Up @@ -20,7 +20,7 @@
xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2">
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
<name>guybrush</name>
<resourceRef oid="10000000-0000-0000-0000-000000000004"/>
<objectClass>ri:AccountObjectClass</objectClass>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/common/account-shadow-jack-dummy.xml
View file
Expand Up @@ -20,7 +20,7 @@
xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2">
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
<name>jack</name>
<resourceRef oid="10000000-0000-0000-0000-000000000004"/>
<objectClass>ri:AccountObjectClass</objectClass>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/common/entitlement-shadow-pirate-dummy.xml
View file
Expand Up @@ -20,7 +20,7 @@
xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2">
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
<name>pirate</name>
<resourceRef oid="10000000-0000-0000-0000-000000000004"/>
<objectClass>ri:GroupObjectClass</objectClass>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/common/resource-dummy.xml
View file
Expand Up @@ -20,7 +20,7 @@
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
xmlns:piracy="http://midpoint.evolveum.com/xml/ns/samples/piracy"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/common/user-barbossa.xml
View file
Expand Up @@ -20,7 +20,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:t='http://prism.evolveum.com/xml/ns/public/types-3'
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
xmlns:piracy='http://midpoint.evolveum.com/xml/ns/samples/piracy'>
<name>barbossa</name>

Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/lens/account-before-script.xml
View file
Expand Up @@ -20,7 +20,7 @@
xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-2">
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
<name>beforeScript</name>
<resourceRef oid="10000000-0000-0000-0000-000000000004"/>
<objectClass>ri:AccountObjectClass</objectClass>
Expand Down

0 comments on commit 854e929

Please sign in to comment.