summaryrefslogtreecommitdiff
path: root/qpid/java
Commit message (Collapse)AuthorAgeFilesLines
* Merged up to r1465457Robert Godfrey2013-04-23206-4658/+11565
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1471141 13f79535-47bb-0310-9956-ffa450edef68
* Merged up to r1465457Robert Godfrey2013-04-2344-367/+891
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1471100 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4657, QPID-4683 : merged to QPID-4659 branchRobert Godfrey2013-04-229-39/+272
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1470450 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4680 : merged to QPID-4659 branchRobert Godfrey2013-04-221-1/+23
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1470443 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4677 : merged to QPID-4659 branchRobert Godfrey2013-04-2219-167/+167
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1470440 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4678 : merged to QPID-4659 branchRobert Godfrey2013-04-2214-9/+711
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1470438 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4677 : merged to QPID-4659 branchRobert Godfrey2013-04-2211-110/+324
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1470433 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4671 : merged to QPID-4659 branchRobert Godfrey2013-04-222-2/+72
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1470430 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4666 : merged to QPID-4659 branchRobert Godfrey2013-04-221-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1470428 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA : merging from trunk to keep branch up to dateRobert Godfrey2013-03-2755-2644/+1600
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1461870 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4659 : Address JIRA comments from Robbie GemmellRobert Godfrey2013-03-2712-76/+57
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1461575 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4659 : [Java Broker] refactor to separate protocol dependent from ↵Robert Godfrey2013-03-18165-1557/+2556
| | | | | | protocol independent classes git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1458042 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4657: Add UI into java broker web management console to add/edit/delete ↵Alex Rudyy2013-03-1813-22/+507
| | | | | | ports git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1457903 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4656: added perftests documentationPhil Harvey2013-03-181-0/+105
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1457805 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4655: add BrokerOptions support for skipping the logging configuration ↵Robert Gemmell2013-03-183-2/+29
| | | | | | (and LoggingManagementMbean registration as a result) when embedding the broker git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1457612 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4636: expand testing of the new TrustManagersRobert Gemmell2013-03-177-41/+284
| | | | | | | | | | | | | | - Removes the 'app2' cert from the test broker peer store so it only contains the 'app1' cert. - Add a java broker trust store (currently continues to match client trust store, contans the test CA). - Add a java client keystore with a completely untrusted cert. - Add additional unit testing of QpidPeersOnlyTrustManager inc use of otherwise trusted certs, and completely untrusted certs. - Add additional unit testing of QpidMultipleTrustManager and its behaviour when wrapping a regular TrustManager, a QpidPeersOnlyTrustManager, and both at once. - Add system tests showing a client with untrusted SSL cert failing to connect, then succeeding when adding it to the peerStore on the broker. Work by myself and Michal Zerola. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1457599 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4654 : [Java Client 1.0] Add connection redirect support to the AMQP ↵Robert Godfrey2013-03-17148-13283/+13497
| | | | | | 1.0 JMS client git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1457505 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4653 : [Java Broker 1.0] Implement statistics counting on 1.0 connectionsRobert Godfrey2013-03-174-11/+40
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1457489 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4652 [Java Broker 1.0] delete temporary queues created for exchange ↵Robert Godfrey2013-03-171-0/+37
| | | | | | subscription when connection closes git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1457485 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4000 : [Java Broker] Add conversion of 0-x messages to 1-0 subscriptionsRobert Godfrey2013-03-171-21/+14
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1457484 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4000 : [Java Broker] Add conversion of 0-x messages to 1-0 subscriptionsRobert Godfrey2013-03-1710-216/+776
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1457482 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4636: add 'peersOnly=false' on the 'regular trustStore' for clarity, ↵Robert Gemmell2013-03-143-2/+4
| | | | | | add assertion exclusion on a couple of system tests to get them passing git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1456556 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4636: add unit tests for new TrustManagersRobert Gemmell2013-03-143-0/+163
| | | | | | Applied patch from Michal Zerola git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1456555 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4636: add support for a broker 'peerStore' that can be used to perform ↵Robert Gemmell2013-03-148-37/+324
| | | | | | | | SSL client auth based on specific 'trusted peer' certs existing in it, rather than via use of a trusted CA cert. Applied patch from Michal Zerola git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1456554 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4593: Remove initial store type command line argument, simplify ↵Alex Rudyy2013-03-1419-939/+953
| | | | | | configuration store interface, split json configuration store into memory and json stores git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1456473 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4549 Applying Pavel's patch.Rajith Muditha Attapattu2013-03-131-5/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1456131 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3769 Modified the hashcode impl to match equals. Added a test caseRajith Muditha Attapattu2013-03-132-5/+57
| | | | | | to verify equals and hashcode for ADDR based destinations. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1456008 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3769 Applying a modified version of a patch from Siddesh Poyarekar.Rajith Muditha Attapattu2013-03-131-7/+25
| | | | | | | | The original patch did a literal comparison of the address strings which can cause issues if it had white spaces. The modified version matches the type and name. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1456007 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4596,QPID-4638: Change authentication provider names to shorter names, ↵Alex Rudyy2013-03-1321-36/+32
| | | | | | rename Port#AUTHENTICATION_MANAGER into Port#AUTHENTICATION_PROVIDER git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1455919 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4597: Missing licence on new java test added by rev 1449342. No other ↵Keith Wall2013-03-121-0/+19
| | | | | | change. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1455732 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4645: the firewall plugin no longer exists, functionality is aprt of ↵Robert Gemmell2013-03-122-3/+2
| | | | | | the access-control plugin now git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1455497 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4645: forgot the HA related jmx addon for the optional bdbstoreRobert Gemmell2013-03-121-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1455476 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4645: add the broker-plugins and bdbstore moudles as optional ↵Robert Gemmell2013-03-114-2/+17
| | | | | | dependencies in the broker pom to simplify their use, make the bdbstore plugin match the others by using provided scope for the brokers modules (and the JE dep) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1455361 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4639: Add UI to add/delete virtual hosts into java broker web ↵Alex Rudyy2013-03-1117-30/+471
| | | | | | management console git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1455274 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4638: Add UI to add/delete/update authentication providers into java ↵Alex Rudyy2013-03-1131-187/+1075
| | | | | | broker web management console git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1455273 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4596: remove manipulation of store files, and vhost store type etc.Robert Gemmell2013-03-102-227/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454943 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4390: misc cleanupRobert Gemmell2013-03-105-39/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454942 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4390: change new sytem property names to include broker to allow ↵Robert Gemmell2013-03-104-12/+16
| | | | | | distinguising them from any related client config. Separate defaults from the configurable value. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454941 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4390: move the work dir defaulting and configuration fully within ↵Robert Gemmell2013-03-104-38/+166
| | | | | | BrokerOptions git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454940 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4390: remove dead code, method was only ever called with null envVarMap argRobert Gemmell2013-03-102-20/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454939 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4390: misc logging related changesRobert Gemmell2013-03-105-19/+32
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454938 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4390: move the store factory interface beside the other plugin factory ↵Robert Gemmell2013-03-108-4/+8
| | | | | | interfaces git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454937 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4390: remove the BDB-HA store factory to remove it from the types ↵Robert Gemmell2013-03-103-44/+1
| | | | | | usable via the management interface, until such time as it can actually be configured without using virtualhosts.xml git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454936 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4445: make the jar file produced by the JCA module use 'jca' in its ↵Robert Gemmell2013-03-1013-20/+182
| | | | | | name rather than 'ra', add support for generating maven artifacts for the jar and the packaged rar. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454935 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4274 Applied the same fix when an exchange is deleted as the sameRajith Muditha Attapattu2013-03-071-0/+1
| | | | | | | situation could arise if the exchange gets deleted by a receiver or a producer. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454135 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4274 Applied Pavel's fix of setting the resolved time to zero, butRajith Muditha Attapattu2013-03-071-0/+1
| | | | | | in a different location where the node deletes are handled. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454134 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3396 Excluded my new test until we make decision on whether to portRajith Muditha Attapattu2013-03-071-0/+2
| | | | | | the fix to the 8-8/0-9 code path. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1453954 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3396 Fixed the typo from sasl_mech to sasl_mechs. This test wasRajith Muditha Attapattu2013-03-071-1/+1
| | | | | | passing (0-10 code path) due to the broker selecting CRAM_MD5. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1453951 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3396 Added a test case to verify that if mech needs user passwordRajith Muditha Attapattu2013-03-061-0/+24
| | | | | | and if they are not supplied and exception is thrown. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1453594 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3396 Changed the test cases to relect that username and passwordRajith Muditha Attapattu2013-03-062-5/+4
| | | | | | is optional. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1453559 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status