summaryrefslogtreecommitdiff
path: root/qpid/java
Commit message (Collapse)AuthorAgeFilesLines
* 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
* QPID-5673 : [Java Broker] Check the virtual host has been found before ↵Robert Godfrey2014-04-111-7/+12
| | | | | | attempting to register the connection with the virtual host git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586780 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5684 : [Java Broker] Links detached with an error should set the closed ↵Robert Godfrey2014-04-111-15/+37
| | | | | | flag to true git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586779 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5048: remove enforcer rule, it is no longer usedRobert Gemmell2014-04-113-346/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586707 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5680 : [Java Broker] move configuration defualts to annotationsRobert Godfrey2014-04-1152-600/+640
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586683 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5676, QPID-5677, QPID-5048: go back to using the original BCEL ↵Robert Gemmell2014-04-104-13/+6
| | | | | | dependency, update dependency related info accordingly git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586273 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5676: revert r1586026, taking a different approach to equalise the buildsRobert Gemmell2014-04-103-5/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586272 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5679 : [Java Broker] Use interpolation for "inherited" attributes (such ↵Robert Godfrey2014-04-1036-1097/+553
| | | | | | as queue alerting) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586268 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5677: commons-configuration is no longer used on trunk, remove it from ↵Robert Gemmell2014-04-091-5/+0
| | | | | | the NOTICE for the 'java release' archive git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586157 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5677: stop including extra files within the qpid-all.jar manifest jarsRobert Gemmell2014-04-092-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586156 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5675: remove the unused xalan dependency, matching previous change in ↵Robert Gemmell2014-04-093-34/+1
| | | | | | the maven build git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586028 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5674: update the target creating the 'java release' tar to ignore the ↵Robert Gemmell2014-04-091-0/+2
| | | | | | test results and work directories git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586027 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5676: update BCEL dependency in the Ant build to match previous change ↵Robert Gemmell2014-04-093-5/+5
| | | | | | for the maven build git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586026 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5048: include the JMS API jar in the client release assemblies as we ↵Robert Gemmell2014-04-094-0/+24
| | | | | | have in the past git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586025 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5677: separate and update the LICENCE and NOTICE file used for sourceRobert Gemmell2014-04-097-635/+896
| | | | | | | | | release, jar files, and the ugly 'java binary release' tar, and use the files added for the maven assemblies for the individual component binary releases, allowing us to ensure they have appropriately tailored information to match their content git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586023 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5672 : [Java Broker] move variable interpolation to the configured objectRobert Godfrey2014-04-09172-1154/+2329
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585979 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5665 : [Java Broker] remove commented out codeRobert Godfrey2014-04-071-4/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585474 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5665 : [Java Broker] Unify VirtualHost model and implementation classesRobert Godfrey2014-04-0756-1942/+1436
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585471 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5048: update property to reflect the 'cpp' profile being non-persistent ↵Robert Gemmell2014-04-071-1/+1
| | | | | | (it explicitly doesnt load any modules, which the stores are) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585440 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5048: update broker assembly NOTICE file and dependency check reference ↵Robert Gemmell2014-04-052-35/+0
| | | | | | file to account for dependency changes via QPID-5624 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585112 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5657: update the geronimo jms 1.1 spec jar from 1.0 to 1.1.1, for the ↵Robert Gemmell2014-04-053-3/+3
| | | | | | | | Ant build. Work by me and Andrew MacBean <andymacbean@gmail.com>. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585106 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5048: fix parsing error in AbstractTestLogging when determining ↵Robert Gemmell2014-04-052-19/+21
| | | | | | | | connection or channel id, which causes spurious failure when test ordering differs while running in Jenkins Patch supplied by Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585105 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5048: some minor additions and whitespace fixups to the licence/notice infoRobert Gemmell2014-04-055-20/+35
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585103 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5048: add dependency change verifcation reference files and LICENSE, ↵Robert Gemmell2014-04-0529-77/+1468
| | | | | | | | NOTICE & README files for use in the binary release assemblies Work by me and Andrew MacBean <andymacbean@gmail.com>. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585102 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5615 : [Java Broker] Migrate broker config store to use same API as ↵Robert Godfrey2014-04-04206-5592/+6046
| | | | | | VirtualHost config store git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1584931 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5653: Replace DurableConfigurationStore/MessageStore recoverers with ↵Keith Wall2014-04-0454-1871/+2682
| | | | | | | | | | | visitors. * MS/DCS impls now have stateless visitXXX methods to retrieve message/configuration data (replaces the recoverXXXX methods) * VH implementations now uses Handlers to perform the recovery operation. * DCS's handler (ConfiguredObjectRecordRecoveverAndUpgrader) currently implemented in terms of the old DefaultUpgradeProvider/DurableConfigurationRecoverer. This will be refactored by a future commit. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1584600 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5653, QPID-5624: Remove support for virtual host xml and make message ↵Keith Wall2014-04-01213-6831/+3521
|\ | | | | | | | | | | | | | | | | | | and configuration stores stateless. This commit will temporarily break the UI git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1583597 13f79535-47bb-0310-9956-ffa450edef68
| * NO-JIRA: Final merge from trunk before reintegrationjava-broker-bdb-ha2Keith Wall2014-04-015-12/+83
| |\ | |/ |/| | | 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-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-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: [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