fixing samples.. (after schema changed)..

Evolveum · May 23, 2014 · dd068fc · dd068fc
1 parent e177a4a
commit dd068fc
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 18 deletions.
diff --git a/samples/demo/addressbook.xml b/samples/demo/addressbook.xml
@@ -65,7 +65,7 @@
 		<schemaHandling>
 
 			<objectType>
-				<name>default</name>
+				<intent>default</intent>
 				<displayName>Default Account</displayName>
 				<default>true</default>
 				<objectClass>ri:AccountObjectClass</objectClass>
@@ -125,10 +125,10 @@
 					</outbound>
 				</attribute>
 				<activation>
-					<enabled>
-						<outbound/>
-					</enabled>
-				</activation>
+	                <administrativeStatus>
+	                    <outbound/>
+	                </administrativeStatus>
+            	</activation>
 				<credentials>
 					<password>
 						<outbound/>

diff --git a/samples/demo/hr.xml b/samples/demo/hr.xml
@@ -58,7 +58,7 @@
         <schemaHandling>
 
             <objectType>
-                <name>default</name>
+                <intent>default</intent>
                 <displayName>Default Account</displayName>
                 <default>true</default>
                 <objectClass>ri:AccountObjectClass</objectClass>

diff --git a/samples/demo/opendj.xml b/samples/demo/opendj.xml
@@ -269,7 +269,7 @@
 
 	<schemaHandling>
 		<objectType>
-			<name>default</name>
+			<intent>default</intent>
 			<displayName>Default Account</displayName>
 			<default>true</default>
 			<objectClass>ri:AccountObjectClass</objectClass>
@@ -419,15 +419,15 @@
             </protected>
 
             <activation>
-                <enabled>
+                  <administrativeStatus>
                     <outbound/>
                     <inbound>
                     	<strength>weak</strength>
                         <expression>
                             <asIs/>
                         </expression>
                     </inbound>
-                </enabled>
+                  </administrativeStatus>
             </activation>
 
             <credentials>

diff --git a/samples/resources/ad/ad-resource-advanced-sync.xml b/samples/resources/ad/ad-resource-advanced-sync.xml
@@ -325,7 +325,6 @@ to "false". The only way of resetting the flag is to change user's password.
 			<q:equal>
 				<q:path>c:name</q:path>
 				<expression>
-					<ref>name</ref>
 					<script>
 						<language>http://www.w3.org/TR/xpath/</language>
 						<code>

diff --git a/samples/resources/office365/office365-federated.xml b/samples/resources/office365/office365-federated.xml
@@ -70,7 +70,7 @@ This contains configuration for a federated Office 365 domain
         <schemaHandling>
             <objectType>
 	        <kind>account</kind>
-                <name>default</name>
+                <intent>default</intent>
                 <displayName>Federated Account</displayName>
                 <default>true</default>
                 <objectClass>ri:AccountObjectClass</objectClass>
@@ -292,7 +292,6 @@ This contains configuration for a federated Office 365 domain
                     <q:equal>
                         <q:path>c:name</q:path>
                         <expression>
-                            <ref>name</ref>
                             <script>
                                 <language>http://www.w3.org/TR/xpath/</language>
                                 <code>

diff --git a/samples/resources/office365/office365-managed.xml b/samples/resources/office365/office365-managed.xml
@@ -69,7 +69,7 @@ This contains configuration for a managed (non federated) Office 365 domain
         <schemaHandling>
             <objectType>
 	        <kind>account</kind>
-                <name>default</name>
+                <intent>default</intent>
                 <displayName>Managed Account</displayName>
                 <default>true</default>
                 <objectClass>ri:AccountObjectClass</objectClass>
@@ -272,7 +272,6 @@ This contains configuration for a managed (non federated) Office 365 domain
                     <q:equal>
                         <q:path>c:name</q:path>
                         <expression>
-                            <ref>name</ref>
                             <script>
                                 <language>http://www.w3.org/TR/xpath/</language>
                                 <code>

diff --git a/samples/resources/opendj/piracy/opendj-localhost-resource-sync-extension-pirates.xml b/samples/resources/opendj/piracy/opendj-localhost-resource-sync-extension-pirates.xml
@@ -96,7 +96,7 @@ This resource definition contains also definition to enable synchronization.
             <!-- Definition of default account type.
                  This is now the only account type that OpenIDM can work with. -->
             <objectType>
-                <name>default</name>
+                <intent>default</intent>
                 <!-- Readable name for the account type -->
                 <displayName>Default Account</displayName>
                 <default>true</default>
@@ -457,9 +457,8 @@ This resource definition contains also definition to enable synchronization.
 	                     equal to the "uid" attribute of the account. Simply speaking,
 	                     it will look for match in usernames in the IDM and the resource. -->
 	                <q:equal>
-	                    <q:path>.</q:path>
+	                    <q:path>name</q:path>
 	                    <expression>
-	                        <ref>name</ref>
 	                        <script>
 		                        <code>
 		                            declare namespace i="http://midpoint.evolveum.com/xml/ns/public/common/common-3";

diff --git a/samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java b/samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java
@@ -59,7 +59,7 @@ public class TestSamples {
 
 	public static final String SAMPLES_DIRECTORY_NAME = "..";
 	// TODO: FIXME: remove the "org" dir once the schema is updated
-	public static final String[] IGNORE_PATTERNS = new String[]{ "\\.svn", "pom.xml", "old", "experimental", "misc", "org", "rest", "samples-test", "model-.*" };
+	public static final String[] IGNORE_PATTERNS = new String[]{ "\\.svn", "pom.xml", "old", "experimental", "json", "misc", "org", "rest", "samples-test", "model-.*" };
 	public static final String[] CHECK_PATTERNS = new String[]{ ".*.xml" };
 	public static final String OBJECT_RESULT_OPERATION_NAME = TestSamples.class.getName()+".validateObject";
 	private static final String RESULT_OPERATION_NAME = TestSamples.class.getName()+".validateFile";

diff --git a/samples/samples-test/src/test/resources/ctx-samples-test-main.xml b/samples/samples-test/src/test/resources/ctx-samples-test-main.xml
@@ -35,6 +35,7 @@
 	default-lazy-init="false" default-autowire="byName">
 
     <import resource="ctx-model.xml"/>
+    <import resource="ctx-model-test.xml"/>
     <import resource="ctx-provisioning.xml"/>
     <import resource="ctx-samples-test.xml"/>
     <import resource="ctx-task.xml"/>