summaryrefslogtreecommitdiff
path: root/qpid/java
Commit message (Collapse)AuthorAgeFilesLines
* QPID-5634: Remove virtualhost level attribute, securityAcl, which was made ↵Keith Wall2014-04-254-20/+1
| | | | | | obsolete by this change. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1590081 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5578 : Make TaskExecutor an interface and provide a test-only current ↵Robert Godfrey2014-04-253-11/+7
| | | | | | thread implementation git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1590044 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5715: Change test utility method for virtual host configuration store ↵Alex Rudyy2014-04-251-0/+8
| | | | | | creation to wipe out the store folder before creation a store git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1590003 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5578 : Make TaskExecutor an interface and provide a test-only current ↵Robert Godfrey2014-04-2532-492/+704
| | | | | | thread implementation git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589969 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5578 : Ensure correct error code is returned when a queue is declared ↵Robert Godfrey2014-04-2521-135/+138
| | | | | | with an unknown alternate exchange git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589912 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5639 : Add SASL SCRAM-SHA-1 Java client supportRobert Godfrey2014-04-242-0/+397
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589898 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5578 : Remove unusued contants and tidy up other codeRobert Godfrey2014-04-243-137/+115
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589897 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5580 : Address review comments from Keith Wall / remove dead codeRobert Godfrey2014-04-241-62/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589882 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5698 : Address review comments by Keith WallRobert Godfrey2014-04-2410-21/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589862 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5722 : Client connection read can hang forever since socket timeout is ↵Robert Godfrey2014-04-241-8/+37
| | | | | | 0 (Patch from Michael Samson) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589855 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5710 : Address review comments from Keith Wall and remove unnecessary ↵Robert Godfrey2014-04-249-168/+105
| | | | | | classes git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589801 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5698 : [Java Broker] fix broken implementation of queue ↵Robert Godfrey2014-04-242-30/+2
| | | | | | automated/derived attributes git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589798 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5709 : [Java Broker] address review comments from Keith WallRobert Godfrey2014-04-245-190/+25
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589777 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5721 : [Java Broker] allow interpolation and parsing of string values ↵Robert Godfrey2014-04-241-1/+95
| | | | | | as maps/list/collections if the String is of the correct JSON form git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589730 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5702: upgrade JUnit dependency from version 3.8.1 to 4.11, change ↵Robert Gemmell2014-04-2221-74/+74
| | | | | | | | imports etc to remove deprecation notices Patch Supplied by Andrew MacBean <andymacbean@gmail.com>. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589144 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5702: remove override from pom to inherit parent property specifying ↵Robert Gemmell2014-04-221-3/+0
| | | | | | junit 4.11 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589143 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: [Java Broker] Remove now dead recovery/dependency resolution classesKeith Wall2014-04-2213-500/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589113 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5715: [Java Broker] Refactor ↵Keith Wall2014-04-2211-1043/+793
| | | | | | VirtualHostStoreUpgraderAndRecoverer/BrokerStoreUpgrader to avoid duplicated code git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589112 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5717: update the ant build to configure javac to the 1.7 formatRobert Gemmell2014-04-221-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589085 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5717: remove compiler configuration override and inherit parent valuesRobert Gemmell2014-04-221-4/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589076 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5048: update to use the current antrun-plugin configuration syntaxRobert Gemmell2014-04-211-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588905 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5048: override the parent pom property to keep using junit 3.8.1 until ↵Robert Gemmell2014-04-211-0/+3
| | | | | | QPID-5702 is applied git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588895 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5715: [Java Broker] Add virtual host node to the model and refactor ↵Keith Wall2014-04-21131-3661/+4504
| | | | | | existing broker functionality to conform the new model. Save configuration model version as VHN attribute and refactor the upgraders and configuration recovery. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588886 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5048: re-instate dependency versions after qpid parent pom removal of ↵Robert Gemmell2014-04-2128-10/+154
| | | | | | | | dependency management section. Patch supplied by Andrew MacBean <andymacbean@gmail.com>. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588885 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5713 : [Java Broker] Remove non-test references to model singleton, and ↵Robert Godfrey2014-04-2079-528/+759
| | | | | | instead treat as an instance variable git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588794 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5712 : [Java Broker] Remove VirtualHostRegistry and remove redundant ↵Robert Godfrey2014-04-2030-1095/+692
| | | | | | maps from BrokerAdapter git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588715 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5698 : [Java Broker] Make all configured object attributes either ↵Robert Godfrey2014-04-1910-26/+52
| | | | | | automated or derived (except for state) and enforce this git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588667 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5578 : Undo accidental commit of r1588632Robert Godfrey2014-04-198-44/+20
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588633 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5578 : [Java Broker] Remove DurableConfigurationStoreHelper as it no ↵Robert Godfrey2014-04-198-20/+44
| | | | | | longer does anything useful git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588632 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5578 : [Java Broker] Remove DurableConfigurationStoreHelper as it no ↵Robert Godfrey2014-04-187-113/+30
| | | | | | longer does anything useful git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588589 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5578 : [Java Broker] Tidy up - minimize use of MapValueConverter, make ↵Robert Godfrey2014-04-1894-782/+399
| | | | | | constructors consistent across ConfiguredObjects git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588586 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5710 : [Java Broker] Use common creation/recovery mechanism for BindingsRobert Godfrey2014-04-188-23/+145
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588501 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5710 : [Java Broker] Use common creation/recovery mechanism for QueuesRobert Godfrey2014-04-1870-1003/+1101
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588468 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5710 : [Java Broker] Remove AMQQueueFactory and QueueRegistryRobert Godfrey2014-04-1714-540/+337
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588301 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5580 : [Java Broker] Introduce explicit type hierarchy for queues in ↵Robert Godfrey2014-04-1742-346/+454
| | | | | | the ConfiguredObject model git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588234 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5709 : [Java Broker] Replace exchange registry / factory with use of ↵Robert Godfrey2014-04-1786-2226/+1678
| | | | | | common configured object mechanism for registration of children git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588126 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5698 : [Java Broker] make attributes automated or derivedRobert Godfrey2014-04-1520-253/+185
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1587682 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5698 : [Java Broker] make the lifetimePolicy attribute automatedRobert Godfrey2014-04-1542-443/+113
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1587367 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5699 : [Java Broker] Make getAttributeNames() in ↵Robert Godfrey2014-04-1424-153/+2
| | | | | | AbstractConfiguredObject return the names based on the annotation metadata, and make the method final git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1587290 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5698 : [Java Broker] remove duplicate definitions of the DURABLE ↵Robert Godfrey2014-04-1418-24/+0
| | | | | | attribute name git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1587266 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5698 : [Java Broker] make the durable attribute automated, remove ↵Robert Godfrey2014-04-1427-739/+273
| | | | | | unused setters git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1587262 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5685: Store configuration version as an attribute of virtualhost within ↵Keith Wall2014-04-1423-303/+618
| | | | | | | | | | | | configuration store rather than within separate database/table * ConfiguredObjectRecordHandler begin/end methods no longer take/return config version * DefaultUpgraderProvider uses the virtualhost record for the config version only and uses this to trigger the correct upgrade. Note this record is *not* recovered (yet). * BDB/SQL Upgraders migrate the config version from database/table to be the modelVersion attribute of a virtualhost entry. * BDB Upgrader tests (7 to 8). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1587165 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5690 : [Java Broker] Improve mechanisms for validating and reacting to ↵Robert Godfrey2014-04-1370-3435/+4118
| | | | | | changes in configured object attribute values git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1587123 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5687 : [Java Broker] change to explicitly use the port in a connection ↵Robert Godfrey2014-04-132-4/+8
| | | | | | url, and avoid the issue of differing vhosts in the test config and initial config (revert last commit 1586942 and modify correct file instead) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586944 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5687 : [Java Broker] change to explicitly use the port in a connection ↵Robert Godfrey2014-04-131-1/+1
| | | | | | url, and avoid the issue of differing vhosts in the test config and initial config git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586942 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5687 : [Java Broker] fix the initial config store to use "type" not ↵Robert Godfrey2014-04-137-54/+66
| | | | | | "pluginType", add a test that checks the broker will startup with no config store. Change the handling of ${amqp.qpid_port} and friends to allow setting through system properties git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586938 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5686 : [Java Broker] Make handling of parents of ConfiguredObjects ↵Robert Godfrey2014-04-1250-1173/+1300
| | | | | | consistent; perform some refactoring of AbstractConfiguredObject to move functionality into helper classes git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586910 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5639 : [Java Broker] Correct SASL Mechanism name in client / use ↵Robert Godfrey2014-04-125-10/+10
| | | | | | consistent name form (SCRAM-SHA-1 not SRAM-SHA1) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586908 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5683 : [Java Broker] Make the AMQP 1.0 protocol logging available ↵Robert Godfrey2014-04-112-29/+93
| | | | | | through log4j (like the rest of the broker) rather than java.logging git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586792 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5680 : [Java Broker] remove configuration defualt mapsRobert Godfrey2014-04-1167-425/+323
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586783 13f79535-47bb-0310-9956-ffa450edef68