summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* NO-JIRA: Final merge from trunk before reintegrationjava-broker-bdb-ha2Keith Wall2014-04-018-12/+156
|\ | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1583552 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5048: modified deployment plugin config so only expected artifacts get ↵Robert Gemmell2014-03-282-11/+10
| | | | | | | | | | | | | | | | deployed Patch supplied by Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582782 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5048: added basic cpp broker test profileRobert Gemmell2014-03-282-1/+51
| | | | | | | | | | | | Patch supplied by Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582781 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5651: [C++ broker] segfault in ↵Pavel Moravec2014-03-281-0/+1
| | | | | | | | | | | | qpid::linearstore::journal::jdir::clear_dir when declaring durable queue git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582730 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5646: Fixes Proton detection to work with non standard pkg-config locationAndrew Stitcher2014-03-271-0/+2
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582337 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5639 : add dependency stub for cryptojs libraryRobert Godfrey2014-03-271-0/+22
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582272 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5646: Fixes Proton detection to work with cmake 2.6Andrew Stitcher2014-03-271-6/+13
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582187 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5646: Detect and build against earlier versions of Proton.Andrew Stitcher2014-03-272-0/+63
| | | | | | | | | | | | | | - This should detect any version of Proton that either uses pkg-config or native cmake config files. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582139 13f79535-47bb-0310-9956-ffa450edef68
* | QPID-5653: Open databases and upgrade on opening of configuration/message storesAlex Rudyy2014-03-3127-175/+290
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1583351 13f79535-47bb-0310-9956-ffa450edef68
* | QPID-5624: Refactor implementation of the 1.3 StoreUpgraderKeith Wall2014-03-311-173/+216
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1583300 13f79535-47bb-0310-9956-ffa450edef68
* | NO-JIRA: Make the MessageStore and DurableConfigurationStore stateless. ↵Keith Wall2014-03-2823-1344/+532
| | | | | | | | | | | | | | | | | | This changes removes the StateManager and delegates the operational logging (open/close) messages to the vhost. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1582835 13f79535-47bb-0310-9956-ffa450edef68
* | NO-JIRA: Merge changes from trunk.Keith Wall2014-03-265-39/+39
|\ \ | |/ | | | | | | | | | | | | | | | | Command was: svn merge https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1581851 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5410: Merge info associated with this change.Keith Wall2014-03-260-0/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1581798 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5410: [Java Broker/BDB]. Introduce a thin facade (EnvironmentFacade) ↵Keith Wall2014-03-2634-2913/+4799
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | between the BDBMessage and BDB JE's Environment/ReplicatedEnvironment. The motivation behind this facade is principally HA; there are a number of cases where JE requires the ReplicatedEnvironment is recreated. The facade layer allows for this to be done transparently from the upper tiers (the BDBMessageStore). The facade has two implementations StandardFacade used in the non-HA use case, and ReplicatedEnvironmentFacade in the HA case. Key changes: * BDBMessageStore reverts to a single implementation without knowledge of HA. * BDBMessageStore now interacts with JE via the facade. * BDBHAVirtualHost is now responsible for the creation of ReplicatedEnvironmentFacade * BDBHAMessageStoreManagerMBean interrogates the facade * ReplicatedEnvironmentFacade monitors the group for changes in state (nodes becoming uncontactable etc), if such a state change is detected, the DatabasePinger fires a single transaction to determine if quorum still exists. If quorum does not exist, the environment is restarted, thus transition the environment into the UNKNOWN state. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1581797 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5048: maven license plugin optimisation & enhanced license file generationKeith Wall2014-03-255-39/+39
| | | | | | | | | | | | Patch supplied by Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1581349 13f79535-47bb-0310-9956-ffa450edef68
* | NO-JIRA: Accidentally ommitted from last commitKeith Wall2014-03-261-338/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1581752 13f79535-47bb-0310-9956-ffa450edef68
* | NO-JIRA: Merge changes from trunk.Keith Wall2014-03-25148-4696/+6789
|\ \ | |/ | | | | | | | | | | | | | | | | Command was: svn merge https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1581428 13f79535-47bb-0310-9956-ffa450edef68
| * NO-JIRA: HA doc note that ha-public-url is only needed for amq.failoverAlan Conway2014-03-241-30/+18
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1581038 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-4738: Fix qpid-ha status --all when used with a standalone broker.Alan Conway2014-03-241-2/+2
| | | | | | | | | | | | | | Previously qpid-ha status --all on a standalone broker produced no output. Now it prints the status of the standalone broker. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1580962 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5639 : Remove Unicode from source fileRobert Godfrey2014-03-241-1/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1580885 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5643: qpid-route route map does not pass credentials to other brokers ↵Pavel Moravec2014-03-241-1/+3
| | | | | | | | | | | | in the route map git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1580827 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5615 : [Java Broker] update the durable configuration store interface ↵Robert Godfrey2014-03-2348-795/+1606
| | | | | | | | | | | | to be entirely in terms of ConfiguredObjectRecords and give stores knowledge of hierarchy git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1580561 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5640 : [Java Broker] Allow the Json virtual host store to save bindingsRobert Godfrey2014-03-231-1/+40
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1580560 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5633 : [Java Broker] Change the way StoreConfigurationChangeListener ↵Robert Godfrey2014-03-234-93/+14
| | | | | | | | | | | | derives the "type" (actually category) of the ConfiguredObject git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1580559 13f79535-47bb-0310-9956-ffa450edef68
| * NO-JIRA: Use better logic to locate Visual Studio vcvars on 32-/64-bit systemsCharles E. Rolke2014-03-221-14/+62
| | | | | | | | | | | | | | | | | | | | Emit a make-install.bat. Install failures from within VS gui are hidden but are in plain sight from the command line. Fix a couple of bad references to boost root directory. Turn off INSTALL_QMFGEN to preclude install failures Replace hard tabs with spaces. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1580210 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5639 : [Java Broker] Add SCRAM-SHA-1 SASL supportRobert Godfrey2014-03-2117-44/+1489
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1580082 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5634: Update ACL broker documentation after introduction of ↵Keith Wall2014-03-212-76/+102
| | | | | | | | | | | | virtualhost_name predicate and removal of support of ACL in virtual host git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579987 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5634: [Java Broker] Remove support for AccessPlugins at the level of ↵Keith Wall2014-03-2128-515/+1122
| | | | | | | | | | | | the virtualhost. Introduce supports for ACLs rules that include virtualhost predicate. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579986 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5641: [legacystore] Valgrind reports memory leaks on older store testsKim van der Riet2014-03-215-1727/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579963 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5048: new maven enforcer plugin rule for checking license filesAlex Rudyy2014-03-213-0/+346
| | | | | | | | | | | | Patch supplied by Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579936 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5048: dby profiles, bdb test deps and config for perftests-systests & ↵Alex Rudyy2014-03-215-24/+195
| | | | | | | | | | | | | | | | bdbstore-systests and a fix for clean between test runs Patch supplied by Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579935 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5625 : Fix saving of "createdBy" attribute which is incorrectly saving ↵Robert Godfrey2014-03-211-1/+1
| | | | | | | | | | | | as an object rather than a string git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579926 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5635: Fix 'partitionCount' attribute setting for BoneCP connection pool ↵Alex Rudyy2014-03-211-1/+1
| | | | | | | | | | | | UI in Web Management console UI git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579904 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5631: Adjust for changes to Qpid CMake detection of Proton.Charles E. Rolke2014-03-201-375/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Buried deep in cpp\bindings\qpid\dotnet is a script configure-windows.ps1. This script originally came into being to support the .NET binding, which is a .NET project that has no support from CMake. The script gathers the facts of where cmake runs and where boost comes from and embeds the environment into launch scripts used to start the .NET binding solution(s). Then the .NET solution can link naturally to the rest of the cmake project environment. Before this commit the script was very liberal about where one could root a build (run cmake). This patch forces some order onto the build and install directories to ease integration with proton. I use a couple of conventions and it makes life much easier. 1. Map some drives. Drive P: maps to the root of a proton checkout Drive Q: maps to the root of a qpid checkout Strictly speaking this is not necessary and if you use this scheme then you must be careful about the drive mappings. If you get them wrong then your builds will be confused. 2. Use fixed names for the studio/platform builds and installs. Builds go to: P:\build_2008_x86 Q:\build_2008_x86 P:\build_2008_x64 Q:\build_2008_x64 P:\build_2010_x86 Q:\build_2010_x86 P:\build_2010_x64 Q:\build_2010_x64 Installs go to: Q:\install_2008_x86 Q:\install_2008_x64 Q:\install_2010_x86 Q:\install_2010_x64 That is, cmake for a VS2010 32-bit build is run in P:\build_2010_x86 and Q:\build_2010_x86 But both of these builds use -DCMAKE_INSTALL_PREFIX=Q:\install_2010_x86 to install into the same place. 3. To build qpid with proton support: build and install proton first and then build and install qpid. To build qpid with no proton support: just build and optionally install qpid. Other fixes to this script are: * Adds --help option * It does only one studio/platform at a time. It doesn't mix 32- and 64-bit builds together. * It is callable from the command line: > cd cpp\bindings\qpid\dotnet > powershell -ExecutionPolicy unrestricted .\configure-windows.ps1 2010-x86 c:\boost-win-1.47-32bit-vs2010 It will create the canonical build directory and run cmake in it. * A new batch file is emitted that has the exact cmake command used. You can use this to rerun cmake without rerunning any powershell. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579734 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5600: Advance the version number on trunk to 0.29Justin Ross2014-03-2016-20/+20
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579690 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5586: Introduce SessionClosed exceptionAndrew Stitcher2014-03-194-1/+15
| | | | | | | | | | | | | | - use it for qpid::messaging::Session::nextReceiver to ensure that closing a connection/session can be distinguished. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579367 13f79535-47bb-0310-9956-ffa450edef68
| * NO-JIRA: Removed not about using only Ruby < 2.0Darryl L. Pierce2014-03-191-2/+1
| | | | | | | | | | | | Also fixed a typo in the Python requirement. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579261 13f79535-47bb-0310-9956-ffa450edef68
| * Minimal setup.py packaging for qpidtoollibsDarryl L. Pierce2014-03-191-1/+19
| | | | | | | | | | | | | | | | | | Adds pypi requirements field to existing setup.py Adds long_description field to setup.py Contributed by Brian Bouterse <bmbouter@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579235 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5362: No store tools exist for examining the journals - Bugfix and ↵Kim van der Riet2014-03-1811-976/+1366
| | | | | | | | | | | | reorganization of qls python modules. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1578899 13f79535-47bb-0310-9956-ffa450edef68
* | Introduction of separate lifecycle methods on stores for open/close/recover.Keith Wall2014-03-2536-791/+968
| | | | | | | | | | | | | | Change Upgraders responsibility to create the amqp standard exchanges when upgrading from earlier store versions. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1581288 13f79535-47bb-0310-9956-ffa450edef68
* | QPID-5624: Remove dead test virtualhost.xml files and references to the sameKeith Wall2014-03-2141-475/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1579979 13f79535-47bb-0310-9956-ffa450edef68
* | Temporary change to pom.xml to clean broker between tests - change will come ↵Keith Wall2014-03-181-0/+1
| | | | | | | | | | | | from trunk as part of Maven work git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1578833 13f79535-47bb-0310-9956-ffa450edef68
* | QPID-5624: Bug fix - derby must allow absence of configuration store settingsKeith Wall2014-03-181-1/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1578832 13f79535-47bb-0310-9956-ffa450edef68
* | NO-JIRA: Merged changes from trunk with command:Keith Wall2014-03-1853-206/+644
|\ \ | |/ | | | | | | | | | | | | svn merge https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1578827 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5048: stop the new perftets-systests module from making a release archiveRobert Gemmell2014-03-161-21/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1578151 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5048: unexclude some dirs, make the test-profiles exclusion specific ↵Robert Gemmell2014-03-161-6/+2
| | | | | | | | | | | | only to the test ssl resources git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1578150 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5600: remove stale and unused RELEASE_NOTES.txt and containing ↵Robert Gemmell2014-03-161-21/+0
| | | | | | | | | | | | qpid/java/release-docs directory git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1578149 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5048: split out systests from perftests and add rat plugin configRobert Gemmell2014-03-1631-28/+301
| | | | | | | | | | | | Patch supplied by Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1578145 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5631: Adjust for changes in Proton detection files exported by proton.Andrew Stitcher2014-03-162-62/+18
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1577982 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-5632: Added cmake config files to the install areaAndrew Stitcher2014-03-163-1/+81
| | | | | | | | | | | | For use by other projects using cmake that want to simply detect qpid libraries git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1577981 13f79535-47bb-0310-9956-ffa450edef68