Author: orudyy
Date: Fri Mar 31 12:50:52 2017
New Revision: 1789672
URL: http://svn.apache.org/viewvc?rev=1789672&view=rev
Log:
QPID-7729: [Java Broker, WMC] Fix evaluation of context path in the Web
Management Console
merged from trunk using
svn merge -c 1789526,1789670,1789671 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/index.html
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/login.html
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/logout.html
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 31 12:50:52 2017
@@ -9,6 +9,6 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735,1785117,1785158,1785269-1785270,1785311,1785675,1785679,1785854,1785936,1785950,1785988,1786188-1786189,1786342,1786657,1786690,1786723,1786914,1786923,1787052
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735,1785117,1785158,1785269-1785270,1785311,1785675,1785679,1785854,1785936,1785950,1785988,1786188-1786189,1786342,1786657,1786690,1786723,1786914,1786923,1787052,1789526,1789670-1789671
/qpid/qpid-jms-amqp-0-x/trunk:1785989
/qpid/trunk/qpid:796646-796653
Modified:
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/index.html
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/index.html?rev=1789672&r1=1789671&r2=1789672&view=diff
==============================================================================
---
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/index.html
(original)
+++
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/index.html
Fri Mar 31 12:50:52 2017
@@ -17,7 +17,7 @@
-->
<html lang="en">
<head>
- <meta charset="utf-8">
+ <meta charset="utf-8"/>
<title>Qpid Management</title>
<link rel="icon" type="image/png" href="images/qpid-favicon.png"/>
<link rel="stylesheet" href="dojo/dojo/resources/dojo.css"/>
@@ -33,7 +33,7 @@
<link rel="stylesheet" href="dojo/dojo/resources/dnd.css"/>
<link rel="stylesheet"
href="dojo/dojox/layout/resources/GridContainer.css"/>
<link rel="stylesheet"
href="dojo/dojox/layout/resources/DndGridContainer.css"/>
- <link rel="stylesheet" href="dojo/dojox/widget/Portlet/Portlet.css">
+ <link rel="stylesheet" href="dojo/dojox/widget/Portlet/Portlet.css"/>
<link rel="stylesheet" href="css/common.css" media="screen"/>
<script>
function getContextPath()
@@ -44,7 +44,7 @@
var firstSlashPos = documentURL.indexOf("/",
documentURL.indexOf("//") + 2);
if (managementPageStart > firstSlashPos)
{
- contextPath = documentURL.substring(firstSlashPos,
managementPageStart);
+ contextPath = documentURL.substring(firstSlashPos,
managementPageStart + 1);
}
return contextPath;
}
@@ -82,9 +82,7 @@
};
</script>
- <script src="dojo/dojo/dojo.js">
- </script>
-
+ <script src="dojo/dojo/dojo.js"></script>
<script>
var qpidManagementHelper = null;
var management = null;
@@ -113,7 +111,6 @@
management = qpidManagementHelper.management;
});
</script>
-
</head>
<body class="claro qpid">
@@ -209,10 +206,12 @@
</div>
</div>
<div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
- <input type="button" id="errorDialog.button.cancel"
value="Cancel" label="Cancel"
- dojoType="dijit.form.Button"
onClick="dijit.byId('errorDialog').hide();"/>
- <input type="button" id="errorDialog.button.relogin"
value="Login" label="Login"
- dojoType="dijit.form.Button"
onClick="dijit.byId('errorDialog').hide(); window.location='/';"/>
+ <input type="button" id="errorDialog.button.cancel"
value="Cancel"
+ data-dojo-type="dijit.form.Button"
+ data-dojo-props="label:
'Cancel',onClick:function(){dijit.byId('errorDialog').hide();}"/>
+ <input type="button" id="errorDialog.button.relogin"
value="Login"
+ data-dojo-type="dijit.form.Button"
+
data-dojo-props="label:'Login',onClick:function(){dijit.byId('errorDialog').hide();location.reload();}"/>
</div>
</div>
</div>
Modified:
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js?rev=1789672&r1=1789671&r2=1789672&view=diff
==============================================================================
---
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
(original)
+++
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
Fri Mar 31 12:50:52 2017
@@ -79,7 +79,7 @@ define(["dojo/query",
},
showAPI: function ()
{
- openWindow("/apidocs", 'Qpid REST API');
+ openWindow(getContextPath() + "apidocs", 'Qpid REST API');
},
showQueryCreateDialog: function (e)
{
Modified:
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/login.html
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/login.html?rev=1789672&r1=1789671&r2=1789672&view=diff
==============================================================================
---
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/login.html
(original)
+++
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/login.html
Fri Mar 31 12:50:52 2017
@@ -32,7 +32,7 @@
var firstSlashPos = documentURL.indexOf("/",
documentURL.indexOf("//") + 2);
if (managementPageStart > firstSlashPos)
{
- contextPath = documentURL.substring(firstSlashPos,
managementPageStart);
+ contextPath = documentURL.substring(firstSlashPos,
managementPageStart + 1);
}
return contextPath;
}
Modified:
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/logout.html
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/logout.html?rev=1789672&r1=1789671&r2=1789672&view=diff
==============================================================================
---
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/logout.html
(original)
+++
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/logout.html
Fri Mar 31 12:50:52 2017
@@ -32,7 +32,7 @@
var firstSlashPos = documentURL.indexOf("/",
documentURL.indexOf("//") + 2);
if (managementPageStart > firstSlashPos)
{
- contextPath = documentURL.substring(firstSlashPos,
managementPageStart);
+ contextPath = documentURL.substring(firstSlashPos,
managementPageStart + 1);
}
return contextPath;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
