You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/08/25 17:28:52 UTC
svn commit: r1620348 [2/2] - in /qpid/branches/0.30/qpid/java: ./
amqp-1-0-client-jms/ amqp-1-0-client-jms/example/ amqp-1-0-client-websocket/
amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/codec/
amqp-1-0-common/src/main/java/org/apache/qpid/a...
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java Mon Aug 25 15:28:50 2014
@@ -17,6 +17,7 @@
package org.apache.qpid.server.management.plugin.servlet.rest;
import java.io.IOException;
+import java.io.PrintWriter;
import java.io.Writer;
import java.security.AccessControlException;
import java.util.ArrayList;
@@ -564,9 +565,15 @@ public class RestServlet extends Abstrac
else
{
LOGGER.warn("Caught exception", e);
-
- // TODO
response.setStatus(HttpServletResponse.SC_CONFLICT);
+
+ response.setContentType("application/json");
+ response.setCharacterEncoding("UTF-8");
+ PrintWriter out = response.getWriter();
+ ObjectMapper mapper = new ObjectMapper();
+ mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
+ mapper.writeValue(out, Collections.singletonMap("errorMessage", e.getMessage()));
+
}
}
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css Mon Aug 25 15:28:50 2014
@@ -245,6 +245,21 @@ div .messages {
margin: 0px 0px 10px 5px;
}
+#errorDialog {
+ overflow: auto;
+ width: 400px;
+}
+
+.errorDialogErrorPrimary {
+ font-weight: bold;
+ margin-bottom: 10px;
+ max-width: 350px;
+}
+
+.errorDialogErrorSecondary {
+ font-style: italic;
+}
+
/* Required to keep queue type radio buttons on one line when dialog adds scrollbar */
#addQueue {
max-height: 350px;
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html Mon Aug 25 15:28:50 2014
@@ -108,17 +108,24 @@
</div>
<div class="dijitHidden">
- <div data-dojo-type="dijit.Dialog" data-dojo-props="title: 'Connection Error'" id="errorDialog">
- <div style="width:400px; overflow: auto">
- <div><strong><span id="errorMessage">An error occurred when communicating with the broker.</span></strong></div>
- <div><span id="statusMessage"></span></div>
- <div style="margin-top: 10px; margin-bottom: 8px"><span id="reloadMessage">Please try to reload.</span></div>
- <div id="errorDetails" data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Details', open:false">
- <span id="errorDetailsMessage"></span>
+ <div data-dojo-type="dijit.Dialog" data-dojo-props="title: 'Error'" id="errorDialog">
+ <div>
+ <div class="errorDialogErrorPrimary">
+ <span id="errorDialog.statusCode">000</span> - <span id="errorDialog.errorMessage">error</span>
+ </div>
+
+ <div class="clear" class="errorDialogErrorSecondary">
+ <div id="errorDialog.advice.reconnect">
+ Please login again and retry your operation.
+ </div>
+ <div id="errorDialog.advice.retry">
+ Please correct the problem and retry your operation.
+ </div>
</div>
</div>
<div class="dijitDialogPaneActionBar">
- <input type="button" value="Close" label="Close" dojoType="dijit.form.Button" onClick="dijit.byId('errorDialog').hide();"/>
+ <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(); document.location.href = '/';"/>
</div>
</div>
</div>
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js Mon Aug 25 15:28:50 2014
@@ -25,6 +25,7 @@ define(["dojo/_base/xhr",
"dojo/json",
"dojo/dom-construct",
"dojo/dom-geometry",
+ "dojo/dom-style",
"dojo/window",
"dojo/query",
"dojo/parser",
@@ -47,7 +48,7 @@ define(["dojo/_base/xhr",
"dojox/validate/web",
"dojo/domReady!"
],
- function (xhr, array, event, lang, json, dom, geometry, win, query, parser, Memory, entities, metadata, widgetconfigurer, registry) {
+ function (xhr, array, event, lang, json, dom, geometry, domStyle, win, query, parser, Memory, entities, metadata, widgetconfigurer, registry) {
var util = {};
if (Array.isArray) {
util.isArray = function (object) {
@@ -140,7 +141,7 @@ define(["dojo/_base/xhr",
function(error) {success = false; failureReason = error;});
if(!success )
{
- alert("Error:" + failureReason);
+ util.xhrErrorHandler(failureReason);
}
}
}
@@ -286,7 +287,8 @@ define(["dojo/_base/xhr",
}
else
{
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
+
}
return false;
}
@@ -331,36 +333,63 @@ define(["dojo/_base/xhr",
util.xhrErrorHandler = function(error)
{
+ const fallback = "Unexpected error - see server logs";
+ var statusCodeNode = dojo.byId("errorDialog.statusCode");
+ var errorMessageNode = dojo.byId("errorDialog.errorMessage");
+ var userMustReauth = false;
+
if (error)
{
if (error.hasOwnProperty("status"))
{
+ var hasMessage = error.hasOwnProperty("message");
+ var message;
+
if (error.status == 401)
{
- dojo.byId("statusMessage").innerHTML = "401 - Authentication required.";
+ message = hasMessage ? error.message : "Authentication required";
+ userMustReauth = true;
}
else if (error.status == 403)
{
- dojo.byId("statusMessage").innerHTML = "403 - Access denied.";
+ message = hasMessage ? error.message : "Forbidden";
+ userMustReauth = true;
}
else
{
- dojo.byId("statusMessage").innerHTML = "HTTP status code: " + error.status;
+ message = hasMessage ? error.message : fallback;
+
+ // Try for a more detail error sent by the Broker as json
+ if (error.hasOwnProperty("responseText"))
+ {
+ try
+ {
+ var errorObj = json.parse(error.responseText);
+ message = errorObj.hasOwnProperty("errorMessage") ? errorObj.errorMessage : errorMessageNode;
+ }
+ catch (e)
+ {
+ // Ignore
+ }
+ }
}
+
+ errorMessageNode.innerHTML = entities.encode(message ? message : fallback);
+ statusCodeNode.innerHTML = entities.encode(String(error.status));
+
+ dojo.byId("errorDialog.advice.retry").style.display = userMustReauth ? "none" : "block";
+ dojo.byId("errorDialog.advice.reconnect").style.display = userMustReauth ? "block" : "none";
+
+ domStyle.set(registry.byId("errorDialog.button.cancel").domNode, 'display', userMustReauth ? "none" : "block");
+ domStyle.set(registry.byId("errorDialog.button.relogin").domNode, 'display', userMustReauth ? "block" : "none");
+
}
else
{
- dojo.byId("statusMessage").innerHTML = "";
- }
- if (error.hasOwnProperty("message"))
- {
- dojo.byId("errorDetailsMessage").innerHTML = error.message;
- dojo.byId("errorDetails").style.display = "block";
- }
- else
- {
- dojo.byId("errorDetails").style.display = "none";
+ statusCodeNode.innerHTML = "";
+ errorMessageNode.innerHTML = fallback;
}
+
var dialog = dijit.byId("errorDialog");
if (!dialog.open)
{
@@ -412,7 +441,7 @@ define(["dojo/_base/xhr",
if (syncRequired && !success)
{
- alert("Error:" + failureReason);
+ util.xhrErrorHandler(failureReason);
}
return success;
}
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js Mon Aug 25 15:28:50 2014
@@ -87,7 +87,7 @@ define(["dojo/_base/xhr",
},
function(error) {that.success = false; that.failureReason = error;});
if(!this.success ) {
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
}
};
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js Mon Aug 25 15:28:50 2014
@@ -112,7 +112,7 @@ define(["dojo/_base/xhr",
},
function(error) {that.success = false; that.failureReason = error;});
if(!this.success ) {
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
}
};
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js Mon Aug 25 15:28:50 2014
@@ -288,7 +288,7 @@ define(["dojo/_base/xhr",
},
function(error) {that.success = false; that.failureReason = error;});
if(!this.success ) {
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
}
}
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js Mon Aug 25 15:28:50 2014
@@ -93,7 +93,7 @@ define(["dojo/_base/xhr",
},
function(error) {that.success = false; that.failureReason = error;});
if(!this.success ) {
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
}
};
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js Mon Aug 25 15:28:50 2014
@@ -153,7 +153,7 @@ define(["dojo/dom",
},
function(error) {that.success = false; that.failureReason = error;});
if(!this.success ) {
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
}
}
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js Mon Aug 25 15:28:50 2014
@@ -93,7 +93,7 @@ define(["dojo/dom",
},
function(error) {that.success = false; that.failureReason = error;});
if(!this.success ) {
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
}
}
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js Mon Aug 25 15:28:50 2014
@@ -103,7 +103,7 @@ define(["dojo/_base/xhr",
},
function(error) {that.success = false; that.failureReason = error;});
if(!this.success ) {
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
}
}
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js Mon Aug 25 15:28:50 2014
@@ -182,7 +182,7 @@ define(["dojo/_base/xhr",
headers: { "Content-Type": "application/json"},
putData: json.stringify(data),
load: function(x) {success = true;},
- error: function(error) {success = false; alert("Preferences Provider Error: " + error);}});
+ error: function(error) {success = false; util.xhrErrorHandler(error);}});
}
return success;
};
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js Mon Aug 25 15:28:50 2014
@@ -547,7 +547,7 @@ define(["dojo/_base/xhr",
},
function(error) {that.success = false; that.failureReason = error;});
if(!this.success ) {
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
}
}
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js Mon Aug 25 15:28:50 2014
@@ -154,7 +154,7 @@ define(["dojo/dom",
},
function(error) {that.success = false; that.failureReason = error;});
if(!this.success ) {
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
}
}
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js Mon Aug 25 15:28:50 2014
@@ -194,7 +194,7 @@ define(["dojo/_base/xhr",
}
else
{
- alert("Authentication Provider Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
return false;
}else{
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js Mon Aug 25 15:28:50 2014
@@ -28,6 +28,7 @@ define(["dojo/_base/connect",
"dojo/_base/declare",
"dojo/store/Memory",
"dijit/form/FilteringSelect",
+ "qpid/common/util",
"dijit/form/NumberSpinner", // required by the form
/* dojox/ validate resources */
"dojox/validate/us", "dojox/validate/web",
@@ -44,7 +45,7 @@ define(["dojo/_base/connect",
"dojox/grid/EnhancedGrid",
"dojo/data/ObjectStore",
"dojo/domReady!"],
- function (connect, xhr, dom, construct, win, registry, parser, array, event, json, lang, declare, Memory, FilteringSelect) {
+ function (connect, xhr, dom, construct, win, registry, parser, array, event, json, lang, declare, Memory, FilteringSelect, util) {
var noLocalValues = new Memory({
data: [
@@ -325,7 +326,7 @@ define(["dojo/_base/connect",
}
else
{
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
return false;
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js Mon Aug 25 15:28:50 2014
@@ -26,7 +26,8 @@ define(["dojo/_base/xhr",
"dojo/parser",
"dojo/_base/array",
"dojo/_base/event",
- 'dojo/_base/json',
+ "dojo/_base/json",
+ "qpid/common/util",
"dijit/form/NumberSpinner", // required by the form
/* dojox/ validate resources */
"dojox/validate/us", "dojox/validate/web",
@@ -41,7 +42,7 @@ define(["dojo/_base/xhr",
/* basic dojox classes */
"dojox/form/BusyButton", "dojox/form/CheckedMultiSelect",
"dojo/domReady!"],
- function (xhr, dom, construct, win, registry, parser, array, event, json) {
+ function (xhr, dom, construct, win, registry, parser, array, event, json, util) {
var addExchange = {};
@@ -123,7 +124,7 @@ define(["dojo/_base/xhr",
}
else
{
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
return false;
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js Mon Aug 25 15:28:50 2014
@@ -321,7 +321,7 @@ define(["dojo/_base/xhr",
}
else
{
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
return false;
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js Mon Aug 25 15:28:50 2014
@@ -178,7 +178,7 @@ define(["dojo/_base/xhr",
}
else
{
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
return false;
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js Mon Aug 25 15:28:50 2014
@@ -255,8 +255,7 @@ define(["dojo/_base/xhr",
}
else
{
- // What if VHN creation was successful but VH was not
- alert("Error:" + failureReason);
+ util.xhrErrorHandler(failureReason);
}
}
else
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js Mon Aug 25 15:28:50 2014
@@ -146,7 +146,7 @@ define(["dojo/_base/xhr",
},
function(error) {that.success = false; that.failureReason = error;});
if(!that.success ) {
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
}
}
@@ -210,7 +210,7 @@ define(["dojo/_base/xhr",
if(that.success === true) {
registry.byId("addUser").hide();
} else {
- alert("Error:" + that.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
return false;
@@ -267,7 +267,7 @@ define(["dojo/_base/xhr",
if(that.success === true) {
registry.byId("setPassword").hide();
} else {
- alert("Error:" + that.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
return false;
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js Mon Aug 25 15:28:50 2014
@@ -130,7 +130,7 @@ define(["dojo/_base/xhr",
}
else
{
- alert("Error:" + failureReason);
+ util.xhrErrorHandler(failureReason);
}
}
else
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js Mon Aug 25 15:28:50 2014
@@ -121,7 +121,7 @@ define(["dojo/_base/xhr",
}
else
{
- alert("Error:" + failureReason);
+ util.xhrErrorHandler(failureReason);
}
}
else
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js Mon Aug 25 15:28:50 2014
@@ -195,7 +195,7 @@ define(["dojo/_base/xhr",
},
function(error) {that.success = false; that.failureReason = error;});
if(!this.success ) {
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
}
}
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js Mon Aug 25 15:28:50 2014
@@ -26,7 +26,8 @@ define(["dojo/_base/xhr",
"dojo/parser",
"dojo/_base/array",
"dojo/_base/event",
- 'dojo/_base/json',
+ "dojo/_base/json",
+ "qpid/common/util",
"dijit/form/NumberSpinner", // required by the form
/* dojox/ validate resources */
"dojox/validate/us", "dojox/validate/web",
@@ -41,7 +42,7 @@ define(["dojo/_base/xhr",
/* basic dojox classes */
"dojox/form/BusyButton", "dojox/form/CheckedMultiSelect",
"dojo/domReady!"],
- function (xhr, dom, construct, win, registry, parser, array, event, json) {
+ function (xhr, dom, construct, win, registry, parser, array, event, json, util) {
var addGroupMember = {};
@@ -83,7 +84,7 @@ define(["dojo/_base/xhr",
}
else
{
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
return false;
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js Mon Aug 25 15:28:50 2014
@@ -163,7 +163,7 @@ define(["dojo/_base/xhr",
},
function(error) {that.success = false; that.failureReason = error;});
if(!that.success ) {
- alert("Error:" + this.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
}
}
@@ -238,7 +238,7 @@ define(["dojo/_base/xhr",
if(that.success === true) {
registry.byId("addGroup").hide();
} else {
- alert("Error:" + that.failureReason);
+ util.xhrErrorHandler(this.failureReason);
}
return false;
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java Mon Aug 25 15:28:50 2014
@@ -90,7 +90,7 @@ public class JMXManagementPluginImpl
_changeListener = new ChangeListener();
_pluginMBeanProvider = new PluginMBeansProvider();
_mBeanProviders = new HashSet<MBeanProvider>();
- QpidServiceLoader<MBeanProvider> qpidServiceLoader = new QpidServiceLoader<MBeanProvider>();
+ QpidServiceLoader qpidServiceLoader = new QpidServiceLoader();
for (MBeanProvider provider : qpidServiceLoader.instancesOf(MBeanProvider.class))
{
_mBeanProviders.add(provider);
Propchange: qpid/branches/0.30/qpid/java/broker-plugins/websocket/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 25 15:28:50 2014
@@ -0,0 +1,10 @@
+.idea
+derby.log
+*.ipr
+*.iws
+build
+*.iml
+*.iws
+work
+target
+release
Modified: qpid/branches/0.30/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ qpid/branches/0.30/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java Mon Aug 25 15:28:50 2014
@@ -25,6 +25,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
@@ -94,6 +97,9 @@ public class Main
private static final Option OPTION_MM_PASSWORD = OptionBuilder.withArgName("password").hasArg()
.withDescription("Set the password for the management mode user " + BrokerOptions.MANAGEMENT_MODE_USER_NAME).withLongOpt("management-mode-password").create("mmpass");
+ private static final Option OPTION_INITIAL_SYSTEM_PROPERTIES = OptionBuilder.withArgName("path").hasArg()
+ .withDescription("set the location of initial properties file to set otherwise unset system properties").withLongOpt("system-properties-file").create("props");
+
private static final Options OPTIONS = new Options();
static
@@ -114,6 +120,7 @@ public class Main
OPTIONS.addOption(OPTION_MM_HTTP_PORT);
OPTIONS.addOption(OPTION_MM_PASSWORD);
OPTIONS.addOption(OPTION_CONFIGURATION_PROPERTY);
+ OPTIONS.addOption(OPTION_INITIAL_SYSTEM_PROPERTIES);
}
protected CommandLine _commandLine;
@@ -168,7 +175,11 @@ public class Main
protected void execute() throws Exception
{
+ String initialProperties = _commandLine.getOptionValue(OPTION_INITIAL_SYSTEM_PROPERTIES.getOpt());
+ populateSystemPropertiesFromDefaults(initialProperties);
+
BrokerOptions options = new BrokerOptions();
+
String initialConfigLocation = _commandLine.getOptionValue(OPTION_INITIAL_CONFIGURATION_PATH.getOpt());
if (initialConfigLocation != null)
{
@@ -304,6 +315,28 @@ public class Main
}
}
+ private void populateSystemPropertiesFromDefaults(final String initialProperties) throws IOException
+ {
+ URL initialPropertiesLocation;
+ if(initialProperties == null)
+ {
+ initialPropertiesLocation = getClass().getClassLoader().getResource("system.properties");
+ }
+ else
+ {
+ initialPropertiesLocation = (new File(initialProperties)).toURI().toURL();
+ }
+
+ Properties props = new Properties();
+ props.load(initialPropertiesLocation.openStream());
+ Set<String> propertyNames = new HashSet<>(props.stringPropertyNames());
+ propertyNames.removeAll(System.getProperties().stringPropertyNames());
+ for(String propName : propertyNames)
+ {
+ System.setProperty(propName, props.getProperty(propName));
+ }
+ }
+
private void copyInitialConfigFile(final BrokerOptions options, final File destinationFile)
{
String initialConfigLocation = options.getInitialConfigurationLocation();
Propchange: qpid/branches/0.30/qpid/java/client/example/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 25 15:28:50 2014
@@ -1,2 +1,10 @@
+.idea
+derby.log
+*.ipr
+*.iws
+build
+*.iml
+*.iws
+work
target
-qpid-example.iml
+release
Modified: qpid/branches/0.30/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java (original)
+++ qpid/branches/0.30/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java Mon Aug 25 15:28:50 2014
@@ -31,6 +31,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -157,10 +158,10 @@ public abstract class AMQSession<C exten
/** Used to indicate that this session has been started at least once. */
private AtomicBoolean _startedAtLeastOnce = new AtomicBoolean(false);
- private final ConcurrentHashMap<String, TopicSubscriberAdaptor<C>> _subscriptions =
+ private final ConcurrentMap<String, TopicSubscriberAdaptor<C>> _subscriptions =
new ConcurrentHashMap<String, TopicSubscriberAdaptor<C>>();
- private final ConcurrentHashMap<C, String> _reverseSubscriptionMap = new ConcurrentHashMap<C, String>();
+ private final ConcurrentMap<C, String> _reverseSubscriptionMap = new ConcurrentHashMap<C, String>();
private final Lock _subscriberDetails = new ReentrantLock(true);
private final Lock _subscriberAccess = new ReentrantLock(true);
@@ -200,7 +201,7 @@ public abstract class AMQSession<C exten
private CopyOnWriteArrayList<C> _removedConsumers = new CopyOnWriteArrayList<C>();
/** Provides a count of consumers on destinations, in order to be able to know if a destination has consumers. */
- private ConcurrentHashMap<Destination, AtomicInteger> _destinationConsumerCount =
+ private ConcurrentMap<Destination, AtomicInteger> _destinationConsumerCount =
new ConcurrentHashMap<Destination, AtomicInteger>();
/**
@@ -312,7 +313,7 @@ public abstract class AMQSession<C exten
public static final class IdToConsumerMap<C extends BasicMessageConsumer>
{
private final BasicMessageConsumer[] _fastAccessConsumers = new BasicMessageConsumer[16];
- private final ConcurrentHashMap<Integer, C> _slowAccessConsumers = new ConcurrentHashMap<Integer, C>();
+ private final ConcurrentMap<Integer, C> _slowAccessConsumers = new ConcurrentHashMap<Integer, C>();
public C get(int id)
{
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java Mon Aug 25 15:28:50 2014
@@ -21,15 +21,16 @@
package org.apache.qpid.framing;
-import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A short string is a representation of an AMQ Short String
@@ -97,7 +98,7 @@ public final class AMQShortString implem
return new AMQShortString(_data, from+_offset, to-from);
}
- private static final ConcurrentHashMap<AMQShortString, AMQShortString> _globalInternMap =
+ private static final ConcurrentMap<AMQShortString, AMQShortString> _globalInternMap =
new ConcurrentHashMap<AMQShortString, AMQShortString>();
private static final Logger _logger = LoggerFactory.getLogger(AMQShortString.class);
Modified: qpid/branches/0.30/qpid/java/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/pom.xml?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/pom.xml (original)
+++ qpid/branches/0.30/qpid/java/pom.xml Mon Aug 25 15:28:50 2014
@@ -65,7 +65,7 @@
<profile.test.excludes>Excludes JavaExcludes ${profile}.excludes ${profile.specific.excludes}</profile.test.excludes>
<profile.specific.excludes>JavaTransientExcludes Java010Excludes</profile.specific.excludes>
<profile.broker.version>v0_10</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>false</profile.broker.persistent>
<profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
<profile.broker.clean.between.tests>true</profile.broker.clean.between.tests>
@@ -174,7 +174,7 @@
<echo>[profile.specific.excludes] ${profile.specific.excludes}</echo>
<echo>[profile.test.excludes] ${profile.test.excludes}</echo>
<echo>[profile.broker.version] ${profile.broker.version}</echo>
- <echo>[profile.qpid.broker_default_amqp_protocol_excludes] ${profile.qpid.broker_default_amqp_protocol_excludes}</echo>
+ <echo>[profile.test.amqp_port_protocols] ${profile.test.amqp_port_protocols}</echo>
<echo>[profile.broker.persistent] ${profile.broker.persistent}</echo>
<echo>[profile.virtualhostnode.type] ${profile.virtualhostnode.type}</echo>
<echo>[profile.virtualhostnode.context.blueprint] ${profile.virtualhostnode.context.blueprint}</echo>
@@ -241,7 +241,7 @@
<broker.command.windows>${profile.broker.command.windows}</broker.command.windows>
<test.excludes>${profile.test.excludes}</test.excludes>
<broker.version>${profile.broker.version}</broker.version>
- <qpid.broker_default_amqp_protocol_excludes>${profile.qpid.broker_default_amqp_protocol_excludes}</qpid.broker_default_amqp_protocol_excludes>
+ <test.amqp_port_protocols>${profile.test.amqp_port_protocols}</test.amqp_port_protocols>
<broker.persistent>${profile.broker.persistent}</broker.persistent>
<virtualhostnode.type>${profile.virtualhostnode.type}</virtualhostnode.type>
<virtualhostnode.context.blueprint>${profile.virtualhostnode.context.blueprint}</virtualhostnode.context.blueprint>
@@ -400,7 +400,7 @@
<profile>java-mms.0-10</profile>
<profile.specific.excludes>JavaTransientExcludes Java010Excludes</profile.specific.excludes>
<profile.broker.version>v0_10</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>false</profile.broker.persistent>
<profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
@@ -419,7 +419,7 @@
<profile>java-mms.0-9-1</profile>
<profile.specific.excludes>JavaTransientExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
<profile.broker.version>v0_9_1</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>false</profile.broker.persistent>
<profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
@@ -438,7 +438,7 @@
<profile>java-mms.0-9</profile>
<profile.specific.excludes>JavaTransientExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
<profile.broker.version>v0_9</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10,AMQP_0_9_1</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>false</profile.broker.persistent>
<profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
@@ -457,7 +457,7 @@
<profile>java-bdb.0-10</profile>
<profile.specific.excludes>JavaPersistentExcludes Java010Excludes JavaBDBExcludes</profile.specific.excludes>
<profile.broker.version>v0_10</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
@@ -476,7 +476,7 @@
<profile>java-bdb.0-9-1</profile>
<profile.specific.excludes>JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes</profile.specific.excludes>
<profile.broker.version>v0_9_1</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
@@ -495,7 +495,7 @@
<profile>java-bdb.0-9</profile>
<profile.specific.excludes>JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes</profile.specific.excludes>
<profile.broker.version>v0_9</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10,AMQP_0_9_1</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
@@ -514,7 +514,7 @@
<profile>java-dby-mem.0-10</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes Java010Excludes</profile.specific.excludes>
<profile.broker.version>v0_10</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
@@ -533,7 +533,7 @@
<profile>java-dby-mem.0-9-1</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
<profile.broker.version>v0_9_1</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
@@ -552,7 +552,7 @@
<profile>java-dby-mem.0-9</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
<profile.broker.version>v0_9</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10,AMQP_0_9_1</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
@@ -571,7 +571,7 @@
<profile>java-dby.0-10</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes Java010Excludes</profile.specific.excludes>
<profile.broker.version>v0_10</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
@@ -590,7 +590,7 @@
<profile>java-dby.0-9-1</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
<profile.broker.version>v0_9_1</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
@@ -609,7 +609,7 @@
<profile>java-dby.0-9</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
<profile.broker.version>v0_9</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10,AMQP_0_9_1</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
@@ -633,7 +633,7 @@
<profile>java-json.0-9-1</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaJsonExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
<profile.broker.version>v0_9_1</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"DERBY","storePath":"${dollar.sign}{json:QPID_WORK}${dollar.sign}{json:file.separator}${dollar.sign}{this:name}${dollar.sign}{json:file.separator}derby"}</profile.virtualhostnode.context.blueprint>
@@ -652,7 +652,7 @@
<profile>java-json.0-10</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaJsonExcludes XAExcludes Java010Excludes</profile.specific.excludes>
<profile.broker.version>v0_10</profile.broker.version>
- <profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"DERBY","storePath":"${dollar.sign}{QPID_WORK}/${dollar.sign}{this:name}/derby"}</profile.virtualhostnode.context.blueprint>
Propchange: qpid/branches/0.30/qpid/java/qpid-perftests-systests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 25 15:28:50 2014
@@ -0,0 +1,10 @@
+.idea
+derby.log
+*.ipr
+*.iws
+build
+*.iml
+*.iws
+work
+target
+release
Propchange: qpid/branches/0.30/qpid/java/qpid-systests-parent/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 25 15:28:50 2014
@@ -0,0 +1,10 @@
+.idea
+derby.log
+*.ipr
+*.iws
+build
+*.iml
+*.iws
+work
+target
+release
Modified: qpid/branches/0.30/qpid/java/systests/etc/config-systests.json
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/systests/etc/config-systests.json?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/systests/etc/config-systests.json (original)
+++ qpid/branches/0.30/qpid/java/systests/etc/config-systests.json Mon Aug 25 15:28:50 2014
@@ -41,7 +41,8 @@
"ports" : [ {
"name" : "amqp",
"authenticationProvider" : "plain",
- "port" : "${test.port}"
+ "port" : "${test.port}",
+ "protocols" : "${test.amqp_port_protocols}"
}, {
"name" : "http",
"authenticationProvider" : "plain",
Modified: qpid/branches/0.30/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/branches/0.30/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Mon Aug 25 15:28:50 2014
@@ -142,6 +142,8 @@ public class QpidBrokerTestCase extends
public static final int DEFAULT_HTTP_MANAGEMENT_PORT_VALUE = 8080;
public static final int DEFAULT_HTTPS_MANAGEMENT_PORT_VALUE = 8443;
+ public static final String TEST_AMQP_PORT_PROTOCOLS_PROPERTY="test.amqp_port_protocols";
+
// values
protected static final String JAVA = "java";
protected static final String CPP = "cpp";
@@ -559,6 +561,8 @@ public class QpidBrokerTestCase extends
setSystemProperty("test.port.ssl");
setSystemProperty("test.port.alt");
setSystemProperty("test.port.alt.ssl");
+ setSystemProperty("test.amqp_port_protocols");
+
setSystemProperty("virtualhostnode.type");
setSystemProperty("virtualhostnode.context.blueprint");
Propchange: qpid/branches/0.30/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1618478
Modified: qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (original)
+++ qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java Mon Aug 25 15:28:50 2014
@@ -20,6 +20,15 @@
*/
package org.apache.qpid.server;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.codehaus.jackson.map.ObjectMapper;
+
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.configuration.ClientProperties;
import org.apache.qpid.framing.ProtocolVersion;
@@ -43,11 +52,41 @@ public class SupportedProtocolVersionsTe
// No-op, we call super.setUp() from test methods after appropriate config overrides
}
- private void clearProtocolSupportManipulations()
+ private void clearProtocolSupportManipulations() throws Exception
{
//Remove the QBTC provided protocol manipulations, giving only the protocols which default to enabled
setSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES, null);
setSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_INCLUDES, null);
+ setSystemProperty(QpidBrokerTestCase.TEST_AMQP_PORT_PROTOCOLS_PROPERTY, getProtocolsAsString(getAllAmqpProtocols()));
+ }
+
+ private Collection<Protocol> getAllAmqpProtocols() throws Exception
+ {
+ Collection<Protocol> protocols = new HashSet<>();
+ for(Protocol p : Protocol.values())
+ {
+ if(p.getProtocolType() == Protocol.ProtocolType.AMQP)
+ {
+ protocols.add(p);
+ }
+ }
+
+ return protocols;
+ }
+
+ private String getProtocolsWithExclusions(Protocol... excludes) throws Exception
+ {
+ Set<Protocol> protocols = new HashSet<>(getAllAmqpProtocols());
+ protocols.removeAll(Arrays.asList(excludes));
+ return getProtocolsAsString(protocols);
+ }
+
+ private String getProtocolsAsString(final Collection<Protocol> protocols) throws IOException
+ {
+ ObjectMapper mapper = new ObjectMapper();
+ StringWriter stringWriter = new StringWriter();
+ mapper.writeValue(stringWriter, protocols);
+ return stringWriter.toString();
}
/**
@@ -89,11 +128,7 @@ public class SupportedProtocolVersionsTe
public void testDisabling010and10() throws Exception
{
- clearProtocolSupportManipulations();
-
- //disable 0-10 and 1-0 support
- setSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES,
- Protocol.AMQP_1_0 + "," + Protocol.AMQP_0_10);
+ setSystemProperty(QpidBrokerTestCase.TEST_AMQP_PORT_PROTOCOLS_PROPERTY, getProtocolsWithExclusions(Protocol.AMQP_1_0, Protocol.AMQP_0_10));
super.setUp();
@@ -110,8 +145,8 @@ public class SupportedProtocolVersionsTe
clearProtocolSupportManipulations();
//disable 0-10 support, and set the default unsupported protocol initiation reply to 0-9
- setSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES,
- Protocol.AMQP_1_0 + "," + Protocol.AMQP_0_10);
+ setSystemProperty(QpidBrokerTestCase.TEST_AMQP_PORT_PROTOCOLS_PROPERTY, getProtocolsWithExclusions(Protocol.AMQP_1_0, Protocol.AMQP_0_10));
+
setSystemProperty(BrokerProperties.PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY, "v0_9");
super.setUp();
Propchange: qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1618478
Modified: qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java (original)
+++ qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java Mon Aug 25 15:28:50 2014
@@ -65,6 +65,7 @@ public class BrokerRestHttpsTest extends
Asserts.assertAttributesPresent(brokerDetails, BrokerModel.getInstance().getTypeRegistry().getAttributeNames(Broker.class),
Broker.PROCESS_PID,
+ Broker.CONFIDENTIAL_CONFIGURATION_ENCRYPTION_PROVIDER,
ConfiguredObject.TYPE,
ConfiguredObject.CREATED_BY,
ConfiguredObject.CREATED_TIME,
Modified: qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java (original)
+++ qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java Mon Aug 25 15:28:50 2014
@@ -204,6 +204,7 @@ public class BrokerRestTest extends Qpid
Asserts.assertAttributesPresent(brokerDetails, BrokerModel.getInstance().getTypeRegistry().getAttributeNames(
Broker.class),
Broker.PROCESS_PID,
+ Broker.CONFIDENTIAL_CONFIGURATION_ENCRYPTION_PROVIDER,
ConfiguredObject.TYPE,
ConfiguredObject.CREATED_BY,
ConfiguredObject.CREATED_TIME,
Modified: qpid/branches/0.30/qpid/java/test-profiles/CPPExcludes
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/test-profiles/CPPExcludes?rev=1620348&r1=1620347&r2=1620348&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/test-profiles/CPPExcludes (original)
+++ qpid/branches/0.30/qpid/java/test-profiles/CPPExcludes Mon Aug 25 15:28:50 2014
@@ -199,3 +199,6 @@ org.apache.qpid.server.queue.QueueMessag
// QPID-4429 : C++ Broker does not enforce max frame size negotiation rules as per the spec
org.apache.qpid.transport.MaxFrameSizeTest#*
+
+// QPID-6000 : Tests Java specific message compression functionality, and uses the REST API to test it
+org.apache.qpid.systest.MessageCompressionTest#*
Propchange: qpid/branches/0.30/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1618473
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org