Merge pull request #99 from adamretter/hotfix/product-name

Get product details from JMX output

pom.xml

@@ -13,7 +13,7 @@
 
  <groupId>org.exist-db.apps</groupId>
  <artifactId>monex</artifactId>
- <version>2.0.3</version>
+ <version>2.0.4</version>
 
  <name>Monex</name>
  <description>An application for monitoring, profiling and inspecting a running eXist-db instance.</description>
@@ -64,7 +64,7 @@
  <project.build.target>1.8</project.build.target>
 
  <exist.version>5.0.0-SNAPSHOT</exist.version>
- <min.version>5.0.0-RC8</min.version>
+ <min.version>5.0.0</min.version>
  <jackson.version>2.9.9</jackson.version>
  <websocket.api.version>1.1</websocket.api.version>
 

src/main/xar-resources/details.html

@@ -277,12 +277,12 @@ <h3 class="box-title">System Information</h3>
  </thead>
  <tbody>
  <tr>
- <td>eXist Version:</td>
- <td data-bind="text: jmx.SystemInfo.ExistVersion"/>
+ <td><span data-bind="text: jmx.SystemInfo.ProductName"/> Version:</td>
+ <td data-bind="text: jmx.SystemInfo.ProductVersion"/>
  </tr>
  <tr>
- <td>eXist Build:</td>
- <td data-bind="text: jmx.SystemInfo.ExistBuild"/>
+ <td><span data-bind="text: jmx.SystemInfo.ProductName"/> Build:</td>
+ <td data-bind="text: jmx.SystemInfo.ProductBuild"/>
  </tr>
  <tr>
  <td>Operating System:</td>
@@ -387,4 +387,4 @@ <h3 class="box-title">Recent Queries <small data-bind="visible: $data.jmx.Proces
  <script type="text/javascript" src="resources/scripts/util.js"/>
  <script type="text/javascript" src="resources/scripts/exadmin.js"/>
  <script type="text/javascript" src="resources/scripts/details.js"/>
-</div>
+</div>

src/main/xar-resources/index.html

@@ -217,12 +217,12 @@ <h3 class="box-title">System Information</h3>
  </thead>
  <tbody>
  <tr>
- <td>eXist Version:</td>
- <td data-bind="text: jmx.SystemInfo.ExistVersion"/>
+ <td><span data-bind="text: jmx.SystemInfo.ProductName"/> Version:</td>
+ <td data-bind="text: jmx.SystemInfo.ProductVersion"/>
  </tr>
  <tr>
- <td>eXist Build:</td>
- <td data-bind="text: jmx.SystemInfo.ExistBuild"/>
+ <td><span data-bind="text: jmx.SystemInfo.ProductName"/> Build:</td>
+ <td data-bind="text: jmx.SystemInfo.ProductBuild"/>
  </tr>
  <tr>
  <td>Operating System:</td>

xar-assembly.xml

@@ -162,6 +162,21 @@
  <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>
+ <change version="1.0.1">
+ <ul xmlns="http://www.w3.org/1999/xhtml">
+ <li>Fixed: Installation of monex's test collection &amp; instances config files</li>
+ </ul>
+ </change>
  <change version="2.0.0">
  <ul xmlns="http://www.w3.org/1999/xhtml">
  <li>Version note: Due to changes in JMX output in eXist 5, Monex is now split into a 1.x branch for users of eXist 4.x and the master branch will carry Monex 2.x releases for users of eXist 5+.</li>
@@ -187,6 +202,12 @@
  <li>Fixed: Removed deprecated draft map constructor for compatibility with forthcoming eXist 5.0.0-RC8</li>
  </ul>
  </change>
+ <change version="2.0.4">
+ <ul xmlns="http://www.w3.org/1999/xhtml">
+ <li>Fixed: Moved integration tests into the source repository - <a href="https://github.com/eXist-db/monex/pull/96">#96</a></li>
+ <li>Fixed: Read product details from JMX output - <a href="https://github.com/eXist-db/monex/pull/99">#99</a></li>
+ </ul>
+ </change>
  </changelog>
 
 </package>