Adopt community XQuery file extension convention

- main modules: .xq - library modules: .xqm
eXist-db · May 2, 2022 · 0aa5488 · 0aa5488
1 parent 004e191
commit 0aa5488
Show file tree

Hide file tree

Showing 36 changed files with 50 additions and 51 deletions.
diff --git a/controller.xql → controller.xq b/controller.xql → controller.xq
@@ -120,7 +120,7 @@ else if (starts-with($exist:path, "/store/")) then
     let $resource := substring-after($exist:path, "/store")
     return
         <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
-            <forward url="{$exist:controller}/modules/store.xql">
+            <forward url="{$exist:controller}/modules/store.xq">
                 <add-parameter name="path" value="{$resource}"/>
                 {$login("org.exist.login", (), false())}
             </forward>
@@ -130,7 +130,7 @@ else if (starts-with($exist:path, "/check/")) then
     let $resource := substring-after($exist:path, "/validate")
     return
         <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
-            <forward url="{$exist:controller}/modules/validate-xml.xql">
+            <forward url="{$exist:controller}/modules/validate-xml.xq">
                 <add-parameter name="validate" value="no"/>
                 {$login("org.exist.login", (), false())}
             </forward>
@@ -140,7 +140,7 @@ else if ($exist:resource = "index.html") then
     if (local:user-allowed()) then
         <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
             <view>
-                <forward url="modules/view.xql">
+                <forward url="modules/view.xq">
                     <set-header name="Cache-Control" value="max-age=3600"/>
                 </forward>
             </view>
@@ -187,7 +187,7 @@ else if ($exist:resource eq 'execute') then
                         <view>
                             <!-- Post process the result: store it into the HTTP session
                                and return the number of hits only. -->
-                            <forward url="modules/session.xql">
+                            <forward url="modules/session.xq">
                                <clear-attribute name="xquery.source"/>
                                <clear-attribute name="xquery.attribute"/>
                                <set-attribute name="elapsed"
@@ -217,7 +217,7 @@ else if ($exist:resource eq 'execute') then
  : item in the result set :)
 else if (starts-with($exist:path, '/results/')) then
     <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
-        <forward url="../modules/session.xql">
+        <forward url="../modules/session.xq">
             {$login("org.exist.login", (), false())}
             <set-header name="Cache-Control" value="no-cache"/>
             <add-parameter name="num" value="{$exist:resource}"/>
@@ -230,7 +230,7 @@ else if ($exist:resource eq "outline") then
 	return
         <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
 	        <!-- Query is executed by XQueryServlet -->
-            <forward url="modules/outline.xql">
+            <forward url="modules/outline.xq">
                 {$login("org.exist.login", (), false())}
                 <set-header name="Cache-Control" value="no-cache"/>
 	            <set-attribute name="xquery.module-load-path" value="{$base}"/>
@@ -240,13 +240,13 @@ else if ($exist:resource eq "outline") then
 else if ($exist:resource eq "debug") then
     <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
         <!-- Query is executed by XQueryServlet -->
-        <forward url="modules/debuger.xql">
+        <forward url="modules/debuger.xq">
             {$login("org.exist.login", (), false())}
             <set-header name="Cache-Control" value="no-cache"/>
         </forward>
     </dispatch>
 
-else if (ends-with($exist:path, ".xql")) then
+else if (ends-with($exist:path, ".xq")) then
     <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
         {$login("org.exist.login", (), false())}
         <set-header name="Cache-Control" value="no-cache"/>

diff --git a/expath-pkg.xml.tmpl b/expath-pkg.xml.tmpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <package xmlns="http://expath.org/ns/pkg" name="http://exist-db.org/apps/eXide" abbrev="eXide" version="{{version}}" spec="1.0">
     <title>eXide - XQuery IDE</title>
-    <dependency processor="http://exist-db.org" semver-min="5.2.0"/>
+    <dependency processor="http://exist-db.org" semver-min="5.3.0"/>
 </package>
diff --git a/index.html.tmpl b/index.html.tmpl
@@ -452,7 +452,7 @@
                             <div class="eXide-browse-upload">
                                 <p>Drop files here or click on the button below to upload them
                           to the selected collection. Maximum file size is 100MB.</p>
-                                <form class="file_upload" action="modules/upload.xql" method="POST" enctype="multipart/form-data">
+                                <form class="file_upload" action="modules/upload.xq" method="POST" enctype="multipart/form-data">
                                     <div class="options">
                                         <input type="checkbox" name="deploy" id="auto-deploy"/> 
                                         <label for="auto-deploy">Auto deploy uploaded .xar packages</label>

diff --git a/modules/apply-config.xql → modules/apply-config.xq b/modules/apply-config.xql → modules/apply-config.xq
diff --git a/modules/collections.xql → modules/collections.xq b/modules/collections.xql → modules/collections.xq
diff --git a/modules/compile.xql → modules/compile.xq b/modules/compile.xql → modules/compile.xq
diff --git a/modules/dbutils.xql → modules/dbutils.xqm b/modules/dbutils.xql → modules/dbutils.xqm
diff --git a/modules/debuger.xql → modules/debuger.xq b/modules/debuger.xql → modules/debuger.xq
@@ -18,7 +18,7 @@
  :)
 xquery version "3.0";
 
-import module namespace sandbox="http://exist-db.org/xquery/sandbox" at "session.xql";
+import module namespace sandbox="http://exist-db.org/xquery/sandbox" at "session.xq";
 
 declare namespace json="http://json.org/";
 declare namespace dbg="urn:debugger_protocol_v1";

diff --git a/modules/deployment.xql → modules/deployment.xq b/modules/deployment.xql → modules/deployment.xq
@@ -18,9 +18,9 @@
  :)
 xquery version "3.1";
 
-import module namespace apputil="http://exist-db.org/apps/eXide/apputil" at "util.xql";
-import module namespace tmpl="http://exist-db.org/xquery/template" at "tmpl.xql";
-import module namespace dbutil="http://exist-db.org/xquery/dbutil" at "dbutils.xql";
+import module namespace apputil="http://exist-db.org/apps/eXide/apputil" at "util.xqm";
+import module namespace tmpl="http://exist-db.org/xquery/template" at "tmpl.xqm";
+import module namespace dbutil="http://exist-db.org/xquery/dbutil" at "dbutils.xqm";
 
 (:~
     Edit the expath and repo app descriptors.

diff --git a/modules/docs.xql → modules/docs.xq b/modules/docs.xql → modules/docs.xq
diff --git a/modules/error-handler.xql → modules/error-handler.xq b/modules/error-handler.xql → modules/error-handler.xq
diff --git a/modules/find.xql → modules/find.xq b/modules/find.xql → modules/find.xq
diff --git a/modules/get-template.xql → modules/get-template.xq b/modules/get-template.xql → modules/get-template.xq
diff --git a/modules/git.xql → modules/git.xq b/modules/git.xql → modules/git.xq
@@ -1,7 +1,7 @@
 xquery version "3.0";
 
 import module namespace process="http://exist-db.org/xquery/process" at "java:org.exist.xquery.modules.process.ProcessModule";
-import module namespace apputil="http://exist-db.org/apps/eXide/apputil" at "util.xql";
+import module namespace apputil="http://exist-db.org/apps/eXide/apputil" at "util.xqm";
 
 declare namespace git="http://exist-db.org/eXide/git";
 

diff --git a/modules/load.xql → modules/load.xq b/modules/load.xql → modules/load.xq
diff --git a/modules/outline.xql → modules/outline.xq b/modules/outline.xql → modules/outline.xq
diff --git a/modules/run-test.xql → modules/run-test.xq b/modules/run-test.xql → modules/run-test.xq
@@ -1,7 +1,6 @@
 xquery version "3.0";
 
-import module namespace test="http://exist-db.org/xquery/xqsuite"
-at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
+import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xq";
 
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 

diff --git a/modules/search.xql → modules/search.xq b/modules/search.xql → modules/search.xq
@@ -1,7 +1,7 @@
 xquery version "3.1";
 
 
-import module namespace dbutil="http://exist-db.org/xquery/dbutil" at "dbutils.xql";
+import module namespace dbutil="http://exist-db.org/xquery/dbutil" at "dbutils.xqm";
 
 declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization";
 

diff --git a/modules/session.xql → modules/session.xq b/modules/session.xql → modules/session.xq
@@ -96,10 +96,10 @@ declare function local:store-in-session($results as item()*) as element(result)
     the results into the HTTP session for subsequent retrieval via individual 
     requests to this endpoint with a "num" parameter.
     
-    Error reporting must take into account how controller.xql handles 
+    Error reporting must take into account how controller.xq handles 
     errors thrown by XQueryServlet. From https://exist-db.org/exist/apps/doc/urlrewrite#xq-servlet:
     
-    > Since controller.xql sets xquery.report-errors to "yes", an error 
+    > Since controller.xq sets xquery.report-errors to "yes", an error 
     > in the XQuery will not result in an HTTP error. Instead, the string 
     > message of the error is enclosed in an element <error> which is 
     > then written to the response stream. The HTTP status is not changed.

diff --git a/modules/store.xql → modules/store.xq b/modules/store.xql → modules/store.xq
diff --git a/modules/synchronize.xql → modules/synchronize.xq b/modules/synchronize.xql → modules/synchronize.xq
@@ -19,7 +19,7 @@
 xquery version "1.0";
 
 import module namespace file="http://exist-db.org/xquery/file" at "java:org.exist.xquery.modules.file.FileModule";
-import module namespace apputil="http://exist-db.org/apps/eXide/apputil" at "util.xql";
+import module namespace apputil="http://exist-db.org/apps/eXide/apputil" at "util.xqm";
 
 declare function local:format-output($output) {
     if ($output//file:update) then

diff --git a/modules/tmpl.xql → modules/tmpl.xqm b/modules/tmpl.xql → modules/tmpl.xqm
diff --git a/modules/upload.xql → modules/upload.xq b/modules/upload.xql → modules/upload.xq
diff --git a/modules/util.xql → modules/util.xqm b/modules/util.xql → modules/util.xqm
diff --git a/modules/validate-xml.xql → modules/validate-xml.xq b/modules/validate-xml.xql → modules/validate-xml.xq
diff --git a/modules/view.xql → modules/view.xq b/modules/view.xql → modules/view.xq
diff --git a/pre-install.xql → pre-install.xq b/pre-install.xql → pre-install.xq
diff --git a/repo.xml b/repo.xml
@@ -8,7 +8,7 @@
     <copyright>true</copyright>
     <type>application</type>
     <target>eXide</target>
-    <prepare>pre-install.xql</prepare>
+    <prepare>pre-install.xq</prepare>
     <finish/>
     <permissions xmlns:repo="http://exist-db.org/xquery/repo" password="eXide" user="eXide" group="eXide" mode="0775"/>
     <changelog>

diff --git a/src/debuger.js b/src/debuger.js
@@ -57,7 +57,7 @@ eXide.XQueryDebuger = (function () {
         params.resource = this.existURL + this.doc.getPath();
 		$.ajax({
 			type: "POST",
-			url: "modules/debuger.xql",
+			url: "modules/debuger.xq",
 			data: params,
 			dataType: "json",
 			success: function (data) {

diff --git a/src/deployment.js b/src/deployment.js
@@ -35,7 +35,7 @@ eXide.edit.Projects = (function(oop) {
 
     Constr.prototype.getProject = function (collection, callback) {
         var $this = this;
-        $.getJSON("modules/deployment.xql", { info: collection }, function (data) {
+        $.getJSON("modules/deployment.xq", { info: collection }, function (data) {
             if (!data) {
                 if (typeof callback == "function") {
                     callback(null);
@@ -144,7 +144,7 @@ eXide.edit.PackageEditor = (function () {
 
                     var params = $this.syncDialog.find("form").serialize();
 					$("#synchronize-report").text("Synchronization in progress ...");
-					$("#synchronize-report").load("modules/synchronize.xql", params);
+					$("#synchronize-report").load("modules/synchronize.xq", params);
 				},
 				"Close": function () { $(this).dialog("close"); }
 			}
@@ -195,7 +195,7 @@ eXide.edit.PackageEditor = (function () {
 
                     $(statusAnchor).text("Synchronization in progress ...");
 					$(statusAnchor).load(
-                        "modules/synchronize.xql", 
+                        "modules/synchronize.xq", 
                         { collection : $this.currentProject.root, start :start},
                         function(responseText, status){if(status == 'success') {eXide.app.git.command($this.currentProject, 'commit', option);}}
                         );
@@ -215,7 +215,7 @@ eXide.edit.PackageEditor = (function () {
         var indentOnDownloadPackage = $("#indent-on-download-package").is(":checked");
         var expandXIncludesOnDownloadPackage = $("#expand-xincludes-on-download-package").is(":checked");
         var omitXMLDeclatarionOnDownloadPackage = $("#omit-xml-decl-on-download-package").is(":checked");
-        window.location.href = "modules/deployment.xql?download=true&collection=" + encodeURIComponent(collection) + "&indent=" + indentOnDownloadPackage + "&expand-xincludes=" + expandXIncludesOnDownloadPackage + "&omit-xml-decl=" + omitXMLDeclatarionOnDownloadPackage;
+        window.location.href = "modules/deployment.xq?download=true&collection=" + encodeURIComponent(collection) + "&indent=" + indentOnDownloadPackage + "&expand-xincludes=" + expandXIncludesOnDownloadPackage + "&omit-xml-decl=" + omitXMLDeclatarionOnDownloadPackage;
     };
 
 	/**
@@ -258,7 +258,7 @@ eXide.edit.PackageEditor = (function () {
                  dir: project.dir
              };
              $.ajax({
-                url: "modules/synchronize.xql",
+                url: "modules/synchronize.xq",
                 type: "GET",
                 data: params,
                 success: function(data) {

diff --git a/src/directory.js b/src/directory.js
@@ -76,7 +76,7 @@ eXide.edit.Directory = (function () {
 			}
 			return fn(d)
 		}
-		d3.json("modules/collections.xql?root=" + (sel.datum().key || "/db") + "&view=r", function(error, data){
+		d3.json("modules/collections.xq?root=" + (sel.datum().key || "/db") + "&view=r", function(error, data){
 			if(error)	{
 				return
 			}

diff --git a/src/eXide.js b/src/eXide.js
@@ -303,7 +303,7 @@ eXide.app = (function(util) {
                 return true;
             }
 			$.ajax({
-				url: "modules/load.xql",
+				url: "modules/load.xq",
 				dataType: 'text',
                 data: { "path": resource.path, "indent": indentOnOpen, "expand-xincludes": expandXIncludesOnOpen, "omit-xml-decl": omitXMLDeclatarionOnOpen },
 				success: function (data, status, xhr) {
@@ -458,7 +458,7 @@ eXide.app = (function(util) {
 				util.error("There are unsaved changes in the document. Please save it first.");
 				return;
 			}
-            window.location.href = "modules/load.xql?download=true&path=" + encodeURIComponent(doc.getPath()) + "&indent=" + indentOnDownload + "&expand-xincludes=" + expandXIncludesOnDownload + "&omit-xml-decl=" + omitXMLDeclatarionOnDownload;
+            window.location.href = "modules/load.xq?download=true&path=" + encodeURIComponent(doc.getPath()) + "&indent=" + indentOnDownload + "&expand-xincludes=" + expandXIncludesOnDownload + "&omit-xml-decl=" + omitXMLDeclatarionOnDownload;
 		},
 
 		runQuery: function(path, livePreview) {
@@ -995,7 +995,7 @@ eXide.app = (function(util) {
         },
 
         git: function() {
-            var gitUrl ='modules/git.xql',
+            var gitUrl ="modules/git.xq",
                 gitError = function(xhr, status) {
                            util.error("Failed to apply configuration: " + xhr.responseText);
                        },
@@ -1079,7 +1079,7 @@ eXide.app = (function(util) {
                     iframe.contentWindow.document.write("<html><body><p>Searching ...</p></body></html>");
                     iframe.contentWindow.document.close();
 
-                    iframe.src = "modules/search.xql?" + searchParams;
+                    iframe.src = "modules/search.xq?" + searchParams;
                 });
             });
         },
@@ -1247,7 +1247,7 @@ eXide.app = (function(util) {
                 dataType: "json",
                 open: function() {
                     $.ajax({
-                	    url: "modules/get-template.xql",
+                	    url: "modules/get-template.xq",
             			type: "POST",
             			success: function(data) {
                 		    templates = data;

diff --git a/src/editor.js b/src/editor.js
@@ -453,7 +453,7 @@ eXide.edit.Editor = (function () {
         }
         var self = this;
         $.ajax({
-    		url: "modules/get-template.xql",
+    		url: "modules/get-template.xq",
 			type: "POST",
 			data: { template: template },
 			dataType: "text",

diff --git a/src/resources.js b/src/resources.js
@@ -45,7 +45,7 @@ class DataSource {
 		if (options.filterModel.name) {
 			params.filter = options.filterModel.name.filter;
 		}
-		$.getJSON("modules/collections.xql", params, (json) => {
+		$.getJSON("modules/collections.xq", params, (json) => {
 			if (json && json.items) {
 				options.successCallback(json.items, json.total);
 				if (this.data.length === 0) {
@@ -309,7 +309,7 @@ eXide.browse.ResourceBrowser = (function () {
 				return;
 			}
 			params.column.colDef.editable = false;
-			$.getJSON('modules/collections.xql', {
+			$.getJSON("modules/collections.xq", {
 				target: params.data.name,
 				rename: this.oldValue,
 				root: this.dataSource.collection
@@ -344,7 +344,7 @@ eXide.browse.ResourceBrowser = (function () {
             		}
                     var params = $("form", dialog).serialize();
                     params = params + "&" + $.param({ "modify[]": resources});
-                    $.getJSON("modules/collections.xql", params,
+                    $.getJSON("modules/collections.xq", params,
                         function(data) {
                             $(dialog).dialog("close");
                             $this.reload();
@@ -450,7 +450,7 @@ eXide.browse.ResourceBrowser = (function () {
 			"<input type=\"text\" name=\"collection\" id=\"eXide-browse-collection-name\"/>",
 			function () {
 			    $("#eXide-browse-spinner").show();
-				$.getJSON("modules/collections.xql", {
+				$.getJSON("modules/collections.xq", {
 						create: $("#eXide-browse-collection-name").val(),
 						collection: $this.dataSource.collection
 					},
@@ -472,7 +472,7 @@ eXide.browse.ResourceBrowser = (function () {
 		eXide.util.Dialog.input("Confirm Deletion", "Are you sure you want to delete collection " + $this.selected + "?",
 			function () {
 			    $("#eXide-browse-spinner").show();
-				$.getJSON("modules/collections.xql", {
+				$.getJSON("modules/collections.xq", {
     					remove: $this.dataSource.collection
     				},
     				function (data) {
@@ -501,7 +501,7 @@ eXide.browse.ResourceBrowser = (function () {
 		eXide.util.Dialog.input("Confirm Deletion", "Are you sure you want to delete the selected resources?",
 				function () {
 				    $("#eXide-browse-spinner").show();
-					$.getJSON("modules/collections.xql", {
+					$.getJSON("modules/collections.xq", {
 							remove: resources,
 							root: $this.dataSource.collection
 						},
@@ -528,7 +528,7 @@ eXide.browse.ResourceBrowser = (function () {
             }
 		}
         if (resources.length > 0) {
-            $("#resource-properties-content").load("modules/collections.xql", { "properties": resources });
+            $("#resource-properties-content").load("modules/collections.xq", { "properties": resources });
             $("#resource-properties-dialog").dialog("open");
         }
     };
@@ -563,7 +563,7 @@ eXide.browse.ResourceBrowser = (function () {
         $.log("Pasting resources %o to %s in mode %s", this.clipboard, this.dataSource.collection, this.clipboardMode);
         var params = { root: this.dataSource.collection };
         params[this.clipboardMode] = this.clipboard;
-		$.getJSON("modules/collections.xql", params,
+		$.getJSON("modules/collections.xq", params,
 			function (data) {
 				$.log(data.status);
 				if (data.status == "fail") {

diff --git a/src/xml-helper.js b/src/xml-helper.js
@@ -95,7 +95,7 @@ eXide.edit.XMLModeHelper = (function () {
 		var $this = this;
 		$.ajax({
 			type: "PUT",
-			url: "modules/validate-xml.xql",
+			url: "modules/validate-xml.xq",
 			data: code,
 			contentType: "application/octet-stream",
 			dataType: "json",
@@ -138,7 +138,7 @@ eXide.edit.XMLModeHelper = (function () {
         $.log("Getting suggestions for %s", text);
         $.ajax({
     		type: "POST",
-			url: "modules/validate-xml.xql",
+			url: "modules/validate-xml.xq",
 			data: { 
                 xml: text,
                 row: row,
@@ -164,7 +164,7 @@ eXide.edit.XMLModeHelper = (function () {
                     eXide.util.message("Apply configuration and reindex...");
                     $.ajax({
                         type: "POST",
-                        url: "modules/apply-config.xql",
+                        url: "modules/apply-config.xq",
                         data: {
                             collection: doc.getBasePath(),
                             config: doc.getName()