svn commit: r1381622 - /qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
Author: shuston
Date: Thu Sep 6 14:26:23 2012
New Revision: 1381622
URL: http://svn.apache.org/viewvc?rev=1381622&view=rev
Log:
Fix signed/unsigned compiler warning. NO-JIRA
Modified:
qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
Modified: qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp?rev=1381622&r1=1381621&r2=1381622&view=diff
==
--- qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp Thu Sep 6 14:26:23 2012
@@ -249,7 +249,7 @@ VOID WINAPI ServiceMain(DWORD argc, LPTS
if (all_argc > 0) {
int i = 0;
all_argv[i++] = argc > 0 ? argv[0] : svcName.c_str();
- for (int j = 0; j < cmdline_args.size(); ++j)
+ for (size_t j = 0; j < cmdline_args.size(); ++j)
all_argv[i++] = cmdline_args[j].c_str();
for (DWORD k = 1; k < argc; ++k)
all_argv[i++] = argv[k];
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1381625 - /qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java
Author: rajith
Date: Thu Sep 6 14:41:29 2012
New Revision: 1381625
URL: http://svn.apache.org/viewvc?rev=1381625&view=rev
Log:
QPID-4288 The pid and platform info are now fetched in a static block
and the cached value is returned.
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java?rev=1381625&r1=1381624&r2=1381625&view=diff
==
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java
Thu Sep 6 14:41:29 2012
@@ -49,7 +49,11 @@ public class ConnectionStartProperties
public static final String SESSION_FLOW = "qpid.session_flow";
-public static int getPID()
+public static int _pid;
+
+public static final String _platformInfo;
+
+static
{
RuntimeMXBean rtb = ManagementFactory.getRuntimeMXBean();
String processName = rtb.getName();
@@ -57,23 +61,20 @@ public class ConnectionStartProperties
{
try
{
-return
Integer.parseInt(processName.substring(0,processName.indexOf('@')));
+_pid =
Integer.parseInt(processName.substring(0,processName.indexOf('@')));
}
catch(Exception e)
{
LOGGER.warn("Unable to get the PID due to error",e);
-return -1;
+_pid = -1;
}
}
else
{
LOGGER.warn("Unable to get the PID due to unsupported format : " +
processName);
-return -1;
+_pid = -1;
}
-}
-public static String getPlatformInfo()
-{
StringBuilder fullSystemInfo = new
StringBuilder(System.getProperty("java.runtime.name"));
fullSystemInfo.append(", ");
fullSystemInfo.append(System.getProperty("java.runtime.version"));
@@ -88,6 +89,16 @@ public class ConnectionStartProperties
fullSystemInfo.append(", ");
fullSystemInfo.append(System.getProperty("sun.os.patch.level"));
-return fullSystemInfo.toString();
+_platformInfo = fullSystemInfo.toString();
+}
+
+public static int getPID()
+{
+return _pid;
+}
+
+public static String getPlatformInfo()
+{
+return _platformInfo;
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1381637 - in /qpid/trunk/qpid/java: broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/ broker-plugins/management-http/src/main/java/org/apache/qpid/ser
Author: kwall
Date: Thu Sep 6 15:22:04 2012
New Revision: 1381637
URL: http://svn.apache.org/viewvc?rev=1381637&view=rev
Log:
QPID-4255: Add "log out" functionality to web UI
* Added logout link to the Web Management UI (displayed once a user is logged
in).
* Added operation logging (open/close event) to report the fact that the user
has logged in, logged out (or gone away i.e. web session timeout).
* Allow Jetty web session timeout to be overridden from the config.xml
Work of Robbie Gemmell and myself.
Added:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogoutServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java?rev=1381637&r1=1381636&r2=1381637&view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java
Thu Sep 6 15:22:04 2012
@@ -33,6 +33,7 @@ import org.apache.qpid.server.logging.me
import org.apache.qpid.server.management.plugin.servlet.DefinedFileServlet;
import org.apache.qpid.server.management.plugin.servlet.FileServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.LogRecordsServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.LogoutServlet;
import
org.apache.qpid.server.management.plugin.servlet.rest.MessageContentServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.MessageServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
@@ -67,10 +68,12 @@ import org.eclipse.jetty.util.ssl.SslCon
public class Management
{
-private static final String OPERATIONAL_LOGGING_NAME = "Web";
-
private final Logger _logger = Logger.getLogger(Management.class);
+public static final String ENTRY_POINT_PATH = "/management";
+
+private static final String OPERATIONAL_LOGGING_NAME = "Web";
+
private final Broker _broker;
private final Collection _servers = new ArrayList();
@@ -125,6 +128,7 @@ public class Management
+ (sslPort == -1 ? "" : " HTTPS port " + sslPort));
}
+IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
Server server = new Server();
if (port != -1)
@@ -140,7 +144,6 @@ public class Management
if (sslPort != -1)
{
-IApplicationRegistry appRegistry =
ApplicationRegistry.getInstance();
String keyStorePath = getKeyStorePath(appRegistry);
SslContextFactory factory = new SslContextFactory();
@@ -178,7 +181,8 @@ public class Management
root.addServlet(new ServletHolder(new SaslServlet(_broker)),
"/rest/sasl");
-root.addServlet(new ServletHolder(new
DefinedFileServlet("index.html")), "/management");
+root.addServlet(new ServletHolder(new
DefinedFileServlet("index.html")), ENTRY_POINT_PATH);
+root.addServlet(new ServletHolder(new LogoutServlet()), "/logout");
root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.js");
root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.css");
@@ -193,7 +197,7 @@ pu
svn commit: r1381690 - /qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
Author: jross
Date: Thu Sep 6 17:39:41 2012
New Revision: 1381690
URL: http://svn.apache.org/viewvc?rev=1381690&view=rev
Log:
QPID-2518: Increase default negotiation timeout to 10 seconds
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1381690&r1=1381689&r2=1381690&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Thu Sep 6 17:39:41 2012
@@ -130,7 +130,7 @@ Broker::Options::Options(const std::stri
timestampRcvMsgs(false),// set the 0.10 timestamp delivery property
linkMaintenanceInterval(2),
linkHeartbeatInterval(120),
-maxNegotiateTime(2000) // 2s
+maxNegotiateTime(1) // 10s
{
int c = sys::SystemInfo::concurrency();
workerThreads=c+1;
@@ -171,7 +171,7 @@ Broker::Options::Options(const std::stri
("enable-timestamp", optValue(timestampRcvMsgs, "yes|no"), "Add
current time to each received message.")
("link-maintenace-interval", optValue(linkMaintenanceInterval,
"SECONDS"))
("link-heartbeat-interval", optValue(linkHeartbeatInterval, "SECONDS"))
-("max-negotiate-time", optValue(maxNegotiateTime, "MilliSeconds"),
"Maximum time a connection can take to send the initial protocol negotiation")
+("max-negotiate-time", optValue(maxNegotiateTime, "MILLISECONDS"),
"Maximum time a connection can take to send the initial protocol negotiation")
("federation-tag", optValue(fedTag, "NAME"), "Override the federation
tag")
;
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1381728 - in /qpid/trunk/qpid/cpp/src: qpid/ha/BrokerReplicator.cpp tests/ha_tests.py
Author: aconway
Date: Thu Sep 6 19:36:21 2012
New Revision: 1381728
URL: http://svn.apache.org/viewvc?rev=1381728&view=rev
Log:
QPID-4248: HA does not replicate topic binding keys to backups (Author: Andy
Goldstein)
The issue is that QMF query responses call the binding key "bindingKey" while
QMF bind events call it "key", and the code was only looking for "key"
Modified:
qpid/trunk/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
qpid/trunk/qpid/cpp/src/tests/ha_tests.py
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp?rev=1381728&r1=1381727&r2=1381728&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp Thu Sep 6 19:36:21
2012
@@ -93,6 +93,7 @@ const string EXCHANGE("exchange");
const string EXNAME("exName");
const string EXTYPE("exType");
const string KEY("key");
+const string BINDING_KEY("bindingKey");
const string NAME("name");
const string QNAME("qName");
const string QUEUE("queue");
@@ -508,7 +509,7 @@ void BrokerReplicator::doResponseBind(Va
if (exchange && replicationTest.replicateLevel(exchange->getArgs()) &&
queue &&
replicationTest.replicateLevel(queue->getSettings().storeSettings))
{
-string key = values[KEY].asString();
+string key = values[BINDING_KEY].asString();
QPID_LOG(debug, logPrefix << "Bind response: exchange:" << exName
<< " queue:" << qName
<< " key:" << key);
Modified: qpid/trunk/qpid/cpp/src/tests/ha_tests.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ha_tests.py?rev=1381728&r1=1381727&r2=1381728&view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/ha_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/ha_tests.py Thu Sep 6 19:36:21 2012
@@ -256,8 +256,9 @@ class ReplicationTests(BrokerTest):
def queue(name, replicate):
return
"%s;{create:always,node:{x-declare:{arguments:{'qpid.replicate':%s"%(name,
replicate)
-def exchange(name, replicate, bindq):
-
return"%s;{create:always,node:{type:topic,x-declare:{arguments:{'qpid.replicate':%s},
type:'fanout'},x-bindings:[{exchange:'%s',queue:'%s'}]}}"%(name, replicate,
name, bindq)
+def exchange(name, replicate, bindq, key):
+return
"%s/%s;{create:always,node:{type:topic,x-declare:{arguments:{'qpid.replicate':%s},
type:'topic'},x-bindings:[{exchange:'%s',queue:'%s',key:'%s'}]}}"%(name, key,
replicate, name, bindq, key)
+
def setup(p, prefix, primary):
"""Create config, send messages on the primary p"""
s = p.sender(queue(prefix+"q1", "all"))
@@ -267,15 +268,15 @@ class ReplicationTests(BrokerTest):
p.acknowledge()
p.sender(queue(prefix+"q2", "configuration")).send(Message("2"))
p.sender(queue(prefix+"q3", "none")).send(Message("3"))
-p.sender(exchange(prefix+"e1", "all",
prefix+"q1")).send(Message("4"))
-p.sender(exchange(prefix+"e2", "all",
prefix+"q2")).send(Message("5"))
+p.sender(exchange(prefix+"e1", "all", prefix+"q1",
"key1")).send(Message("4"))
+p.sender(exchange(prefix+"e2", "configuration", prefix+"q2",
"key2")).send(Message("5"))
# Test unbind
p.sender(queue(prefix+"q4", "all")).send(Message("6"))
-s3 = p.sender(exchange(prefix+"e4", "all", prefix+"q4"))
+s3 = p.sender(exchange(prefix+"e4", "all", prefix+"q4", "key4"))
s3.send(Message("7"))
# Use old connection to unbind
us = primary.connect_old().session(str(uuid4()))
-us.exchange_unbind(exchange=prefix+"e4", binding_key="",
queue=prefix+"q4")
+us.exchange_unbind(exchange=prefix+"e4", binding_key="key4",
queue=prefix+"q4")
p.sender(prefix+"e4").send(Message("drop1")) # Should be dropped
# Need a marker so we can wait till sync is done.
p.sender(queue(prefix+"x", "configuration"))
@@ -292,12 +293,16 @@ class ReplicationTests(BrokerTest):
self.assert_browse_retry(b, prefix+"q2", []) # configuration only
assert not valid_address(b, prefix+"q3")
-b.sender(prefix+"e1").send(Message(prefix+"e1")) # Verify binds
with replicate=all
+
+# Verify exchange with replicate=all
+b.sender(prefix+"e1/key1").send(Message(prefix+"e1"))
self.assert_browse_retry(b, prefix+"q1", ["1", "4", prefix+"e1"])
-b.sender(prefix+"e2").send(Message(prefix+"e2")) # Verify binds
with replicate=configuration
+
+# Verify exchange with replicate=configuration
+b.sender(prefix+"e2/key2").send(Message(prefi
