From 06ed45c0f581128a97bbed5ad211fe37be21edf5 Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Sat, 13 Apr 2019 18:49:43 -0400
Subject: [PATCH 1/2] Revert "Repair for eXist 5.0.0"

This reverts commit a2c7227f9b80e203615214e50bd8895e5404928b.

# Conflicts:
#	expath-pkg.xml.tmpl
---
 src/main/xar-resources/index.html             | 31 ++++++++++---------
 .../xar-resources/resources/scripts/util.js   |  6 ++--
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/main/xar-resources/index.html b/src/main/xar-resources/index.html
index 906e569..c272437 100644
--- a/src/main/xar-resources/index.html
+++ b/src/main/xar-resources/index.html
@@ -34,7 +34,7 @@ <h1>
                             Active DB Processes
                         </div>
                         <div class="info-box-number" id="jmx-brokers">
-                            <span data-bind="text: jmx.Database.ActiveBrokers">?</span> of
+                            <span data-bind="text: jmx.Database.ActiveBrokers">?</span> of 
                             <span data-bind="text: jmx.Database.TotalBrokers">?</span>
                         </div>
                     </div>
@@ -77,7 +77,7 @@ <h1>
                         <span class="info-box-text">
                             Waiting Threads
                         </span>
-                        <span class="info-box-number" data-bind="text: $data.jmx.LockTable.Attempting.length || 0">?</span>
+                        <span class="info-box-number" data-bind="text: $data.jmx.LockManager.WaitingThreads().length || 0">?</span>
                     </div>
                 </div>
             </div><!-- ./col -->
@@ -294,7 +294,7 @@ <h3 class="box-title">Cache Usage</h3>
                             </button>
                         </div>
                     </div><!-- /.box-header -->
-                    <div class="box-body jmx-cache-manager" data-bind="with: findByName($data.jmx.CacheManager, 'org.exist.management.exist:type=CacheManager')">
+                    <div class="box-body jmx-cache-manager" data-bind="with: findByName($data.jmx.CacheManager(), 'org.exist.management.exist:type=CacheManager')">
                         <div class="clearfix">
                             <span class="pull-left">Cache Manager</span>
                             <small class="pull-right">
@@ -304,7 +304,7 @@ <h3 class="box-title">Cache Usage</h3>
                             <div class="progress-bar progress-bar-success progress-cache" data-bind="style: {width: Math.round($data.CurrentSize() / ($data.MaxTotal() / 100)) + '%'}"/>
                         </div>
                     </div>
-                    <div class="box-body jmx-cache-manager" data-bind="with: findByName($data.jmx.CacheManager, 'org.exist.management.exist:type=CollectionCacheManager')">
+                    <div class="box-body jmx-cache-manager" data-bind="with: findByName($data.jmx.CacheManager(), 'org.exist.management.exist:type=CollectionCacheManager')">
                         <div class="clearfix">
                             <span class="pull-left">Collection Cache Manager</span>
                             <small class="pull-right">
@@ -519,24 +519,25 @@ <h3 class="box-title">Waiting Threads</h3>
                         <table class="table table-striped">
                             <thead>
                                 <tr>
-                                    <th>Resource</th>
+                                    <th>Thread</th>
                                     <th>Waiting for</th>
+                                    <th>Resource</th>
+                                    <th>Lock mode</th>
+                                    <th>Lock type</th>
                                 </tr>
                             </thead>
-                            <tbody data-bind="visible: !$data.jmx.LockTable.Acquired() || $data.jmx.LockTable.Acquired().length == 0">
+                            <tbody data-bind="visible: $data.jmx.LockManager.WaitingThreads().length == 0">
                                 <tr>
                                     <td colspan="5">No waiting threads</td>
                                 </tr>
                             </tbody>
-                            <tbody data-bind="foreach: jmx.LockTable.Acquired">
+                            <tbody data-bind="foreach: jmx.LockManager.WaitingThreads">
                                 <tr>
-                                    <td data-bind="text: key"/>
-                                    <td data-bind="foreach: value">
-                                        <span data-bind="text: key"/>
-                                        (<span data-bind="foreach: value">
-                                            <span data-bind="text: key"/>
-                                        </span>)
-                                    </td>
+                                    <td data-bind="text: waitingThread"/>
+                                    <td data-bind="text: owner"/>
+                                    <td data-bind="text: id"/>
+                                    <td data-bind="text: lockMode"/>
+                                    <td data-bind="text: lockType"/>
                                 </tr>
                             </tbody>
                         </table>
@@ -591,4 +592,4 @@ <h3 class="box-title">Active Threads</h3>
     <script type="text/javascript" src="resources/scripts/ion.rangeSlider.js"/>
     <script type="text/javascript" src="resources/scripts/util.js"/>
     <script type="text/javascript" src="resources/scripts/exadmin.js"/>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/main/xar-resources/resources/scripts/util.js b/src/main/xar-resources/resources/scripts/util.js
index 69f5604..855150f 100644
--- a/src/main/xar-resources/resources/scripts/util.js
+++ b/src/main/xar-resources/resources/scripts/util.js
@@ -63,9 +63,9 @@ JMX.util = (function() {
                 }
             }
             if (data.jmx.LockManager) {
-                var waiting = data.jmx.LockTable.Attempting;
+                var waiting = data.jmx.LockManager.WaitingThreads;
                 if (!waiting || !waiting.length) {
-                    data.jmx.LockTable.Attempting = [];
+                    data.jmx.LockManager.WaitingThreads = [];
                 }
             }
             if (data.jmx.Database) {
@@ -77,4 +77,4 @@ JMX.util = (function() {
             return data;
         }
     }
-}());
+}());
\ No newline at end of file

From 8b6d115774064230c1efd6292417d53e21844448 Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Tue, 23 Apr 2019 21:44:45 -0400
Subject: [PATCH 2/2] Set semver-min and -max, add release notes

---
 pom.xml          |  6 ++++--
 xar-assembly.xml | 12 +++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5ad5e4e..8906bee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>org.exist-db.apps</groupId>
     <artifactId>monex</artifactId>
-    <version>0.9.18-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
 
     <name>Monex</name>
     <description>An application for monitoring, profiling and inspecting a running eXist-db instance.</description>
@@ -63,7 +63,9 @@
         <project.build.source>1.8</project.build.source>
         <project.build.target>1.8</project.build.target>
 
-        <exist.version>5.0.0-SNAPSHOT</exist.version>
+        <exist.version>4.6.1</exist.version>
+        <min.version>3.7.0-SNAPSHOT</min.version>
+        <max.version>4.99.0</max.version>
 
         <!-- used in the EXPath Package Descriptor -->
         <package-name>http://exist-db.org/apps/monex</package-name>
diff --git a/xar-assembly.xml b/xar-assembly.xml
index d8d4f53..15592b0 100644
--- a/xar-assembly.xml
+++ b/xar-assembly.xml
@@ -18,7 +18,7 @@
     <tag>application</tag>
     <category id="apps">Applications</category>
 
-    <dependency processor="http://exist-db.org" semver-min="${exist.version}" />
+    <dependency processor="http://exist-db.org" semver-min="${min.version}" semver-max="${max.version}" />
     <dependency package="http://exist-db.org/apps/shared"/>
 
     <!-- Collection inside /db/apps where xar-resources will be copied to -->
@@ -147,6 +147,16 @@
                 <li>Repair for eXist 5.0.0 release</li>
             </ul>
         </change>
+        <change version="1.0.0">
+            <ul xmlns="http://www.w3.org/1999/xhtml">
+                <li>Version note: Due to changes in JMX output in eXist 5.x, Monex is now split into a 1.x branch for users of eXist 4.x and the develop branch will carry Monex 2.0 releases for users of eXist 5+</li>
+                <li>Improved: Monex is now built with maven</li>
+                <li>Improved: Removed dependency on Jetty. Monex now uses the standard Java WebSocket API.</li>
+                <li>Improved: Declared front end dependencies via npm.</li>
+                <li>Removed: HipChat module</li>
+                <li>Fixed: Javascript errors when loading various pages</li>
+            </ul>
+        </change>
     </changelog>
 
 </package>