From 091d4badabe97e88073c5e7f8889b692ca265cd9 Mon Sep 17 00:00:00 2001
From: James Babb <james.babb@wisc.edu>
Date: Fri, 1 Dec 2017 16:33:41 -0600
Subject: [PATCH] fixed xml namespace issue. added where to find object types.
 tailing idm.log now for midpoint's output

---
 midpoint/assets/objects/01_sis_resources.xml | 16 +++++++---------
 midpoint/assets/objects/import_objects.sh    |  3 ++-
 midpoint/assets/run-midpoint.sh              |  6 ++++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/midpoint/assets/objects/01_sis_resources.xml b/midpoint/assets/objects/01_sis_resources.xml
index 9afe6d3..4bcdef1 100644
--- a/midpoint/assets/objects/01_sis_resources.xml
+++ b/midpoint/assets/objects/01_sis_resources.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
     <!-- TODO: is hard coding an OID going to be a problem? -->
-<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:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
-    xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance/ef2bc95b-76e0-48e2-86d6-3d4f02d3eeee"
-    xmlns:icfc="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3"
-    xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
-    xmlns:my="http://myself.me/schemas/whatever"
+<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:q="http://prism.evolveum.com/xml/ns/public/query-3"
+		xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
+		xmlns:icfc="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3"
+		xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
+		xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3"
         
     oid="6573361b-20c9-4d79-8f00-f1445b5902a1">
 
diff --git a/midpoint/assets/objects/import_objects.sh b/midpoint/assets/objects/import_objects.sh
index 9e3e4bc..de165ab 100755
--- a/midpoint/assets/objects/import_objects.sh
+++ b/midpoint/assets/objects/import_objects.sh
@@ -3,7 +3,8 @@
 # import_objects.sh, DESCRIPTION
 # 
 echo "Importing Midpoint objects"
-# TODO: Change this to loop through all files in directory in ascending order (somehow knowing what object type)
+# TODO: Change this to loop through all files in directory in ascending order (somehow knowing what object type as each object type has a seperate path)
+# See https://wiki.evolveum.com/display/midPoint/REST+API#RESTAPI-Supportedobjecttypes for object types.
 curl --user administrator:5ecr3t -H "Content-Type: application/xml" -X POST http://localhost:8080/midpoint/ws/rest/resources -d @/midpoint_objects/01_sis_resources.xml -v
 curl --user administrator:5ecr3t -H "Content-Type: application/xml" -X POST http://localhost:8080/midpoint/ws/rest/tasks -d @/midpoint_objects/02_sis_tasks.xml -v
 echo "Done importing Midpoint objects"
diff --git a/midpoint/assets/run-midpoint.sh b/midpoint/assets/run-midpoint.sh
index d306bc9..9813d13 100755
--- a/midpoint/assets/run-midpoint.sh
+++ b/midpoint/assets/run-midpoint.sh
@@ -44,5 +44,7 @@ then
 fi
 
 # tomcat is backgrounded. just tail the log
-# TODO: tailing idm.log would be more useful to diagnose midpoint issues
-tail -f /usr/local/tomcat/logs/catalina.out
+tail -f /usr/local/tomcat/logs/catalina.out &
+# wait for idm.log to be available.
+sleep 10
+tail -f /usr/local/tomcat/logs/idm.log