summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* NO-JIRA : remove unused code from the Java Broker (merge from r1477628)Robert Godfrey2013-05-0315-265/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1478720 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4800: Fixed packaging for codec.pm.Darryl L. Pierce2013-05-022-1/+1
| | | | | | The package was missing the codec portion of the name. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1478458 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4799: Updated the release.sh and Cmake files for qpid.pmDarryl L. Pierce2013-05-022-2/+0
| | | | | | The files are now aware of the new location for qpid.pm. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1478457 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4799: Move qpid.pm to the lib directory.Darryl L. Pierce2013-05-021-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1478456 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4793: Change test so that regex.h works on other unixesAndrew Stitcher2013-05-021-2/+2
| | | | | | Change brought in from trunk r1477822 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1478421 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4795: update naming of the UserManagement MBeans to remove restriction ↵Robert Gemmell2013-05-018-52/+43
| | | | | | | | | preventing there being multiple AuthenticationProviders capable of user management merged from trunk r1477965 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477974 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4698: Fixed the location of the SASL2 configuration file.Darryl L. Pierce2013-04-301-1/+1
| | | | | | It was mistakenly installed to /etc/qpid/sasl2 rather than /etc/sasl2. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477778 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4698: Removed the requirement for Python 2.7.Darryl L. Pierce2013-04-301-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477768 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4698: Missed two macros in qpidd-primary.inDarryl L. Pierce2013-04-302-4/+5
| | | | | | Fixed them to properly set the paths. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477767 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4698: Fixed the install location for files under CMake.Darryl L. Pierce2013-04-304-8/+21
| | | | | | | | | Installs the SASL2 qpidd.conf file to /etc/qpid/sasl2/qpidd.conf Installs qpidd-primary to /etc/rc.d/init.d/qpidd-primary Installs the qmf-gen Python script to /usr/bin Installs the managementgen sitepackage to where sitelibs belong git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477766 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4714 Moved _delegate.closeConnection method inside a finally blockRajith Muditha Attapattu2013-04-301-3/+12
| | | | | | | | | to ensure the TCP connection is closed in case an exception is thrown from any of the methods above. (cherry picked from commit 874b973366824fba1ae502b10c9a5b66c11e4779) git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477705 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4791: Change JSESSIONID cookie name to include the port number in order ↵Alex Rudyy2013-04-301-1/+5
| | | | | | | | | | to avoid JSESSIONID cookie name collisions when running multiple we merged from trunk r1477668 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477683 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4778: Introduce additional states for configured objects: ERRORED and ↵Alex Rudyy2013-04-305-18/+247
| | | | | | | | | | REPLICA merged from trunk r1477667 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477682 13f79535-47bb-0310-9956-ffa450edef68
* Revert "QPID-4687: Add uninstall make target to cmake build"Alan Conway2013-04-302-33/+0
| | | | | | | This reverts the uninstall target added in r1463540, it was not accepted for 0.22 release. It leaves in place fixes to the python intall tartget that were in the same commit. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477640 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4688: Update Java Broker docbook to reflect change in bdb versionRobert Gemmell2013-04-301-1/+1
| | | | | | | merged from trunk r1477554 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477583 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4785: relax restrictions on editing/deleting active ports outwith ↵Robert Gemmell2013-04-306-89/+107
| | | | | | | | | management-mode merged from trunk r1477190 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477582 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Prevent non-ascii warning when compiling amqp-1-0-client-jms module ↵Robert Gemmell2013-04-301-1/+1
| | | | | | | | | (use unicode escape for pound symbol) trunk r1477178 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477581 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: [Java Perf Tests] Make perf test config use default virtual host ↵Robert Gemmell2013-04-301-1/+1
| | | | | | | | | rather than hardcoding 'test' merged from trunk r1477163 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477578 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4753: set vhost SecurityManager _managementMode boolean to equal the ↵Robert Gemmell2013-04-302-1/+6
| | | | | | | | | parent/broker SecurityManager, validate the ACL file during onCreate to ensure it is usable before allowing it to be added merged from trunk r1477155 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477577 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4639: Improve functionality to delete store on virtual host deletionRobert Gemmell2013-04-3012-15/+447
| | | | | | | merged from trunk r1477110 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477576 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4784: stop generating errors during creation of PDAM's due to duplicate ↵Robert Gemmell2013-04-3021-641/+181
| | | | | | | | | sasl provider registration, simplify PDAM. merged from trunk r1477078 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477573 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4782: use iterator.remove() to update the map and avoid the CME exposed ↵Robert Gemmell2013-04-301-2/+9
| | | | | | | | | in r1476219 merged from trunk r1476583 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477567 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4760: Associate Java Broker QueueAdapter and SessionAdapter via ↵Robert Gemmell2013-04-305-9/+134
| | | | | | | | | ConsumerAdapter merges only the changes to the Java broker from r1476219 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477558 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4776: Fixes building Ruby bindings on Cmake < 2.8Darryl L. Pierce2013-04-294-5/+52
| | | | | | | | | This patch fixes issues regarding finding the Ruby install and building the bindings for it. Contributed by Irina Boverman <iboverma@redhat.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477135 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4777: Add UI to view and edit web management configurationAlex Rudyy2013-04-2622-59/+673
| | | | | | | | merged from trunk r1476288 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1476298 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4596: Call AuthenticationManager#onCreate() only when authentication ↵Alex Rudyy2013-04-2610-33/+192
| | | | | | | | | | provider is created merged from trunk r1475825 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1476104 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4773: Add functionality to display information about http errors which ↵Alex Rudyy2013-04-243-2/+58
| | | | | | | | | might occur when communicating with the broker merged from trunk r1471409 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1471414 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4753: Add additional tests for updated AcessControlProvider config, inc ↵Robert Gemmell2013-04-235-1/+441
| | | | | | | | | creating and removing AccessControlProviders and verifying ACLs governing their creation/update/deletion. Add message to web ui to signal the user that only one access control provider of a given type will be used by the broker and they should remove others. merged from trunk r1471004 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1471006 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4769: Add port tab into java broker web management consoleAlex Rudyy2013-04-236-13/+294
| | | | | | | | merged from trunk r1470899 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1470902 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4768: Resolve compatibility issues in web management console for old ↵Alex Rudyy2013-04-233-48/+5
| | | | | | | | | | versions of IE and FF merged from trunk r1470897 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1470900 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4763 : [Java Broker] Add JDBC storeAlex Rudyy2013-04-225-1988/+2548
| | | | | | | | merged from trunk r1470454 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1470549 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4685: update documentation for CLI optionsAlex Rudyy2013-04-223-41/+58
| | | | | | | | merged from trunk r1470475 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1470499 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4751: change Hello example to remove mention of 'test' virtualhostAlex Rudyy2013-04-221-1/+1
| | | | | | | | merged from trunk r1470474 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1470490 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4762: Upgrade dojo to version 1.8.3Alex Rudyy2013-04-222-2/+2
| | | | | | | | merged from trunk r1470463 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1470488 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4761: Upgrade jetty to version 7.6.10.v20130312Alex Rudyy2013-04-2210-24/+24
| | | | | | | | merged from trunk r1470439 and r1470457 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1470486 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4753: move ACL config from broker attribute to a top level entityRobert Gemmell2013-04-1941-227/+1525
| | | | | | | merged from trunk r1469937 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469945 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4755: Rename broker attribute 'supportedStoreTypes' into ↵Robert Gemmell2013-04-196-9/+36
| | | | | | | | | 'virtualHostSupportedStoreTypes' and introduce new attribute for broker supported store types merged from trunk r1469917 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469944 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4752: Make the GroupProvider a full broker-level configuration entry ↵Robert Gemmell2013-04-1934-223/+1256
| | | | | | | | | instead of a broker attribute. merged from trunk r1469916 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469942 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4754: Make broker name editable and show it in the browser titleRobert Gemmell2013-04-196-6/+6
| | | | | | | merged from trunk r1469914 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469938 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4746, QPID-4747:Fix the tests failing on IBM JDKRobert Gemmell2013-04-191-18/+33
| | | | | | | merged from trunk r1469256 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469922 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4747: Remove defaultAuthenticationProvider field from broker attribute ↵Robert Gemmell2013-04-191-18/+0
| | | | | | | | | editing form merged from trunk r1468953 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469920 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4746, QPID-4747: Complete partial change in previous commitRobert Gemmell2013-04-191-1/+3
| | | | | | | merged from trunk r1468875 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469918 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4746, QPID-4747: remove the defaultAuthenticationProvider attribute ↵Robert Gemmell2013-04-1954-660/+1059
| | | | | | | | | from broker and add an overriding authentication provider for management mode merged from trunk r1468830 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469915 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4731: Added additional system test ↵Robert Gemmell2013-04-193-33/+115
| | | | | | | | | DurableSubscriptionTest#testUnsubscribeWhenUsingSelectorMakesTopicUnreachable that surfaced the defect merged from trunk r1468816 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469910 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4731: Implemented JMSSelectorFilter equals() and hashcode() to avoid ↵Robert Gemmell2013-04-192-4/+91
| | | | | | | | | leaking topic queues. Previously TopicExchangeResult._filteredQueues look-ups in TopicExchangeResult.removeFilteredQueue were erroneously failing, causing the queues therein to evade deletion during topic consumer close. merged from trunk r1468815 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469909 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker and ↵Robert Gemmell2013-04-1920-33/+66
| | | | | | | | | | | direct children in the configuration file makes ID generation behaviour consistent with that for objects added via the management interface merged from trunk r1467940 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469906 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4390, QPID-4743: configuration improvements from reviewRobert Gemmell2013-04-194-199/+6
| | | | | | | | | | | | | - Rename the embedded initial config file to initial-config.json - Ensure the default vhost store path is unique by including its type and vhost name. - Rename ports to remove the port number. - Remove leftover systests config.xml file. - Stop shipping unused virtualhosts.xml in example config to reduce confusion merged from trunk r1467938 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469904 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4742: add option to create a copy of the initial config file, either at ↵Robert Gemmell2013-04-195-76/+138
| | | | | | | | | a specified location or as initial-config.json in the current directory merged from trunk r1467932 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469900 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4741: add command line option to request overwritig existing broker ↵Robert Gemmell2013-04-1911-26/+126
| | | | | | | | | config store with current initial config file merged from trunk r1467930 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469898 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4739: add ACL tests for new TrustStore + KeyStore objectsRobert Gemmell2013-04-195-7/+348
| | | | | | | | | Also some small fixups from secondary review: correct exception messages, remove unused imports, tweak a unit test, add a couple of missing licence headers merged from trunk r1467922 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1469884 13f79535-47bb-0310-9956-ffa450edef68