svn commit: r1614291 - /qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Author: kwall Date: Tue Jul 29 09:28:12 2014 New Revision: 1614291 URL: http://svn.apache.org/r1614291 Log: QPID-5876: [Java Client] Highest delivery tag variable not reset after failover and causes rejections to be sent - revert of commit 1607882 Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=1614291r1=1614290r2=1614291view=diff == --- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java (original) +++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java Tue Jul 29 09:28:12 2014 @@ -2272,7 +2272,6 @@ public abstract class AMQSessionC exten _failedOverDirty = true; } -_highestDeliveryTag.set(-1); _rollbackMark.set(-1); resubscribeProducers(); resubscribeConsumers(); - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1614299 [2/2] - in /qpid/trunk/qpid/java: bdbstore/src/main/java/resources/virtualhost/bdb_ha/ bdbstore/src/main/java/resources/virtualhostnode/bdb/ bdbstore/src/main/java/resources/virtu
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html?rev=1614299r1=1614298r2=1614299view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html Tue Jul 29 10:05:03 2014 @@ -21,50 +21,50 @@ div class=queue div data-dojo-type=dijit.TitlePane data-dojo-props=title: 'Queue Attributes', open: true div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Name:/div +div class=formLabel-labelCellName:/div div class=name style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;State:/div +div class=formLabel-labelCellState:/div div class=state style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Durable:/div +div class=formLabel-labelCellDurable:/div div class=durable style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Persist Messages:/div +div class=formLabel-labelCellPersist Messages:/div div class=messageDurability style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Enforced Max. Ttl(ms):/div +div class=formLabel-labelCellEnforced Max. Ttl(ms):/div div class=maximumMessageTtl style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Enforced Min. Ttl(ms):/div +div class=formLabel-labelCellEnforced Min. Ttl(ms):/div div class=minimumMessageTtl style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Exclusive:/div +div class=formLabel-labelCellExclusive:/div div class=exclusive style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Owner:/div +div class=formLabel-labelCellOwner:/div div class=owner style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Lifespan:/div +div class=formLabel-labelCellLifespan:/div div class=lifetimePolicy style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Type:/div +div class=formLabel-labelCellType:/div div style=float:left; span class=type/span span class=typeQualifier/span /div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Size:/div +div class=formLabel-labelCellSize:/div div style=float:left; span class=queueDepthMessages/span span msgs/span @@ -73,7 +73,7 @@ /div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Pre-fetched:/div +div class=formLabel-labelCellPre-fetched:/div div style=float:left; span class=unacknowledgedMessages/span span msgs/span @@ -82,7 +82,7 @@ /div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Inbound:/div +div class=formLabel-labelCellInbound:/div div style=float:left; span class=msgInRate/span span msg/s/span @@ -91,7 +91,7 @@ /div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Outbound:/div +div class=formLabel-labelCellOutbound:/div div style=float:left; span class=msgOutRate/span span msg/s/span @@ -100,16 +100,16 @@ /div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;AlternateExchange:/div +div class=formLabel-labelCellAlternateExchange:/div div class=alternateExchange style=float:left;/div /div div class=messageGroups style=clear:both div
svn commit: r1614299 [1/2] - in /qpid/trunk/qpid/java: bdbstore/src/main/java/resources/virtualhost/bdb_ha/ bdbstore/src/main/java/resources/virtualhostnode/bdb/ bdbstore/src/main/java/resources/virtu
Author: macbean Date: Tue Jul 29 10:05:03 2014 New Revision: 1614299 URL: http://svn.apache.org/r1614299 Log: QPID-5935: [Java Broker] Web Management UI style refactor to remove html inline styles and standardise via css Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/show.html qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/store/pool/bonecp/show.html qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/show.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/add.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/show.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/show.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/show.html qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html Modified:
svn commit: r1614301 - in /qpid/trunk/qpid/cpp/src/qpid: broker/ broker/amqp/ broker/amqp_0_10/ legacystore/ linearstore/
Author: pmoravec
Date: Tue Jul 29 10:22:17 2014
New Revision: 1614301
URL: http://svn.apache.org/r1614301
Log:
[QPID-5929]: Mark deprecated QMF fields as Deprecated and do some relevant code
cleanup
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.h
qpid/trunk/qpid/cpp/src/qpid/broker/management-schema.xml
qpid/trunk/qpid/cpp/src/qpid/legacystore/management-schema.xml
qpid/trunk/qpid/cpp/src/qpid/linearstore/management-schema.xml
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?rev=1614301r1=1614300r2=1614301view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Tue Jul 29 10:22:17 2014
@@ -1387,39 +1387,6 @@ void Queue::countRejected() const
}
}
-void Queue::countFlowedToDisk(uint64_t size) const
-{
-if (mgmtObject) {
-_qmf::Queue::PerThreadStats *qStats = mgmtObject-getStatistics();
-qStats-msgFtdEnqueues += 1;
-qStats-byteFtdEnqueues += size;
-mgmtObject-statisticsUpdated();
-if (brokerMgmtObject) {
-_qmf::Broker::PerThreadStats *bStats =
brokerMgmtObject-getStatistics();
-bStats-msgFtdEnqueues += 1;
-bStats-byteFtdEnqueues += size;
-brokerMgmtObject-statisticsUpdated();
-}
-}
-}
-
-void Queue::countLoadedFromDisk(uint64_t size) const
-{
-if (mgmtObject) {
-_qmf::Queue::PerThreadStats *qStats = mgmtObject-getStatistics();
-qStats-msgFtdDequeues += 1;
-qStats-byteFtdDequeues += size;
-mgmtObject-statisticsUpdated();
-if (brokerMgmtObject) {
-_qmf::Broker::PerThreadStats *bStats =
brokerMgmtObject-getStatistics();
-bStats-msgFtdDequeues += 1;
-bStats-byteFtdDequeues += size;
-brokerMgmtObject-statisticsUpdated();
-}
-}
-}
-
-
ManagementObject::shared_ptr Queue::GetManagementObject(void) const
{
return mgmtObject;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h?rev=1614301r1=1614300r2=1614301view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h Tue Jul 29 10:22:17 2014
@@ -431,8 +431,6 @@ class Queue : public boost::enable_share
// Increment the rejected-by-consumer counter.
QPID_BROKER_EXTERN void countRejected() const;
-QPID_BROKER_EXTERN void countFlowedToDisk(uint64_t size) const;
-QPID_BROKER_EXTERN void countLoadedFromDisk(uint64_t size) const;
// Manageable entry points
QPID_BROKER_EXTERN management::ManagementObject::shared_ptr
GetManagementObject(void) const;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=1614301r1=1614300r2=1614301view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Tue Jul 29 10:22:17
2014
@@ -83,7 +83,7 @@ SemanticState::SemanticState(SessionStat
: session(ss),
tagGenerator(sgen),
dtxSelected(false),
- authMsg(getSession().getBroker().isAuthenticating()
!getSession().getConnection().isUserProxyAuth()),
+ authMsg(getSession().getBroker().isAuthenticating()
!getSession().getConnection().isFederationLink()),
userID(getSession().getConnection().getUserId()),
closeComplete(false),
connectionId(getSession().getConnection().getMgmtId())
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp?rev=1614301r1=1614300r2=1614301view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp Tue Jul 29 10:22:17
2014
@@ -76,7 +76,6 @@ void SessionState::addManagementObject()
mgmtObject = _qmf::Session::shared_ptr(new _qmf::Session
(agent, this, parent, name));
mgmtObject-set_fullName (fullName);
mgmtObject-set_attached
svn commit: r1614320 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
Author: orudyy Date: Tue Jul 29 12:14:32 2014 New Revision: 1614320 URL: http://svn.apache.org/r1614320 Log: QPID-5936: Fix VirtualHostMessageStoreTest failing on json test profiles Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1614320r1=1614319r2=1614320view=diff == --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Tue Jul 29 12:14:32 2014 @@ -126,7 +126,7 @@ public class VirtualHostMessageStoreTest String nodeName = node + getName(); String hostName = host + getName(); -_storePath = System.getProperty(QPID_WORK, TMP_FOLDER + File.separator + getTestName()) + File.separator + hostName; +_storePath = System.getProperty(QPID_WORK, TMP_FOLDER + File.separator + getTestName()) + File.separator + nodeName; cleanup(new File(_storePath)); Broker? broker = BrokerTestHelper.createBrokerMock(); - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1614331 - /qpid/trunk/qpid/cpp/src/tests/ha_tests.py
Author: aconway Date: Tue Jul 29 12:56:40 2014 New Revision: 1614331 URL: http://svn.apache.org/r1614331 Log: QPID-5888: Fix test to ignore occasional TransactionAborted failures on connection.close. Modified: qpid/trunk/qpid/cpp/src/tests/ha_tests.py 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=1614331r1=1614330r2=1614331view=diff == --- qpid/trunk/qpid/cpp/src/tests/ha_tests.py (original) +++ qpid/trunk/qpid/cpp/src/tests/ha_tests.py Tue Jul 29 12:56:40 2014 @@ -1428,7 +1428,8 @@ class TransactionTests(HaBrokerTest): for b in cluster: self.assert_simple_rollback_outcome(b, tx_queues) self.assertRaises(qm.TransactionAborted, tx.sync) self.assertRaises(qm.TransactionAborted, tx.commit) -tx.connection.close() +try: tx.connection.close() +except qm.TransactionAborted: pass # Occasionally get exception on close. for b in cluster: self.assert_simple_rollback_outcome(b, tx_queues) finally: l.restore() - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1614333 - in /qpid/trunk/qpid/java: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ bdbstore/sr
Author: rgodfrey
Date: Tue Jul 29 12:58:37 2014
New Revision: 1614333
URL: http://svn.apache.org/r1614333
Log:
QPID-5937 : [Java Broker] Add parameters to REST servlet to allow return of
actual vs. effective attribute values
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactory.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactory.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactory.java?rev=1614333r1=1614332r2=1614333view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactory.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactory.java
Tue Jul 29 12:58:37 2014
@@ -71,7 +71,7 @@ public class StandardEnvironmentFacadeFa
for (ConfigParam cp : EnvironmentParams.SUPPORTED_PARAMS.values())
{
final String parameterName = cp.getName();
-SetString contextKeys = parent.getContextKeys();
+SetString contextKeys = parent.getContextKeys(false);
if (!cp.isForReplication() contextKeys.contains(parameterName))
{
envConfigMap.put(parameterName,
parent.getContextValue(String.class, parameterName));
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java?rev=1614333r1=1614332r2=1614333view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java
Tue Jul 29 12:58:37 2014
@@ -126,7 +126,7 @@ public class ReplicatedEnvironmentFacade
private MapString, String buildConfig(ConfiguredObject? parent,
Pattern paramName)
{
MapString, String targetMap = new HashMap();
-for (String name : parent.getContextKeys())
+for (String name : parent.getContextKeys(false))
{
if (paramName.matcher(name).matches())
{
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1614333r1=1614332r2=1614333view=diff
==
---
svn commit: r1614334 - /qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
Author: kgiusti
Date: Tue Jul 29 13:09:28 2014
New Revision: 1614334
URL: http://svn.apache.org/r1614334
Log:
QPID-5932: tweak patch to support older versions of python.
Modified:
qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
Modified: qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py?rev=1614334r1=1614333r2=1614334view=diff
==
--- qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py (original)
+++ qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py Tue Jul 29 13:09:28 2014
@@ -1509,7 +1509,9 @@ class Session:
Methods are now invoked on the object itself.
objs = self.getObjects(_objectId=objectId)
-return objs[0]._sendMethodRequest(name, argList, {}) if objs else None
+if objs:
+ return objs[0]._sendMethodRequest(name, argList, {})
+return None
def _newPackageCallback(self, pname):
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1614335 - /qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
Author: rgodfrey
Date: Tue Jul 29 13:10:23 2014
New Revision: 1614335
URL: http://svn.apache.org/r1614335
Log:
NO-JIRA : remove debugging stack trace dump
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java?rev=1614335r1=1614334r2=1614335view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
Tue Jul 29 13:10:23 2014
@@ -517,7 +517,6 @@ public class JsonFileConfigStore impleme
@Override
public void closeConfigurationStore()
{
-_logger.info(Close Config Store called, new Exception());
try
{
releaseFileLock();
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1614353 - /qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
Author: rgodfrey Date: Tue Jul 29 13:51:51 2014 New Revision: 1614353 URL: http://svn.apache.org/r1614353 Log: QPID-5937 : [Java Broker] Add parameters to REST servlet to allow return of actual vs. effective attribute values Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java?rev=1614353r1=1614352r2=1614353view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java Tue Jul 29 13:51:51 2014 @@ -20,6 +20,7 @@ package org.apache.qpid.server.management.plugin.servlet.rest; import static org.apache.qpid.server.management.plugin.servlet.rest.ConfiguredObjectToMapConverter.STATISTICS_MAP_KEY; +import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -136,7 +137,7 @@ public class ConfiguredObjectToMapConver when(_configuredObject.getAttributeNames()).thenReturn(Collections.singletonList(ConfiguredObject.CONTEXT)); when(_configuredObject.getContextValue(eq(String.class), eq(key))).thenReturn(value); when(_configuredObject.getContextValue(eq(String.class),eq(inheritedkey))).thenReturn(foo); - when(_configuredObject.getContextKeys(false)).thenReturn(inheritedKeys); + when(_configuredObject.getContextKeys(anyBoolean())).thenReturn(inheritedKeys); when(_configuredObject.getContext()).thenReturn(actualContext); when(mockChild.getAttributeNames()).thenReturn(Arrays.asList(childAttributeName, ConfiguredObject.CONTEXT)); when(mockChild.getAttribute(childAttributeName)).thenReturn(childAttributeValue); @@ -161,7 +162,7 @@ public class ConfiguredObjectToMapConver MapString, Object inheritedContext = new HashMap(); inheritedContext.put(key,value); inheritedContext.put(inheritedkey,foo); -assertEquals(Incorrect context, resultMap.get(ConfiguredObject.CONTEXT), inheritedContext); +assertEquals(Incorrect context, inheritedContext, resultMap.get(ConfiguredObject.CONTEXT)); childList = (ListMapString, Object) resultMap.get(testchilds); assertEquals(Unexpected number of children, 1, childList.size()); childMap = childList.get(0); - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1614363 - /qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java
Author: rhs
Date: Tue Jul 29 14:31:55 2014
New Revision: 1614363
URL: http://svn.apache.org/r1614363
Log:
removed harmful toString()
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java?rev=1614363r1=1614362r2=1614363view=diff
==
---
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java
Tue Jul 29 14:31:55 2014
@@ -218,9 +218,4 @@ public abstract class EndpointImpl imple
_context = context;
}
-@Override
-public String toString()
-{
-return super.toString() + [_localState= + _localState + ,
_remoteState= + _remoteState + , _localError= + _localError + ,
_remoteError= + _remoteError + ];
-}
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1614362 - /qpid/proton/trunk/tests/python/proton_tests/transport.py
Author: rhs Date: Tue Jul 29 14:31:44 2014 New Revision: 1614362 URL: http://svn.apache.org/r1614362 Log: added a test for unpaired pops Modified: qpid/proton/trunk/tests/python/proton_tests/transport.py Modified: qpid/proton/trunk/tests/python/proton_tests/transport.py URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tests/python/proton_tests/transport.py?rev=1614362r1=1614361r2=1614362view=diff == --- qpid/proton/trunk/tests/python/proton_tests/transport.py (original) +++ qpid/proton/trunk/tests/python/proton_tests/transport.py Tue Jul 29 14:31:44 2014 @@ -132,3 +132,32 @@ class TransportTest(Test): assert aborted in str(e), str(e) n = self.transport.capacity() assert n 0, n + + def testUnpairedPop(self): +conn = Connection() +self.transport.bind(conn) + +conn.hostname = hostname +conn.open() + +dat1 = self.transport.peek(1024) + +ssn = conn.session() +ssn.open() + +dat2 = self.transport.peek(1024) + +assert dat2[:len(dat1)] == dat1 + +snd = ssn.sender(sender) +snd.open() + +self.transport.pop(len(dat1)) +self.transport.pop(len(dat2) - len(dat1)) +dat3 = self.transport.peek(1024) +self.transport.pop(len(dat3)) +assert self.transport.peek(1024) == + +self.peer.push(dat1) +self.peer.push(dat2[len(dat1):]) +self.peer.push(dat3) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1614370 - in /qpid/trunk/qpid/java: broker-core/src/main/java/org/apache/qpid/server/model/ broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/ broker-p
Author: rgodfrey
Date: Tue Jul 29 14:54:36 2014
New Revision: 1614370
URL: http://svn.apache.org/r1614370
Log:
QPID-5940 : [Java Broker] Add meta-data servlet
Added:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java?rev=1614370r1=1614369r2=1614370view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
Tue Jul 29 14:54:36 2014
@@ -99,6 +99,10 @@ public class ConfiguredObjectTypeRegistr
{
categories.add(configuredObjectClass);
}
+else
+{
+categories.add(getCategory(configuredObjectClass));
+}
if (!.equals(annotation.type()))
{
types.add(configuredObjectClass);
@@ -188,13 +192,16 @@ public class ConfiguredObjectTypeRegistr
{
Class? extends ConfiguredObject category = getCategory(clazz);
SetClass? extends ConfiguredObject types =
_knownTypes.get(category);
-for(Class? extends ConfiguredObject type : types)
+if(types != null)
{
-ManagedObject annotation =
type.getAnnotation(ManagedObject.class);
-if(typeName.equals(annotation.type()))
+for (Class? extends ConfiguredObject type : types)
{
-typeClass = type;
-break;
+ManagedObject annotation =
type.getAnnotation(ManagedObject.class);
+if (typeName.equals(annotation.type()))
+{
+typeClass = type;
+break;
+}
}
}
if(typeClass == null typeName.equals(category.getSimpleName()))
@@ -214,7 +221,12 @@ public class ConfiguredObjectTypeRegistr
{
throw new IllegalArgumentException(Cannot locate ManagedObject
information for + clazz.getName());
}
-return
Collections.unmodifiableCollection(_knownTypes.get(categoryClass));
+SetClass? extends ConfiguredObject classes =
_knownTypes.get(categoryClass);
+if(classes == null)
+{
+classes = (SetClass? extends ConfiguredObject)
((Set)Collections.singleton(clazz));
+}
+return Collections.unmodifiableCollection(classes);
}
@@ -225,7 +237,8 @@ public class ConfiguredObjectTypeRegistr
{
throw new IllegalArgumentException(Cannot locate ManagedObject
information for + clazz.getName());
}
-return
Collections.unmodifiableCollection(_typeSpecificAttributes.get(typeClass));
+CollectionConfiguredObjectAttribute?, ? typeAttrs =
_typeSpecificAttributes.get(typeClass);
+return Collections.unmodifiableCollection(typeAttrs == null ?
Collections.ConfiguredObjectAttribute?, ?emptySet() : typeAttrs);
}
public static String getType(final Class? extends ConfiguredObject clazz)
@@ -711,7 +724,7 @@ public class ConfiguredObjectTypeRegistr
}
-static MapString, ConfiguredObjectAttribute?, ?
getAttributeTypes(final Class? extends ConfiguredObject clazz)
+public static MapString, ConfiguredObjectAttribute?, ?
getAttributeTypes(final Class? extends ConfiguredObject clazz)
{
if(!_allAttributes.containsKey(clazz))
{
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1614370r1=1614369r2=1614370view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Tue Jul
svn commit: r1614472 - /qpid/trunk/qpid/cpp/CMakeLists.txt
Author: aconway
Date: Tue Jul 29 19:59:19 2014
New Revision: 1614472
URL: http://svn.apache.org/r1614472
Log:
QPID-5941: Set sensible default build type: default is RelWithDebInfo.
Modified:
qpid/trunk/qpid/cpp/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=1614472r1=1614471r2=1614472view=diff
==
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Tue Jul 29 19:59:19 2014
@@ -16,6 +16,15 @@
# specific language governing permissions and limitations
# under the License.
#
+
+# Set default build type. Must come before project() which sets default to
+set (CMAKE_BUILD_TYPE RelWithDebInfo CACHE string
+ Build type: Debug, Release, RelWithDebInfo or MinSizeRel (default
RelWithDebInfo))
+if (CMAKE_BUILD_TYPE MATCHES Deb)
+ set (has_debug_symbols (has debug symbols))
+endif (CMAKE_BUILD_TYPE MATCHES Deb)
+message(Build type is *${CMAKE_BUILD_TYPE}*${has_debug_symbols})
+
project(qpid-cpp)
cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
@@ -223,3 +232,6 @@ add_subdirectory(docs/man)
add_subdirectory(examples)
include (CPack)
+
+# Build type message again, last so it is visible at end of output.
+message(Build type is *${CMAKE_BUILD_TYPE}*${has_debug_symbols})
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
