summaryrefslogtreecommitdiff
path: root/qpid
Commit message (Collapse)AuthorAgeFilesLines
* QPID-6049: ensure nss is initialised (and shutdown) for 1.0 connections; add ↵Gordon Sim2014-08-274-2/+60
| | | | | | 1.0 based ssl test git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620948 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Work-around bug in older cmake, finds static python library instead ↵Alan Conway2014-08-271-2/+25
| | | | | | | | | | | | | | | | | of shared. FindPythonLibs on older versions of cmake (observed on cmake-2.6.4-5.el5.4) sometimes finds the static archive library (.a) before the shared object library (.so) This is almost never what you want. Newer versions (e.g. cmake-2.8.12.2-2.fc20.x86_64) explicitly look for the .so first and look for the .a library second. This workaround fixes the problem as follows: - It is a no-op except on Unix platforms that use the .so prefix. - On those platforms it does a search for .so only first. - Finally we do a default search for other platforms (or if .so was not found) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620888 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6048: Move permitted nodes attribute into BDB HA VH in order to be able ↵Alex Rudyy2014-08-2724-362/+423
| | | | | | to identify the intruder node on node start-up git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620882 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6047 : [Java Broker] Improve Message conversion between 1.0 and 0.x ↵Robert Godfrey2014-08-274-9/+45
| | | | | | protocols - add mapping from application property qpid.subject to the 1.0 subject property git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620858 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5813: fix up LICENSE + NOTICE etc filesRobert Gemmell2014-08-2711-162/+27
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620850 13f79535-47bb-0310-9956-ffa450edef68
* Revert "NO-JIRA: Work-around bug in older cmake, finds static python library ↵Alan Conway2014-08-261-20/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | instead of shared." This patch seems to cause various build problems, will put it back when I figure out what is going wrong. ------------------------------------------------------------------------ r1620424 | aconway | 2014-08-25 16:10:52 -0400 (Mon, 25 Aug 2014) | 13 lines NO-JIRA: Work-around bug in older cmake, finds static python library instead of shared. FindPythonLibs on older versions of cmake (observed on cmake-2.6.4-5.el5.4) sometimes finds the static archive library (.a) before the shared object library (.so) This is almost never what you want. Newer versions (e.g. cmake-2.8.12.2-2.fc20.x86_64) explicitly look for the .so first and look for the .a library second. This workaround fixes the problem as follows: - It is a no-op except on Unix platforms that use the .so prefix. - On those platforms it does a search for .so only first. - Finally we do a default search for other platforms (or if .so was not found) ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620738 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6040 : [Java Broker] [Java Client] add the ability to create a single ↵Robert Godfrey2014-08-2631-252/+516
| | | | | | consumer that is consuming across a collection of queues git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620659 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6046 : [Java Broker] [AMQP 1.0] when creating an outgoing link from the ↵Robert Godfrey2014-08-261-2/+2
| | | | | | address amq.fanout (or any fanout exchange) bind the temporary queue to the exchange witht the queue name git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620657 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6045: adjust the reported filter to make clear that wildcard subject ↵Gordon Sim2014-08-261-1/+3
| | | | | | filtering is not supported with xml exchange git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620630 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6046 : [Java Broker] [AMQP 1.0] when creating an outgoing link from the ↵Robert Godfrey2014-08-261-0/+13
| | | | | | address amq.fanout (or any fanout exchange) bind the temporary queue to the exchange witht the queue name git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620629 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6044 : [Java Broker] [AMQP 1.0] cache the valid host names for the ↵Robert Godfrey2014-08-263-58/+103
| | | | | | local machine git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620593 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6044 : [Java Broker] [AMQP 1.0] When the hostname in the open frame ↵Robert Godfrey2014-08-261-28/+94
| | | | | | does not resolve directly to a vhost, but does resolve via DNS to the local machine, map the connection to the default vhost git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620570 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6043: Add a configuration option to overwrite files returned to the EFPKim van der Riet2014-08-259-41/+79
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620426 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Work-around bug in older cmake, finds static python library instead ↵Alan Conway2014-08-251-2/+20
| | | | | | | | | | | | | | | | | of shared. FindPythonLibs on older versions of cmake (observed on cmake-2.6.4-5.el5.4) sometimes finds the static archive library (.a) before the shared object library (.so) This is almost never what you want. Newer versions (e.g. cmake-2.8.12.2-2.fc20.x86_64) explicitly look for the .so first and look for the .a library second. This workaround fixes the problem as follows: - It is a no-op except on Unix platforms that use the .so prefix. - On those platforms it does a search for .so only first. - Finally we do a default search for other platforms (or if .so was not found) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620424 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: added colon character to the web UI context variable regex pattern ↵Andrew MacBean2014-08-251-1/+1
| | | | | | to allow use of namespace git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620329 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6034: [Java Broker] Refactor Port UI feedback changes from code reviewAndrew MacBean2014-08-254-29/+27
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620323 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6037 : [Java Client] Enhance experimental support for ADDR addressing ↵Robert Godfrey2014-08-2420-188/+523
| | | | | | to the 0-8/9/9-1 client git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620147 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6038 : [Java Broker] display exchange type on exchange view in HTTP ↵Robert Godfrey2014-08-232-20/+37
| | | | | | management git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620037 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6037 : [Java Client] Add experimental support for ADDR addressing to ↵Robert Godfrey2014-08-239-248/+656
| | | | | | the 0-8/9/9-1 client git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620036 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6021: prevent protons internal output buffer growing too largeGordon Sim2014-08-222-1/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619951 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6036 : [Java Broker] Allow complete virtual host initial configuration ↵Robert Godfrey2014-08-2212-144/+347
| | | | | | to be passed in on creation of a virtualhost node git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619918 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6035: HA clearly distinguish qpid-ha commands intended for cluster manager.Alan Conway2014-08-224-35/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a --cluster-manager flag to qpid-ha tool. Without this flag - the 'promote' command is not listed in the tool help. - using the promote command raises an error saying that it is only for cluster manager use and mentioning the --cluster-manager flag. With the flag: promote functions as before. The qpid-ha help text for promote is also more clear now that it is for cluster manager only. Originally the idea was to split qpid-ha into two tools but I have kept one tool with the flag and warning messages because it: - avoids packaging changes that might trip things up. - helps people who are already using qpid-ha promote: their scripts will break but the error message explains how to fix it. I think the special role of promote is sufficiently clear now even if it is part of the same tool. This commit also updates the following to take account of the new flag: - rgmanager qpidd-primary script. - qpidd tests. - qpid book HA chapter. NOTE: THIS WILL BREAK TEST HARNESSES that do promotion outside of rgmanager. You'll need to add the --cluster-manager flag in the relevant places. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619877 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6034: [Java Broker] Refactor Port UI to use metadata service rather ↵Andrew MacBean2014-08-2218-379/+331
| | | | | | than hard-coding a list of protocols/transports etc git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619854 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5855: JAVA Client Can not recieve message with qpid ha cluster "Session ↵Alan Conway2014-08-227-21/+86
| | | | | | | | | | | | | | | | | | | exception occured while trying to commit" The problem: the java client sets the sync flag on tx.commit and then waits for completion of the entire transaction. According to the 0-10 spec, this is correct, the commit (or rollback) will not complete until all of the transactional commands have completed. However the C++ broker was sometimes completing a commit *before* one of the the corresponding enqueues. It issued the completions up to the commit (because the commit is makred sync) but there is a "hole" for the incomplete enqueue. The enqueue is not marked sync so when this hole is filled no completion is sent and the client hangs. Fix: make tx.commit a "sync point", that is it behaves like execution.sync and is not completed till all preceeding commands are complete. Note tx.rollback does not need modification as it is never completed asynchronously. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619816 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Clean up test_store.cpp async functionality.Alan Conway2014-08-223-70/+140
| | | | | | Clean up test_store.cpp to allow control over async completion of messsages. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619814 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Fix timeout on python messaging.Session.commit and rollbackAlan Conway2014-08-221-3/+5
| | | | | | Fix both to take timeout arg and raise Timeout exception if timeout expires. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619813 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: remove redundant and confusing statement; the record is already ↵Gordon Sim2014-08-221-1/+0
| | | | | | marked ended and this invocation is on the copy that is not stored anyway git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619746 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6032: throw aborted error before reconnect attempt when a transactional ↵Gordon Sim2014-08-221-0/+1
| | | | | | session discovers transport failure git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619745 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6022 : Remove unnecessary and potentially XSS inducing replay of the ↵Robert Godfrey2014-08-221-1/+1
| | | | | | path info in the error response git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619733 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6027 : Add persisted derived attributes to the initial configuration ↵Robert Godfrey2014-08-211-0/+13
| | | | | | extract git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619584 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6020: HA logging improvements - log prefix with status and ID.Alan Conway2014-08-214-6/+6
| | | | | | | Fix log prefix for RemoteBackup and PrimaryTxObserver objects. Use short UUIDs for showing UUID sets in logs. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619581 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Reduce "No EFP Partition" log message from warning to info.Alan Conway2014-08-211-2/+2
| | | | | | | It is normal for there to be no EFP partition if a broker is being started for the first time with a clean data directory. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619580 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6019 : [Java Broker] Move configured object registration with parents ↵Robert Godfrey2014-08-217-13/+150
| | | | | | until after resolution, and provide clearer error messages on attribute resolution failure git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619568 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6030 : [Java Tests] fix the BrokerTestHelper mock virtualhostRobert Godfrey2014-08-211-1/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619557 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6029 : [Java Broker] ConfiguredObjectRecordConverter should allow ↵Robert Godfrey2014-08-213-8/+256
| | | | | | reference to secondary parents by name git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619449 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6027 : [Java Broker] Fix test where record was being added into the ↵Robert Godfrey2014-08-211-1/+1
| | | | | | Json store without a name git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619356 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6027 : [Java Broker] Sort statisticsRobert Godfrey2014-08-212-2/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619323 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6027 : [Java Broker] Enforce that all records being added into the Json ↵Robert Godfrey2014-08-212-38/+125
| | | | | | store have a name which is a String git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619322 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6021: fix compile error on windowsGordon Sim2014-08-212-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619318 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6027 : Sort children in the Json store by nameRobert Godfrey2014-08-211-2/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619317 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6027 : Sort children in the Json store by nameRobert Godfrey2014-08-211-1/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619306 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6027 : Give Json extracts a stable ordering, and add option to REST ↵Robert Godfrey2014-08-2011-74/+311
| | | | | | servlet to extract data for an initial configuration (e.g. for a vhost) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619259 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6021: better batchingGordon Sim2014-08-204-68/+85
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619252 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: test_env.sh to pick up whichever of linearstore.so or ↵Alan Conway2014-08-201-1/+2
| | | | | | legacystore.so is built. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619236 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5893: Perl unit tests now find the utils module.Darryl L. Pierce2014-08-203-30/+19
| | | | | | | | | | | The module's not on the @INC path, and really shouldn't be since it's only used by the tests. So now the tests programmatically update @INC to include their directory as a part of the path, and find utils.pm. Fixed the failing Message.t file as well, which includes tests for methods that are deprecated. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619181 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6026: add server_reconnect example to WinSDK cmake solution generatorCharles E. Rolke2014-08-201-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619170 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6025: Java port of QpidConfig give NPE when listing queue/exchanges, ↵Fraser Adams2014-08-204-6/+18
| | | | | | added code to agentdata Queue and Exchange to return empty Map to be consistent with C++ Broker and also for good measure added some defensive code to QpidConfig.java git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619161 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6024: Update agentdata/Broker.java to reflect change in Java Broker ↵Fraser Adams2014-08-201-1/+2
| | | | | | Model Port class that changed getAvailableProtocols to getProtocols git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619137 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5996 : Applying patch from Robbie GemmellRobert Godfrey2014-08-202-4/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619093 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6023: make the broker module depend on the 1.0 websocket plugin, thus ↵Robert Gemmell2014-08-202-0/+11
| | | | | | | | adding it to the brokers binary release assembly. The license and notice files for the broker assembly already have relevant Jetty entries, no change needed for the additional dependency. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619065 13f79535-47bb-0310-9956-ffa450edef68