summaryrefslogtreecommitdiff
path: root/qpid/java
Commit message (Collapse)AuthorAgeFilesLines
* QPID-4881: update docs/help to use quotes for the config property argument, ↵Alex Rudyy2013-05-241-1/+1
| | | | | | | | | as will be required when using the startup script on Windows merged from trunk r1486017 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1486031 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4881: Fix qpid-server.bat to support quoted command line argumentsAlex Rudyy2013-05-241-2/+2
| | | | | | | merged from trunk r1485859 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1486029 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4876: Throw an exception when virtual host configuration is not found ↵Alex Rudyy2013-05-224-9/+25
| | | | | | | | | in virtual host file merged from trunk r1485163 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1485215 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1484601 to 0.22 branchRobert Godfrey2013-05-201-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1484602 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4868: Add UI into web management console to edit JMX management ↵Robert Gemmell2013-05-202-0/+38
| | | | | | | | | configuration mergd from trunk r1484430 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1484434 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4858: Prevent silent use of insecure HTTP connector when HTTP protocol ↵Robert Gemmell2013-05-209-46/+13
| | | | | | | | | | | with SSL transport was requested. Remove separate HTTPS protocol and use HTTP protocol with SSL transport for consistency with all other protocol types. merged from trunk r1483866 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1484433 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4860: Show virtual host state in UI and transition virtual host into ↵Robert Gemmell2013-05-202-1/+17
| | | | | | | | | ERRORED state on failing to activate merged from trunk r1483865 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1484432 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4851: Allow users to access http management using '/' instead of ↵Robert Gemmell2013-05-201-0/+2
| | | | | | | | | forcing them to type '/management' or '/index.html' merged from trunk r1483864 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1484431 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4862: Improve registration/unregistration for JMX MBean objectsRobert Gemmell2013-05-203-43/+23
| | | | | | | merged from trunk r1483863 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1484429 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4739: Remove redundant validation of keystore attributes as they are ↵Robert Gemmell2013-05-201-22/+0
| | | | | | | | | validated at keystore creation merged from trunk r1483862 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1484428 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4863: Validate plugin attribute changes and throw ↵Robert Gemmell2013-05-207-0/+141
| | | | | | | | | UnsupportedOperationException where attribute changes are not supported merged from trunk r1483861 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1484427 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4852: Try to close opened AMQP 1.0 connections on broker shutdownRobert Gemmell2013-05-201-1/+1
| | | | | | | merged from trunk r1483260 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1484425 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4851: Fix ConcurrentModificationException thrown on closing of AMQP 1.0 ↵Robert Gemmell2013-05-201-1/+2
| | | | | | | | | connection with existing sessions mrged from trunk r1483121 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1484424 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4847: add support for message group attributes when creating/inspecting ↵Robert Gemmell2013-05-1510-21/+74
| | | | | | | | | queues via the rest interface and web management ui merged from trunk r1482838 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1482842 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1482562 to 0.22 branchRobert Godfrey2013-05-1516-87/+102
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1482814 13f79535-47bb-0310-9956-ffa450edef68
* Merge fixes for JMS AMQP 1-0 client from trunk to 0.22 releaseRobert Godfrey2013-05-1520-181/+528
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1482809 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4798: merged changes from trunk to 0.22 branchRafael H. Schloming2013-05-091-4/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1480717 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4657: Add note into Port editing UI that changes take have after Broker ↵Alex Rudyy2013-05-092-1/+5
| | | | | | | | | restart merged from trunk r1480673 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1480689 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4823: add missing entry to AddQueue dialog for setting the ↵Robert Gemmell2013-05-092-1/+11
| | | | | | | | | 'alertThresholdQueueDepthBytes' attribute merged from trunk r1480581 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1480583 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4818: Remove a redundant providerSearchUrl attribute for Simple Ldap ↵Alex Rudyy2013-05-082-12/+5
| | | | | | | | | Authentication Provider merged from trunk r1480218 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1480219 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4747: we no longer need the 'default' column in the authentication ↵Robert Gemmell2013-05-071-8/+3
| | | | | | | | | provider grid as we removed the functionality merged from trunk r1479839 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1479843 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4752: Move FileGroupProvider resources into correct locationAlex Rudyy2013-05-061-0/+0
| | | | | | | merged from trunk r1479491 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1479495 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: add missing licence headers to various java filesRobert Gemmell2013-05-0519-1/+380
| | | | | | | merged from trunk r1479398 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1479402 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4594,QPID-4682: rename BrokerOptions methods for overriding the ↵Robert Gemmell2013-05-056-97/+91
| | | | | | | | | HTTP/JMX/RMI ports in management mode to better match their function merged from trunk r1479310 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1479312 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4815: make BrokerOptions the primary source of the location for the ↵Robert Gemmell2013-05-056-53/+55
| | | | | | | | | logging configuration file merged from trunk r1479309 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1479311 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4814: Fix the rest layer configured object update by name and multiple ↵Alex Rudyy2013-05-042-4/+24
| | | | | | | | | object parents merged from r1479201 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1479210 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4813: Protect operations to update queue and exchange attributes with ACLAlex Rudyy2013-05-0411-4/+643
| | | | | | | merged from trunk r1479200 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1479207 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4645: make the broker-plugins and bdbstore modules runtime dependencies ↵Robert Gemmell2013-05-041-2/+2
| | | | | | | | | in the broker pom, with only the latter being optional merged from trunk r1479178 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1479191 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4809: change initial-config.json to using qpid.work_dir and ↵Robert Gemmell2013-05-043-67/+126
| | | | | | | | | | | qpid.home_dir config variables instead of QPID_WORK and QPID_HOME system properties Enables us to default the former when QPID_WORK is not set and allows the latter to be set on a per-instance basis. merged from trunk r1479176 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1479186 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4390: ensure the _messageStore field is populated prior configuring the ↵Robert Gemmell2013-05-041-24/+21
| | | | | | | | | store to ensure it is set before use by the listener during the asynchronous HA store activation merged from trunk r1479172 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1479182 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4803: Ensure the modelVersion and storeVersion attributes are saved to ↵Alex Rudyy2013-05-039-34/+218
| | | | | | | | | | | the configuration store and validated at startup merged from trunk r1478732 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1478746 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4802: In management mode set state to ERRORED for failing to activate ↵Alex Rudyy2013-05-0319-62/+620
| | | | | | | | | | authentication providers, group providers and acl providers in order to allow editing of attributes preventing normal merged from trunk r1478731 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1478737 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4809: add support for setting configuration properties through the ↵Robert Gemmell2013-05-0316-48/+230
| | | | | | | | | | | command line and BrokerOptions that can be used by the broker configuration store to resolve variables in the config, use this to supply the default port number values. Povides chance to alter the ports when first starting the broker and using the initial config file to populate the config store. merged from trunk r1478696 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1478725 13f79535-47bb-0310-9956-ffa450edef68
* 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-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-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
* 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-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
View Lorry Controller Status