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:12:13 UTC
svn commit: r1620337 [2/2] - in /qpid/branches/0.30/qpid/java: ./
amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/
bdbstore/src/main/java/org/apa...
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.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/MessageContentServlet.java?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java Mon Aug 25 15:12:10 2014
@@ -60,7 +60,7 @@ public class MessageContentServlet exten
{
response.setContentType(finder.getMimeType());
response.setContentLength((int) finder.getSize());
- response.getOutputStream().write(finder.getContent());
+ getOutputStream(request, response).write(finder.getContent());
}
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.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/MessageServlet.java?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java Mon Aug 25 15:12:10 2014
@@ -18,7 +18,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;
import java.util.HashMap;
@@ -85,7 +85,7 @@ public class MessageServlet extends Abst
response.setDateHeader ("Expires", 0);
response.setContentType("application/json");
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request,response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
mapper.writeValue(writer, messageFinder.getMessageObject());
@@ -119,7 +119,7 @@ public class MessageServlet extends Abst
response.setHeader("Pragma","no-cache");
response.setDateHeader ("Expires", 0);
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request,response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
mapper.writeValue(writer, messages);
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.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/MetaDataServlet.java?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java Mon Aug 25 15:12:10 2014
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.management.plugin.servlet.rest;
-import java.io.BufferedWriter;
import java.io.IOException;
import java.io.Writer;
import java.util.Collection;
@@ -69,7 +68,7 @@ public class MetaDataServlet extends Abs
classToDataMap.put(clazz.getSimpleName(), processCategory(clazz));
}
- final Writer writer = new BufferedWriter(response.getWriter());
+ final Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
mapper.writeValue(writer, classToDataMap);
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=1620337&r1=1620336&r2=1620337&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:12:10 2014
@@ -16,7 +16,6 @@
*/
package org.apache.qpid.server.management.plugin.servlet.rest;
-import java.io.BufferedWriter;
import java.io.IOException;
import java.io.Writer;
import java.security.AccessControlException;
@@ -327,7 +326,7 @@ public class RestServlet extends Abstrac
depth, actuals, includeSystemContext));
}
- final Writer writer = new BufferedWriter(response.getWriter());
+ Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
mapper.writeValue(writer, output);
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.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/SaslServlet.java?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java Mon Aug 25 15:12:10 2014
@@ -21,7 +21,7 @@
package org.apache.qpid.server.management.plugin.servlet.rest;
import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.Writer;
import java.net.SocketAddress;
import java.security.Principal;
import java.security.SecureRandom;
@@ -100,7 +100,7 @@ public class SaslServlet extends Abstrac
outputObject.put("mechanisms", (Object) mechanisms);
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
@@ -268,7 +268,7 @@ public class SaslServlet extends Abstrac
Map<String, Object> outputObject = new LinkedHashMap<String, Object>();
outputObject.put("challenge", new String(Base64.encodeBase64(challenge)));
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
@@ -290,7 +290,7 @@ public class SaslServlet extends Abstrac
outputObject.put("id", id);
outputObject.put("challenge", new String(Base64.encodeBase64(challenge)));
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.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/StructureServlet.java?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java Mon Aug 25 15:12:10 2014
@@ -17,7 +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.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
@@ -55,7 +55,7 @@ public class StructureServlet extends Ab
Map<String,Object> structure = generateStructure(getBroker(), Broker.class);
- final PrintWriter writer = response.getWriter();
+ final Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
mapper.writeValue(writer, structure);
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.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/UserPreferencesServlet.java?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java Mon Aug 25 15:12:10 2014
@@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
+
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.PreferencesProvider;
@@ -53,15 +54,15 @@ public class UserPreferencesServlet exte
String[] pathElements = getPathInfoElements(request);
if (pathElements != null && pathElements.length > 1)
{
- getUserPreferences(pathElements[0], pathElements[1], response);
+ getUserPreferences(pathElements[0], pathElements[1], request, response);
}
else
{
- getUserList(pathElements, response);
+ getUserList(pathElements, request, response);
}
}
- private void getUserPreferences(String authenticationProviderName, String userId, HttpServletResponse response)
+ private void getUserPreferences(String authenticationProviderName, String userId, HttpServletRequest request, HttpServletResponse response)
throws IOException
{
try
@@ -83,10 +84,10 @@ public class UserPreferencesServlet exte
}
preferences = preferencesProvider.getPreferences(userId);
- sendJsonResponse(preferences, response);
+ sendJsonResponse(preferences, request, response);
}
- private void getUserList(String[] pathElements, HttpServletResponse response) throws IOException
+ private void getUserList(String[] pathElements, HttpServletRequest request, HttpServletResponse response) throws IOException
{
List<Map<String, Object>> users = null;
try
@@ -98,7 +99,7 @@ public class UserPreferencesServlet exte
LOGGER.debug("Bad preferences request", e);
response.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
}
- sendJsonResponse(users, response);
+ sendJsonResponse(users, request, response);
}
private PreferencesProvider getPreferencesProvider(String authenticationProviderName)
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Mon Aug 25 15:12:10 2014
@@ -349,10 +349,14 @@ define(["dojo/_base/xhr",
gotoButton: true,
maxPageStep: 4,
position: "bottom"
- },
- indirectSelection: true
+ }
}};
+ function isActiveVH(item)
+ {
+ return item && item.virtualhosts && item.virtualhosts[0].state=="ACTIVE";
+ }
+
that.vhostsGrid =
new UpdatableStore(that.brokerData.virtualhostnodes, query(".broker-virtualhosts")[0],
[
@@ -373,20 +377,27 @@ define(["dojo/_base/xhr",
formatter: function(item){
return item && item.virtualhosts? item.virtualhosts[0].type: "N/A";
}
- },
- { name: "Connections", field: "_item", width: "10%",
+ },
+ { name: "Connections", field: "_item", width: "8%",
+ formatter: function(item){
+ return isActiveVH(item)? item.virtualhosts[0].statistics.connectionCount: "N/A";
+ }
+ },
+ { name: "Queues", field: "_item", width: "8%",
formatter: function(item){
- return item && item.virtualhosts? item.virtualhosts[0].statistics.connectionCount: 0;
+ return isActiveVH(item)? item.virtualhosts[0].statistics.queueCount: "N/A";
}
},
- { name: "Queues", field: "_item", width: "10%",
+ { name: "Exchanges", field: "_item", width: "8%",
formatter: function(item){
- return item && item.virtualhosts? item.virtualhosts[0].statistics.queueCount: 0;
+ return isActiveVH(item)? item.virtualhosts[0].statistics.exchangeCount: "N/A";
}
},
- { name: "Exchanges", field: "_item", width: "10%",
+ {
+ name: "Default", field: "_item", width: "6%",
formatter: function(item){
- return item && item.virtualhosts? item.virtualhosts[0].statistics.exchangeCount: 0;
+ var val = item && item.virtualhosts? item.virtualhosts[0].name: null;
+ return "<input type='radio' disabled='disabled' "+(val == that.brokerData.defaultVirtualHost ? "checked='checked'": "")+" />";
}
}
], function(obj) {
@@ -424,6 +435,7 @@ define(["dojo/_base/xhr",
if (data.length == 1)
{
that.showVirtualHost(data[0], brokerObj);
+ that.vhostsGrid.grid.selection.clear();
}
});
@@ -434,6 +446,7 @@ define(["dojo/_base/xhr",
{
var item = data[0];
that.controller.show("virtualhostnode", item.name, brokerObj, item.id);
+ that.vhostsGrid.grid.selection.clear();
}
}
);
@@ -457,6 +470,7 @@ define(["dojo/_base/xhr",
var item = data[0];
util.sendRequest("api/latest/virtualhostnode/" + encodeURIComponent(item.name),
"PUT", {desiredState: "ACTIVE"});
+ that.vhostsGrid.grid.selection.clear();
}
});
@@ -473,6 +487,7 @@ define(["dojo/_base/xhr",
{
util.sendRequest("api/latest/virtualhostnode/" + encodeURIComponent(item.name),
"PUT", {desiredState: "STOPPED"});
+ that.vhostsGrid.grid.selection.clear();
}
}
});
@@ -486,6 +501,7 @@ define(["dojo/_base/xhr",
var host = item.virtualhosts[0];
util.sendRequest("api/latest/virtualhost/" + encodeURIComponent(item.name) + "/" + encodeURIComponent(host.name),
"PUT", {desiredState: "ACTIVE"});
+ that.vhostsGrid.grid.selection.clear();
}
});
@@ -501,11 +517,12 @@ define(["dojo/_base/xhr",
{
util.sendRequest("api/latest/virtualhost/" + encodeURIComponent(item.name) + "/" + encodeURIComponent(host.name),
"PUT", {desiredState: "STOPPED"});
+ that.vhostsGrid.grid.selection.clear();
}
}
});
-
- gridProperties.selectionMode="extended";
+ gridProperties.selectionMode = "extended";
+ gridProperties.plugins.indirectSelection = true;
that.portsGrid =
new UpdatableStore(that.brokerData.ports, query(".broker-ports")[0],
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js Mon Aug 25 15:12:10 2014
@@ -123,7 +123,16 @@ define(["dojo/_base/xhr",
name: "sessionTimeout"
});
}
+ }, {
+ name: "compressResponses",
+ createWidget: function(plugin) {
+ return new dijit.form.CheckBox({
+ required: false,
+ checked: plugin.compressResponses,
+ label: "Compress responses:",
+ name: "compressResponses"});
}
+ }
];
var data = this.managementHttpUpdater.pluginData;
util.showSetAttributesDialog(
@@ -143,6 +152,8 @@ define(["dojo/_base/xhr",
this.sessionTimeout = query(".sessionTimeout", node)[0];
this.httpsSaslAuthenticationEnabled = query(".httpsSaslAuthenticationEnabled", node)[0];
this.httpSaslAuthenticationEnabled = query(".httpSaslAuthenticationEnabled", node)[0];
+ this.compressResponses = query(".compressResponses", node)[0];
+
}
ManagementHttpUpdater.prototype.update = function(syncRequest)
@@ -161,6 +172,7 @@ define(["dojo/_base/xhr",
that.httpsBasicAuthenticationEnabled.innerHTML = showBoolean(that.pluginData.httpsBasicAuthenticationEnabled);
that.httpsSaslAuthenticationEnabled.innerHTML = showBoolean(that.pluginData.httpsSaslAuthenticationEnabled);
that.httpSaslAuthenticationEnabled.innerHTML = showBoolean(that.pluginData.httpSaslAuthenticationEnabled);
+ that.compressResponses.innerHTML = showBoolean(that.pluginData.compressResponses);
that.sessionTimeout.innerHTML = that.pluginData.sessionTimeout;
});
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html Mon Aug 25 15:12:10 2014
@@ -40,6 +40,10 @@
<div class="formLabel-labelCell">Session timeout (s):</div>
<div class="sessionTimeout"></div>
</div>
+ <div class="clear">
+ <div class="formLabel-labelCell">Compress content:</div>
+ <div class="compressResponses"></div>
+ </div>
</div>
<br/>
<div class="dijitDialogPaneActionBar">
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html Mon Aug 25 15:12:10 2014
@@ -19,15 +19,13 @@
<div>
<div class="clear">
- <div class="formLabel-labelCell tableContainer-labelCell">Message store path*:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell">Message store path:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="addVirtualHost.storePath"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'storePath',
placeHolder: 'path/to/store',
- required: true,
- missingMessage: 'Store path must be supplied',
title: 'Enter message store path'" />
</div>
</div>
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html Mon Aug 25 15:12:10 2014
@@ -20,15 +20,13 @@
<div>
<div class="clear">
- <div class="formLabel-labelCell tableContainer-labelCell">Message store path*:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell">Message store path:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="editVirtualHost.storePath"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'storePath',
placeHolder: 'path/to/store',
- required: true,
- missingMessage: 'Store path must be supplied',
disabled: true,
title: 'Enter message store path'" />
</div>
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html Mon Aug 25 15:12:10 2014
@@ -20,15 +20,13 @@
<div>
<div class="clear">
- <div class="formLabel-labelCell tableContainer-labelCell">Configuration store path*:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell">Configuration store path:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="editVirtualHostNode.storePath"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'storePath',
placeHolder: 'path/to/store',
- required: true,
- missingMessage: 'Store path must be supplied',
title: 'Enter configuration store path'" />
</div>
</div>
Modified: qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html (original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html Mon Aug 25 15:12:10 2014
@@ -20,15 +20,13 @@
-->
<div>
<div class="clear">
- <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell">Store path:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="addVirtualHostNode.jsonStorePath"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'storePath',
placeHolder: 'path/to/store',
- required: true,
- missingMessage: 'Store path must be supplied',
title: 'Enter store path'" />
</div>
</div>
Modified: qpid/branches/0.30/qpid/java/client/example/src/main/java/org/apache/qpid/example/Hello.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/client/example/src/main/java/org/apache/qpid/example/Hello.java?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/client/example/src/main/java/org/apache/qpid/example/Hello.java (original)
+++ qpid/branches/0.30/qpid/java/client/example/src/main/java/org/apache/qpid/example/Hello.java Mon Aug 25 15:12:10 2014
@@ -21,10 +21,18 @@
package org.apache.qpid.example;
-import javax.jms.*;
+import java.io.InputStream;
+import java.util.Properties;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
import javax.naming.Context;
import javax.naming.InitialContext;
-import java.util.Properties;
public class Hello
@@ -42,9 +50,10 @@ public class Hello
private void runTest()
{
- try {
+ try (InputStream resourceAsStream = this.getClass().getResourceAsStream("hello.properties"))
+ {
Properties properties = new Properties();
- properties.load(this.getClass().getResourceAsStream("hello.properties"));
+ properties.load(resourceAsStream);
Context context = new InitialContext(properties);
ConnectionFactory connectionFactory = (ConnectionFactory) context.lookup("qpidConnectionfactory");
Modified: qpid/branches/0.30/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java (original)
+++ qpid/branches/0.30/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java Mon Aug 25 15:12:10 2014
@@ -42,10 +42,10 @@ public class AbstractRunner
{
Context context = null;
- try
+ try(FileInputStream inStream = new FileInputStream(getJndiConfig()))
{
final Properties properties = new Properties();
- properties.load(new FileInputStream(getJndiConfig()));
+ properties.load(inStream);
context = new InitialContext(properties);
}
catch (Exception e)
@@ -71,4 +71,4 @@ public class AbstractRunner
{
return _cliOptions;
}
-}
\ No newline at end of file
+}
Modified: qpid/branches/0.30/qpid/java/qpid-systests-parent/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/qpid-systests-parent/pom.xml?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/qpid-systests-parent/pom.xml (original)
+++ qpid/branches/0.30/qpid/java/qpid-systests-parent/pom.xml Mon Aug 25 15:12:10 2014
@@ -74,20 +74,6 @@
</dependencies>
<build>
- <testSourceDirectory>src/main/java</testSourceDirectory>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <excludes>
- <exclude>**/*.java/</exclude>
- </excludes>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
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=1620337&r1=1620336&r2=1620337&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:12:10 2014
@@ -848,7 +848,7 @@ public class QpidBrokerTestCase extends
* @param brokerPort broker port
* @param virtualHostNodeName virtual host node name
*/
- protected void createTestVirtualHostNode(int brokerPort, String virtualHostNodeName)
+ protected void createTestVirtualHostNode(int brokerPort, String virtualHostNodeName, boolean withBlueprint)
{
String storeType = getTestProfileVirtualHostNodeType();
String storeDir = null;
@@ -871,15 +871,24 @@ public class QpidBrokerTestCase extends
attributes.put(JsonVirtualHostNode.STORE_PATH, storeDir);
}
- final String blueprint = getTestProfileVirtualHostNodeBlueprint();
+ if (withBlueprint)
+ {
+ final String blueprint = getTestProfileVirtualHostNodeBlueprint();
- attributes.put(ConfiguredObject.CONTEXT, Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR,
- blueprint));
+ attributes.put(ConfiguredObject.CONTEXT,
+ Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR,
+ blueprint));
+ }
int port = getPort(brokerPort);
getBrokerConfiguration(port).addObjectConfiguration(VirtualHostNode.class, attributes);
}
+ protected void createTestVirtualHostNode(int brokerPort, String virtualHostNodeName)
+ {
+ createTestVirtualHostNode(brokerPort, virtualHostNodeName, true);
+ }
+
/**
* Set a System property that is to be applied only to the external test
* broker.
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:r1617325
Modified: qpid/branches/0.30/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java (original)
+++ qpid/branches/0.30/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java Mon Aug 25 15:12:10 2014
@@ -85,62 +85,61 @@ public class SpawnedBrokerHolder impleme
try
{
Process p = Runtime.getRuntime().exec(new String[] {"wmic", "process", "list"});
- BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
- String line;
- String headers = reader.readLine();
- int processIdOffset = headers.indexOf(" ProcessId") + 1;
- int parentProcessIdOffset = headers.indexOf(" ParentProcessId") + 1;
- String parentProcess = null;
- Map<String,List<String>> parentProcessMap = new HashMap<String, List<String>>();
-
- while ((line = reader.readLine()) != null)
+ try(BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream())))
{
- if(line.length() > processIdOffset)
+ String line;
+ String headers = reader.readLine();
+ int processIdOffset = headers.indexOf(" ProcessId") + 1;
+ int parentProcessIdOffset = headers.indexOf(" ParentProcessId") + 1;
+ String parentProcess = null;
+ Map<String, List<String>> parentProcessMap = new HashMap<String, List<String>>();
+
+ while ((line = reader.readLine()) != null)
{
- String processIdStr = line.substring(processIdOffset);
- processIdStr = processIdStr.substring(0, processIdStr.indexOf(' '));
- processIdStr = processIdStr.trim();
-
- String parentProcessIdStr = line.substring(parentProcessIdOffset);
- parentProcessIdStr = parentProcessIdStr.substring(0, parentProcessIdStr.indexOf(' '));
- parentProcessIdStr = parentProcessIdStr.trim();
- if(parentProcessIdStr.length() > 0 && (parentProcess == null || parentProcess.equals(parentProcessIdStr)))
+ if (line.length() > processIdOffset)
{
- List<String> children = parentProcessMap.get(parentProcessIdStr);
- if(children == null)
+ String processIdStr = line.substring(processIdOffset);
+ processIdStr = processIdStr.substring(0, processIdStr.indexOf(' '));
+ processIdStr = processIdStr.trim();
+
+ String parentProcessIdStr = line.substring(parentProcessIdOffset);
+ parentProcessIdStr = parentProcessIdStr.substring(0, parentProcessIdStr.indexOf(' '));
+ parentProcessIdStr = parentProcessIdStr.trim();
+ if (parentProcessIdStr.length() > 0 && (parentProcess == null || parentProcess.equals(
+ parentProcessIdStr)))
{
- children = new ArrayList<String>();
- parentProcessMap.put(parentProcessIdStr,children);
+ List<String> children = parentProcessMap.get(parentProcessIdStr);
+ if (children == null)
+ {
+ children = new ArrayList<String>();
+ parentProcessMap.put(parentProcessIdStr, children);
+ }
+ children.add(processIdStr);
+ }
+ if (line.substring(0, _brokerCommand.length() + 7)
+ .toLowerCase()
+ .contains(_brokerCommand.toLowerCase()))
+ {
+ parentProcess = processIdStr;
}
- children.add(processIdStr);
- }
- if(line.substring(0,_brokerCommand.length()+7).toLowerCase().contains(_brokerCommand.toLowerCase()))
- {
- parentProcess = processIdStr;
- }
- }
- if(parentProcess != null)
- {
- List<String> children = parentProcessMap.get(parentProcess);
- if(children != null)
+ }
+ if (parentProcess != null)
{
- for(String child : children)
+ List<String> children = parentProcessMap.get(parentProcess);
+ if (children != null)
{
- p = Runtime.getRuntime().exec(new String[] {"taskkill", "/PID", child, "/T", "/F"});
- reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
- while((line = reader.readLine()) != null)
+ for (String child : children)
{
+ p = Runtime.getRuntime().exec(new String[]{"taskkill", "/PID", child, "/T", "/F"});
+ consumeAllOutput(p);
}
}
+ p = Runtime.getRuntime().exec(new String[]{"taskkill", "/PID", parentProcess, "/T", "/F"});
+ consumeAllOutput(p);
}
- p = Runtime.getRuntime().exec(new String[] {"taskkill", "/PID", parentProcess, "/T", "/F"});
- reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
- while((line = reader.readLine()) != null)
- {
- }
- }
+ }
}
}
catch (IOException e)
@@ -149,6 +148,19 @@ public class SpawnedBrokerHolder impleme
}
}
+ private static void consumeAllOutput(Process p) throws IOException
+ {
+ try(InputStreamReader inputStreamReader = new InputStreamReader(p.getInputStream()))
+ {
+ try (BufferedReader reader = new BufferedReader(inputStreamReader))
+ {
+ while (reader.readLine() != null)
+ {
+ }
+ }
+ }
+ }
+
@Override
public void kill()
{
Propchange: qpid/branches/0.30/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
------------------------------------------------------------------------------
Merged /qpid/branches/java-broker-0-10/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r795950-829653
Merged /qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1576683-1583556
Merged /qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1616716,1616736,1616742,1616791-1616796,1616806,1616808,1616811,1616813,1616816,1616818,1616861,1616899,1616902,1616977,1617012,1617158-1617160,1617235,1617238,1617275,1617301,1617322-1617325,1617467,1617503,1617774,1618218,1619065
Merged /qpid/branches/0.5.x-dev/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r886720-886722,887145,892761,894875,916304,916325,930288,931179
Merged /qpid/trunk/qpid/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r796646-796653
Merged /qpid/branches/java-broker-amqp-1-0-management/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1562456-1569102
Merged /qpid/branches/qpid-2935/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1061302-1072333
Merged /qpid/branches/0.5.x-dev/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r886720-886722
Merged /qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1584338-1584926
Merged /qpid/branches/java-broker-vhost-refactor/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1493674-1494547
Merged /qpid/branches/java-network-refactor/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r805429-821809
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=1620337&r1=1620336&r2=1620337&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:12:10 2014
@@ -197,3 +197,5 @@ org.apache.qpid.server.queue.QueueBindTe
// Tests queue message durability settings which are a Java Broker specific feature
org.apache.qpid.server.queue.QueueMessageDurabilityTest#*
+// QPID-4429 : C++ Broker does not enforce max frame size negotiation rules as per the spec
+org.apache.qpid.transport.MaxFrameSizeTest#*
Propchange: qpid/branches/0.30/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1617323
Modified: qpid/branches/0.30/qpid/java/test-profiles/JavaJsonExcludes
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/test-profiles/JavaJsonExcludes?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/test-profiles/JavaJsonExcludes (original)
+++ qpid/branches/0.30/qpid/java/test-profiles/JavaJsonExcludes Mon Aug 25 15:12:10 2014
@@ -22,5 +22,5 @@ org.apache.qpid.server.store.berkeleydb.
org.apache.qpid.server.store.SplitStoreTest#*
org.apache.qpid.systest.rest.acl.VirtualHostACLTest#*
org.apache.qpid.systest.rest.VirtualHostNodeRestTest#testCreateAndDeleteVirtualHostNode
-org.apache.qpid.systest.rest.VirtualHostRestTest#testPutCreateVirtualHostUsingProfileNodeType
+org.apache.qpid.systest.rest.VirtualHostRestTest#testPutCreateProvidedVirtualHost
org.apache.qpid.server.BrokerStartupTest#testStartupWithNoConfig
Modified: qpid/branches/0.30/qpid/java/test-profiles/JavaTransientExcludes
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/test-profiles/JavaTransientExcludes?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/test-profiles/JavaTransientExcludes (original)
+++ qpid/branches/0.30/qpid/java/test-profiles/JavaTransientExcludes Mon Aug 25 15:12:10 2014
@@ -55,7 +55,6 @@ org.apache.qpid.systest.management.jmx.Q
org.apache.qpid.test.unit.client.MaxDeliveryCountTest#testWhenBrokerIsRestartedAfterEnqeuingMessages
-org.apache.qpid.systest.rest.VirtualHostRestTest#testPutCreateVirtualHostUsingProfileNodeType
org.apache.qpid.systest.rest.VirtualHostRestTest#testRecoverVirtualHostInDesiredStateStoppedWithDescription
org.apache.qpid.systest.rest.VirtualHostRestTest#testMutateStateOfVirtualHostWithQueuesAndMessages
Propchange: qpid/branches/0.30/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1617325
Modified: qpid/branches/0.30/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java?rev=1620337&r1=1620336&r2=1620337&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java (original)
+++ qpid/branches/0.30/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java Mon Aug 25 15:12:10 2014
@@ -21,21 +21,22 @@
package org.apache.qpid.tools;
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.client.AMQConnectionFactory;
-import org.apache.qpid.jms.FailoverPolicy;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import java.util.Properties;
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.LinkedList;
-import java.io.IOException;
-import java.io.File;
-import java.io.FileInputStream;
+
+import org.apache.qpid.client.AMQConnectionFactory;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.jms.FailoverPolicy;
public class JNDICheck
{
@@ -79,9 +80,9 @@ public class JNDICheck
// Load JNDI properties
Properties properties = new Properties();
- try
+ try(FileInputStream propertiesStream = new FileInputStream(new File(propertyFile)))
{
- properties.load(new FileInputStream(new File(propertyFile)));
+ properties.load(propertiesStream);
}
catch (IOException e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org