Fixing samples

Evolveum · Nov 29, 2015 · cc7289c · cc7289c
1 parent b513305
commit cc7289c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/samples/demo/opendj.xml b/samples/demo/opendj.xml
@@ -443,15 +443,6 @@
         </objectType>
 
 	</schemaHandling>
-
-    <schema>
-        <generationConstraints>
-            <generateObjectClass>ri:inetOrgPerson</generateObjectClass>
-            <generateObjectClass>ri:groupOfUniqueNames</generateObjectClass>
-            <generateObjectClass>ri:organizationalUnit</generateObjectClass>
-        </generationConstraints>
-    </schema>
-
 
     <capabilities xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3">
     	<configured>

diff --git a/samples/resources/opendj/opendj-localhost-basic.xml b/samples/resources/opendj/opendj-localhost-basic.xml
@@ -89,6 +89,16 @@ This resource definition contains only the very basic definitions for midPoint t
 			 the resource on the first use of this resource definition.
 		 -->
 
+		<schema>
+		    <!-- workaround to MID-2723 -->
+		    <generationConstraints>
+		        <generateObjectClass>ri:inetOrgPerson</generateObjectClass>
+		        <generateObjectClass>ri:groupOfUniqueNames</generateObjectClass>
+		        <generateObjectClass>ri:groupOfNames</generateObjectClass>
+		        <generateObjectClass>ri:organizationalUnit</generateObjectClass>
+		    </generationConstraints>
+		</schema>
+
         <!-- Resource Schema Handling definition.
              This part defines how the schema defined above will be used by
              midPoint. It defines expressions and limitations for individual
@@ -106,15 +116,5 @@ This resource definition contains only the very basic definitions for midPoint t
         -->
 
 	</resource>
-
-    <schema>
-        <!-- workaround to MID-2723 -->
-        <generationConstraints>
-            <generateObjectClass>ri:inetOrgPerson</generateObjectClass>
-            <generateObjectClass>ri:groupOfUniqueNames</generateObjectClass>
-            <generateObjectClass>ri:groupOfNames</generateObjectClass>
-            <generateObjectClass>ri:organizationalUnit</generateObjectClass>
-        </generationConstraints>
-    </schema>
-
+
 </objects>
diff --git a/samples/tasks/recon-task-opendj-test.xml b/samples/tasks/recon-task-opendj-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2015 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,9 +21,8 @@
 	xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:my="http://whatever.com/my"
-	xsi:schemaLocation="http://midpoint.evolveum.com/xml/ns/public/common/common-3 ../../../../../../infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
-							  http://www.w3.org/2001/XMLSchema ../../../../../../infra/schema/src/test/resources/standard/XMLSchema.xsd">
+	xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
+	xmlns:my="http://whatever.com/my">
 
 	<!-- Resource printable name -->
 	<name>Reconciliation: OpenDJ test</name>