svn commit: r1363813 - in /qpid/branches/0.18/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ broker-plugins/management-http/src/main/java/resources/ broker/ broker/bin/ broker/sr
Author: robbie Date: Fri Jul 20 14:50:57 2012 New Revision: 1363813 URL: http://svn.apache.org/viewvc?rev=1363813view=rev Log: QPID-4151: Add validation for reserved exchange names into addExchange dialog in web management UI Applied patch from Oleksandr Rudyy oru...@gmail.com merged from trunk r1363307 Modified: qpid/branches/0.18/qpid/java/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-common/ (props changed) qpid/branches/0.18/qpid/java/broker/ (props changed) qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html qpid/branches/0.18/qpid/java/broker/bin/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed) qpid/branches/0.18/qpid/java/test-profiles/ (props changed) qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/Excludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaBDBExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaExcludes (props changed)
svn commit: r1363839 - in /qpid/branches/0.18/qpid: ./ cpp/src/ cpp/src/qpid/ha/HaBroker.cpp cpp/src/qpid/ha/HaBroker.h cpp/src/qpid/ha/HaPlugin.cpp
Author: gsim
Date: Fri Jul 20 15:28:15 2012
New Revision: 1363839
URL: http://svn.apache.org/viewvc?rev=1363839view=rev
Log:
QPID-4156: HA close window for clients to connect before HA broker is
initialized; merged r1363498
Modified:
qpid/branches/0.18/qpid/ (props changed)
qpid/branches/0.18/qpid/cpp/src/ (props changed)
qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.cpp
qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.h
qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaPlugin.cpp
Propchange: qpid/branches/0.18/qpid/
--
Merged /qpid/trunk/qpid:r1363498
Propchange: qpid/branches/0.18/qpid/cpp/src/
--
Merged /qpid/trunk/qpid/cpp/src:r1363498
Modified: qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.cpp?rev=1363839r1=1363838r2=1363839view=diff
==
--- qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.cpp (original)
+++ qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.cpp Fri Jul 20 15:28:15
2012
@@ -55,6 +55,7 @@ using types::Variant;
using types::Uuid;
using sys::Mutex;
+// Called in Plugin::earlyInitialize
HaBroker::HaBroker(broker::Broker b, const Settings s)
: logPrefix(Broker: ),
broker(b),
@@ -63,12 +64,26 @@ HaBroker::HaBroker(broker::Broker b, co
observer(new ConnectionObserver(*this, systemId)),
mgmtObject(0),
status(STANDALONE),
- brokerInfo(broker.getSystem()-getNodeName(),
- // TODO aconway 2012-05-24: other transports?
- broker.getPort(broker::Broker::TCP_TRANSPORT), systemId),
membership(systemId),
replicationTest(s.replicateDefault.get())
{
+// If we are joining a cluster we must start excluding clients now,
+// otherwise there's a window for a client to connect before we get to
+// initialize()
+if (settings.cluster) {
+observer-setObserver(boost::shared_ptrbroker::ConnectionObserver(
+ new BackupConnectionExcluder));
+broker.getConnectionObservers().add(observer);
+}
+}
+
+// Called in Plugin::initialize
+void HaBroker::initialize() {
+
+// FIXME aconway 2012-07-19: assumes there's a TCP transport with a
meaningful port.
+brokerInfo = BrokerInfo(
+broker.getSystem()-getNodeName(),
broker.getPort(broker::Broker::TCP_TRANSPORT), systemId);
+
// Set up the management object.
ManagementAgent* ma = broker.getManagementAgent();
if (settings.cluster !ma)
@@ -87,10 +102,7 @@ HaBroker::HaBroker(broker::Broker b, co
// If we are in a cluster, start as backup in joining state.
if (settings.cluster) {
status = JOINING;
-observer-setObserver(boost::shared_ptrbroker::ConnectionObserver(
- new BackupConnectionExcluder));
-broker.getConnectionObservers().add(observer);
-backup.reset(new Backup(*this, s));
+backup.reset(new Backup(*this, settings));
broker.getKnownBrokers = boost::bind(HaBroker::getKnownBrokers, this);
}
Modified: qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.h
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.h?rev=1363839r1=1363838r2=1363839view=diff
==
--- qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.h (original)
+++ qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.h Fri Jul 20 15:28:15 2012
@@ -63,9 +63,13 @@ class Primary;
class HaBroker : public management::Manageable
{
public:
+/** HaBroker is constructed during earlyInitialize */
HaBroker(broker::Broker, const Settings);
~HaBroker();
+/** Called during plugin initialization */
+void initialize();
+
// Implement Manageable.
qpid::management::ManagementObject* GetManagementObject() const { return
mgmtObject; }
management::Manageable::status_t ManagementMethod (
Modified: qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaPlugin.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaPlugin.cpp?rev=1363839r1=1363838r2=1363839view=diff
==
--- qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaPlugin.cpp (original)
+++ qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaPlugin.cpp Fri Jul 20 15:28:15
2012
@@ -62,16 +62,21 @@ struct HaPlugin : public Plugin {
Options* getOptions() { return options; }
-void earlyInitialize(Plugin::Target ) {}
-
-void initialize(Plugin::Target target) {
+void earlyInitialize(Plugin::Target target) {
broker::Broker* broker = dynamic_castbroker::Broker*(target);
if (broker) {
+// Must create the HaBroker
svn commit: r1363845 - /qpid/branches/0.18/qpid/tools/src/py/qpidtoollibs/disp.py
Author: tross
Date: Fri Jul 20 15:33:13 2012
New Revision: 1363845
URL: http://svn.apache.org/viewvc?rev=1363845view=rev
Log:
QPID-4155 - Merged from trunk at revision 1363795.
Modified:
qpid/branches/0.18/qpid/tools/src/py/qpidtoollibs/disp.py
Modified: qpid/branches/0.18/qpid/tools/src/py/qpidtoollibs/disp.py
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/tools/src/py/qpidtoollibs/disp.py?rev=1363845r1=1363844r2=1363845view=diff
==
--- qpid/branches/0.18/qpid/tools/src/py/qpidtoollibs/disp.py (original)
+++ qpid/branches/0.18/qpid/tools/src/py/qpidtoollibs/disp.py Fri Jul 20
15:33:13 2012
@@ -167,7 +167,7 @@ class Display:
for head in heads:
width = len (head)
for row in rows:
-cellWidth = len (unicode (row[col]))
+cellWidth = len (unicode (row[col].decode('utf-8')))
if cellWidth width:
width = cellWidth
colWidth.append (width + self.tableSpacing)
@@ -187,9 +187,9 @@ class Display:
line = self.tablePrefix
col = 0
for width in colWidth:
-line = line + unicode (row[col])
+line = line + unicode (row[col].decode('utf-8'))
if col len (heads) - 1:
- for i in range (width - len (unicode (row[col]))):
+ for i in range (width - len (unicode (row[col].decode('utf-8':
line = line +
col = col + 1
print line
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1363852 - in /qpid/branches/0.18/qpid: ./ cpp/src/ cpp/src/qpid/ha/BrokerReplicator.cpp
Author: gsim
Date: Fri Jul 20 15:44:59 2012
New Revision: 1363852
URL: http://svn.apache.org/viewvc?rev=1363852view=rev
Log:
QPID-4158: HA transition to CATCHUP status too early; merged from 1363520
Modified:
qpid/branches/0.18/qpid/ (props changed)
qpid/branches/0.18/qpid/cpp/src/ (props changed)
qpid/branches/0.18/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
Propchange: qpid/branches/0.18/qpid/
--
Merged /qpid/trunk/qpid:r1363520
Propchange: qpid/branches/0.18/qpid/cpp/src/
--
Merged /qpid/trunk/qpid/cpp/src:r1363520
Modified: qpid/branches/0.18/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp?rev=1363852r1=1363851r2=1363852view=diff
==
--- qpid/branches/0.18/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp (original)
+++ qpid/branches/0.18/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp Fri Jul 20
15:44:59 2012
@@ -218,22 +218,6 @@ void BrokerReplicator::initializeBridge(
status: printable(haBroker.getStatus()));
initialized = true;
-switch (haBroker.getStatus()) {
- case JOINING:
-haBroker.setStatus(CATCHUP);
-break;
- case CATCHUP:
-break;
- case READY:
-break;
- case RECOVERING:
- case ACTIVE:
-assert(0); // Primary does not reconnect.
-return;
- case STANDALONE:
-return;
-}
-
framing::AMQP_ServerProxy peer(sessionHandler.out);
const qmf::org::apache::qpid::broker::ArgsLinkBridge
args(bridge.getArgs());
@@ -260,6 +244,10 @@ void BrokerReplicator::initializeBridge(
}
void BrokerReplicator::route(Deliverable msg) {
+// We transition from JOINING-CATCHUP on the first message received from
the primary.
+// Until now we couldn't be sure if we had a good connection to the
primary.
+if (haBroker.getStatus() == JOINING) haBroker.setStatus(CATCHUP);
+
const framing::FieldTable* headers =
msg.getMessage().getApplicationHeaders();
Variant::List list;
try {
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1363863 - /qpid/branches/0.18/qpid/tools/src/py/qpidtoollibs/disp.py
Author: tross
Date: Fri Jul 20 16:19:28 2012
New Revision: 1363863
URL: http://svn.apache.org/viewvc?rev=1363863view=rev
Log:
QPID-4155 - Merged from trunk at revision 1363861.
Modified:
qpid/branches/0.18/qpid/tools/src/py/qpidtoollibs/disp.py
Modified: qpid/branches/0.18/qpid/tools/src/py/qpidtoollibs/disp.py
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/tools/src/py/qpidtoollibs/disp.py?rev=1363863r1=1363862r2=1363863view=diff
==
--- qpid/branches/0.18/qpid/tools/src/py/qpidtoollibs/disp.py (original)
+++ qpid/branches/0.18/qpid/tools/src/py/qpidtoollibs/disp.py Fri Jul 20
16:19:28 2012
@@ -167,7 +167,10 @@ class Display:
for head in heads:
width = len (head)
for row in rows:
-cellWidth = len (unicode (row[col].decode('utf-8')))
+text = row[col]
+if text.__class__ == str:
+ text = text.decode('utf-8')
+cellWidth = len(unicode(text))
if cellWidth width:
width = cellWidth
colWidth.append (width + self.tableSpacing)
@@ -187,9 +190,12 @@ class Display:
line = self.tablePrefix
col = 0
for width in colWidth:
-line = line + unicode (row[col].decode('utf-8'))
+text = row[col]
+if text.__class__ == str:
+ text = text.decode('utf-8')
+line = line + unicode(text)
if col len (heads) - 1:
- for i in range (width - len (unicode (row[col].decode('utf-8':
+ for i in range (width - len(unicode(text))):
line = line +
col = col + 1
print line
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
