From 3e3c2994bea27f31ce5e0b06a0b1eb1a3bb5abd9 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Wed, 3 Jan 2018 19:25:45 +0100
Subject: [PATCH 1/2] MDL-61150 xmldb: Fix wrong PATH attributes in core

---
 admin/tool/monitor/db/install.xml             | 4 ++--
 admin/tool/recyclebin/db/install.xml          | 4 ++--
 admin/tool/usertours/db/install.xml           | 2 +-
 grade/grading/form/guide/db/install.xml       | 2 +-
 mod/workshop/form/accumulative/db/install.xml | 4 ++--
 mod/workshop/form/comments/db/install.xml     | 4 ++--
 mod/workshop/form/numerrors/db/install.xml    | 4 ++--
 mod/workshop/form/rubric/db/install.xml       | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/admin/tool/monitor/db/install.xml b/admin/tool/monitor/db/install.xml
index 9a3f1a16f32..4a5087a5475 100644
--- a/admin/tool/monitor/db/install.xml
+++ b/admin/tool/monitor/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="tool/monitor/db" VERSION="20141103" COMMENT="XMLDB file for Moodle tool/monitor"
+<XMLDB PATH="admin/tool/monitor/db" VERSION="20141103" COMMENT="XMLDB file for Moodle tool/monitor"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
 >
@@ -79,4 +79,4 @@
       </KEYS>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>
diff --git a/admin/tool/recyclebin/db/install.xml b/admin/tool/recyclebin/db/install.xml
index e89b1c22935..955f1b53747 100644
--- a/admin/tool/recyclebin/db/install.xml
+++ b/admin/tool/recyclebin/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="tool/recyclebin/db" VERSION="20160315" COMMENT="XMLDB file for Moodle tool/recyclebin"
+<XMLDB PATH="admin/tool/recyclebin/db" VERSION="20160315" COMMENT="XMLDB file for Moodle tool/recyclebin"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
 >
@@ -38,4 +38,4 @@
       </INDEXES>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>
diff --git a/admin/tool/usertours/db/install.xml b/admin/tool/usertours/db/install.xml
index 3402bd88001..ad7011b064e 100644
--- a/admin/tool/usertours/db/install.xml
+++ b/admin/tool/usertours/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="tool/usertours/db" VERSION="20160830" COMMENT="XMLDB file for Moodle tool/usertours"
+<XMLDB PATH="admin/tool/usertours/db" VERSION="20160830" COMMENT="XMLDB file for Moodle tool/usertours"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
 >
diff --git a/grade/grading/form/guide/db/install.xml b/grade/grading/form/guide/db/install.xml
index bfab4f3450b..54fe949b5f4 100644
--- a/grade/grading/form/guide/db/install.xml
+++ b/grade/grading/form/guide/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="grade/grading/form/markingguide/db" VERSION="20120404" COMMENT="XMLDB file for Moodle marking guide"
+<XMLDB PATH="grade/grading/form/guide/db" VERSION="20120404" COMMENT="XMLDB file for Moodle marking guide"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="../../../../../lib/xmldb/xmldb.xsd"
         >
diff --git a/mod/workshop/form/accumulative/db/install.xml b/mod/workshop/form/accumulative/db/install.xml
index 66097ecc9e4..b3e5812b4f7 100644
--- a/mod/workshop/form/accumulative/db/install.xml
+++ b/mod/workshop/form/accumulative/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="mod/workshop/db" VERSION="20120122" COMMENT="XMLDB file for Moodle mod/workshop"
+<XMLDB PATH="mod/workshop/form/accumulative/db" VERSION="20120122" COMMENT="XMLDB file for Moodle mod/workshop"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
 >
@@ -20,4 +20,4 @@
       </KEYS>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>
diff --git a/mod/workshop/form/comments/db/install.xml b/mod/workshop/form/comments/db/install.xml
index 02e612e1e61..8c0a201e3ad 100644
--- a/mod/workshop/form/comments/db/install.xml
+++ b/mod/workshop/form/comments/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="mod/workshop/db" VERSION="20120122" COMMENT="XMLDB file for Moodle Comments grading strategy"
+<XMLDB PATH="mod/workshop/form/comments/db" VERSION="20120122" COMMENT="XMLDB file for Moodle Comments grading strategy"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
 >
@@ -18,4 +18,4 @@
       </KEYS>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>
diff --git a/mod/workshop/form/numerrors/db/install.xml b/mod/workshop/form/numerrors/db/install.xml
index 1de7e62859b..4b96f0ea4f8 100644
--- a/mod/workshop/form/numerrors/db/install.xml
+++ b/mod/workshop/form/numerrors/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="mod/workshop/db" VERSION="20120122" COMMENT="XMLDB file for Moodle Number of errors subplugin"
+<XMLDB PATH="mod/workshop/form/numerrors/db" VERSION="20120122" COMMENT="XMLDB file for Moodle Number of errors subplugin"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
 >
@@ -35,4 +35,4 @@
       </KEYS>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>
diff --git a/mod/workshop/form/rubric/db/install.xml b/mod/workshop/form/rubric/db/install.xml
index ebfd320949a..5b7f5e1ce56 100644
--- a/mod/workshop/form/rubric/db/install.xml
+++ b/mod/workshop/form/rubric/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="mod/workshop/db" VERSION="20120122" COMMENT="XMLDB file for workshop Rubric grading strategy"
+<XMLDB PATH="mod/workshop/form/rubric/db" VERSION="20120122" COMMENT="XMLDB file for workshop Rubric grading strategy"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
 >
@@ -42,4 +42,4 @@
       </KEYS>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>

From 5a43147f56fc928b42fe34d19489359b2c183f55 Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Thu, 4 Jan 2018 11:25:56 +0800
Subject: [PATCH 2/2] MDL-61150 xmldb: correct path to schema in install.xml

---
 admin/tool/monitor/db/install.xml             | 2 +-
 admin/tool/recyclebin/db/install.xml          | 2 +-
 admin/tool/usertours/db/install.xml           | 2 +-
 mod/workshop/form/accumulative/db/install.xml | 2 +-
 mod/workshop/form/comments/db/install.xml     | 2 +-
 mod/workshop/form/numerrors/db/install.xml    | 2 +-
 mod/workshop/form/rubric/db/install.xml       | 2 +-
 portfolio/mahara/db/install.xml               | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/tool/monitor/db/install.xml b/admin/tool/monitor/db/install.xml
index 4a5087a5475..1774e5895d1 100644
--- a/admin/tool/monitor/db/install.xml
+++ b/admin/tool/monitor/db/install.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <XMLDB PATH="admin/tool/monitor/db" VERSION="20141103" COMMENT="XMLDB file for Moodle tool/monitor"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
+    xsi:noNamespaceSchemaLocation="../../../../lib/xmldb/xmldb.xsd"
 >
   <TABLES>
     <TABLE NAME="tool_monitor_rules" COMMENT="Table to store rules">
diff --git a/admin/tool/recyclebin/db/install.xml b/admin/tool/recyclebin/db/install.xml
index 955f1b53747..2afaa3da05a 100644
--- a/admin/tool/recyclebin/db/install.xml
+++ b/admin/tool/recyclebin/db/install.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <XMLDB PATH="admin/tool/recyclebin/db" VERSION="20160315" COMMENT="XMLDB file for Moodle tool/recyclebin"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
+    xsi:noNamespaceSchemaLocation="../../../../lib/xmldb/xmldb.xsd"
 >
   <TABLES>
     <TABLE NAME="tool_recyclebin_course" COMMENT="A list of items in the course recycle bin">
diff --git a/admin/tool/usertours/db/install.xml b/admin/tool/usertours/db/install.xml
index ad7011b064e..c275f46d222 100644
--- a/admin/tool/usertours/db/install.xml
+++ b/admin/tool/usertours/db/install.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <XMLDB PATH="admin/tool/usertours/db" VERSION="20160830" COMMENT="XMLDB file for Moodle tool/usertours"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
+    xsi:noNamespaceSchemaLocation="../../../../lib/xmldb/xmldb.xsd"
 >
   <TABLES>
     <TABLE NAME="tool_usertours_tours" COMMENT="List of tours">
diff --git a/mod/workshop/form/accumulative/db/install.xml b/mod/workshop/form/accumulative/db/install.xml
index b3e5812b4f7..1f2ff097f2d 100644
--- a/mod/workshop/form/accumulative/db/install.xml
+++ b/mod/workshop/form/accumulative/db/install.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <XMLDB PATH="mod/workshop/form/accumulative/db" VERSION="20120122" COMMENT="XMLDB file for Moodle mod/workshop"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
+    xsi:noNamespaceSchemaLocation="../../../../../lib/xmldb/xmldb.xsd"
 >
   <TABLES>
     <TABLE NAME="workshopform_accumulative" COMMENT="The assessment dimensions definitions of Accumulative grading strategy forms">
diff --git a/mod/workshop/form/comments/db/install.xml b/mod/workshop/form/comments/db/install.xml
index 8c0a201e3ad..88d24086254 100644
--- a/mod/workshop/form/comments/db/install.xml
+++ b/mod/workshop/form/comments/db/install.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <XMLDB PATH="mod/workshop/form/comments/db" VERSION="20120122" COMMENT="XMLDB file for Moodle Comments grading strategy"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
+    xsi:noNamespaceSchemaLocation="../../../../../lib/xmldb/xmldb.xsd"
 >
   <TABLES>
     <TABLE NAME="workshopform_comments" COMMENT="The assessment dimensions definitions of Comments strategy forms">
diff --git a/mod/workshop/form/numerrors/db/install.xml b/mod/workshop/form/numerrors/db/install.xml
index 4b96f0ea4f8..9d8c57c4803 100644
--- a/mod/workshop/form/numerrors/db/install.xml
+++ b/mod/workshop/form/numerrors/db/install.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <XMLDB PATH="mod/workshop/form/numerrors/db" VERSION="20120122" COMMENT="XMLDB file for Moodle Number of errors subplugin"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
+    xsi:noNamespaceSchemaLocation="../../../../../lib/xmldb/xmldb.xsd"
 >
   <TABLES>
     <TABLE NAME="workshopform_numerrors" COMMENT="The assessment dimensions definitions of Number of errors grading strategy forms">
diff --git a/mod/workshop/form/rubric/db/install.xml b/mod/workshop/form/rubric/db/install.xml
index 5b7f5e1ce56..bf6b1253f82 100644
--- a/mod/workshop/form/rubric/db/install.xml
+++ b/mod/workshop/form/rubric/db/install.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <XMLDB PATH="mod/workshop/form/rubric/db" VERSION="20120122" COMMENT="XMLDB file for workshop Rubric grading strategy"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
+    xsi:noNamespaceSchemaLocation="../../../../../lib/xmldb/xmldb.xsd"
 >
   <TABLES>
     <TABLE NAME="workshopform_rubric" COMMENT="The assessment dimensions definitions of Rubric grading strategy forms">
diff --git a/portfolio/mahara/db/install.xml b/portfolio/mahara/db/install.xml
index da9741da6be..c2b028a4795 100644
--- a/portfolio/mahara/db/install.xml
+++ b/portfolio/mahara/db/install.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <XMLDB PATH="portfolio/mahara/db" VERSION="20120122" COMMENT="XMLDB file for Moodle portfolio/mahara"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../../lib/xmldb/xmldb.xsd"
+    xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
 >
   <TABLES>
     <TABLE NAME="portfolio_mahara_queue" COMMENT="maps mahara tokens to transfer ids">