summaryrefslogtreecommitdiff
path: root/qpid/java/common/src/test
Commit message (Collapse)AuthorAgeFilesLines
* QPID-5184 : Setting message expiration to 0 should lead to the header ↵Robert Godfrey2013-09-271-0/+3
| | | | | | property being unset - not being set as the empty string git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1526904 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5160: add a qpid-test-utils module instead of making every modules ↵Robert Gemmell2013-09-236-809/+0
| | | | | | tests rely on the tests dir from the common module git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1525738 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5157: remove unused test-only mock implementationRobert Gemmell2013-09-231-105/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1525728 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5088 : [Java Broker] Isolate use of AMQShortString and FieldTable to ↵Robert Godfrey2013-08-211-1/+1
| | | | | | 0-8/9/9-1 protocol specific plugins git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1516058 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5056 : [Java Broker] Change configuration model to allow for ↵Robert Godfrey2013-08-081-19/+1
| | | | | | KeyStores/TrustStores which are not JKS files on the filesystem git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1511825 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4875 : The parsing logic for certificate subjects does not work ↵Robert Godfrey2013-07-301-0/+52
| | | | | | properly in all cases git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1508680 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4943: Introduce a feature for 0-8/0-9/0-9-1 protocols to close a ↵Alex Rudyy2013-06-211-0/+26
| | | | | | connection on receiving a mandatory unroutable message in a transacted session git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1495511 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4937 : [Java Broker] separate virtualhosts into different typesRobert Godfrey2013-06-191-6/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1494667 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4904 : [Java] AMQShortString.equals should on return true if it is ↵Robert Godfrey2013-06-031-4/+4
| | | | | | being compared to another AMQShortString git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1488957 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4739: complete support for defining multiple key/trust stores and ↵Robert Gemmell2013-04-121-0/+37
| | | | | | assigning them on a port-specific basis git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467334 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4636: expand testing of the new TrustManagersRobert Gemmell2013-03-171-40/+222
| | | | | | | | | | | | | | - 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-4636: add unit tests for new TrustManagersRobert Gemmell2013-03-141-0/+162
| | | | | | Applied patch from Michal Zerola git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1456555 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4390: Introduce a configuration store in java broker allowing runtime ↵Alex Rudyy2013-02-192-6/+41
| | | | | | modifications and replace existing xml file configuration with json configuration store git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1447646 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4281: Fix setting of log4j configuration in system tests. While testing ↵Alex Rudyy2013-01-241-0/+3
| | | | | | | | the fix, some tests were found to be failing on spawned profile due to config problems - also fixed these. Applied patch from Philip Harvey <phil@philharveyonline.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1438053 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2796 : Implement hearbeating in Java Broker (all protocol versions) and ↵Robert Godfrey2012-11-253-2/+273
| | | | | | Java Client (0-8/9/9-1 path) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1413376 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4469: remove the unused sslContext parameter in ↵Robert Gemmell2012-11-251-2/+1
| | | | | | OutgoingNetworkTransport#connect() and cleanup associated dead code git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1413363 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4441: ensure that using FieldTable#addAll(table) works when providing a ↵Robert Gemmell2012-11-181-74/+32
| | | | | | source FieldTable that has been created from an encoded byte[] but has yet to be otherwise used git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1410949 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4419: ensure the broker kills the 0-10 connection immediately for ↵Robert Gemmell2012-11-041-0/+7
| | | | | | explicit reason that no sasl mech was chosen, instead of sending an incorrect ConnectionTune and then killing the connection as side effect of a subsequent NPE. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1405489 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4335, QPID-4353: Refactored broker plugins to use simplified ↵Robert Gemmell2012-10-121-0/+50
| | | | | | | | | | | | | | | | ServiceLoader-based model rather than embedding Felix to use OSGi. Removed the ability to reload security configuration because this feature is not very useful in its current form and was making our code hard to refactor. Modified all tests to use jars rather than classes. This makes them closer to real-world deployments, e.g. the META-INF/services file is read from within the jar. Also moved various system tests from their respective modules into "systests". This removes the need for most modules to depend on systests, thus simplifying our dependency graph. Applied patch from myself, Keith Wall and Phil Harvey <phil@philharveyonline.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1397519 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Add missing Apache licenses to Java source files; correct ↵Keith Wall2012-07-023-3/+3
| | | | | | positioning of the license wrt to the package statement git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1356257 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3977: ChartingUtil now generates chart-summary.html file to facilitate ↵Keith Wall2012-06-151-0/+63
| | | | | | | | chart png browsing from CI server. Applied patch from Philip Harvey <phil@philharveyonline.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1350625 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4062 : [Java Tests] add misssing file from previous checkinRobert Godfrey2012-06-121-0/+127
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1349531 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4062 : [Java Tests] Java system tests sometimes fail due to JMX port ↵Robert Godfrey2012-06-121-51/+2
| | | | | | already initialised (Applied patch from Philip Harvey git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1349443 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4042 : [Java Broker] Add SSL Client Auth supportRobert Godfrey2012-06-061-0/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1346817 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3973 : [Java] Add support for non JKS key store types (patch supplied ↵Robert Godfrey2012-05-181-6/+7
| | | | | | by jsightle@redhat.com) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1340191 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4006: add support for using BDB HA to form an active-passive cluster ↵Robert Gemmell2012-05-171-6/+6
| | | | | | | | | | | for persistent messaging - Includes support for setting BDB configuration parameters via the store configuration, both for the existing store and the new HA variant. - Removes the MessageStoreFactory and reverts store configuration to historical values. Applied patch from Keith Wall, Andrew MacBean <andymacbean@gmail.com>, Oleksandr Rudyy <orudyy@gmail.com>, Philip Harvey <phil@philharveyonline.com>, and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1339728 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3923: Store queue, exchange and binding as configured objects in bdb storeRobert Gemmell2012-04-171-0/+1
| | | | | | Applied patch by Oleksandr Rudyy <orudyy@gmail.com>, Phil Harvey <phil@philharveyonline.com>, and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1327003 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3917: Refactor VirtualHost/MessageStore implementations to be ready for ↵Keith Wall2012-03-301-7/+8
| | | | | | | | BDB-HA Applied patch from Andrew MacBean <andymacbean@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1307416 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: QpidBrokerTestCase - minor improvementsKeith Wall2012-03-301-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1307316 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3886 Committing a patch by Kevin Conner.Rajith Muditha Attapattu2012-03-081-0/+114
| | | | | | | The purpose of the patch is to improve the efficiency of processing known-complete (command id ranges). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1298536 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3293: add new system properties for setting client send/receive buffer ↵Robert Gemmell2012-02-191-0/+46
| | | | | | sizes on connections, restore legacy properties git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291056 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Remove redundant code from client and common trees.Keith Wall2012-02-061-7/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1241107 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: remove test-only and unused connect methodsRobert Gemmell2012-02-051-8/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1240812 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3739: Java properties qpid.ssl.keyStoreCertType and ↵Keith Wall2012-01-294-25/+249
| | | | | | | | | | | | | | | qpid.ssl.trustStoreCertType have misleading names and would be better called qpid.ssl.[Key|Trust]ManagerFactory.algorithm * Introduced two properties qpid.ssl.KeyManagerFactory.algorithm and qpid.ssl.TrustManagerFactory.algorithm to allow a client user to override the algorithm name used when Qpid client constructs a KeyManager or TrustManager. * Continued to support qpid.ssl.keyStoreCertType and qpid.ssl.trustStoreCertType (now marked as deprecated) * Introduced a new Java Broker configuration key connector/ssl/keyManagerFactoryAlgorithm * Continued to support broker configuration key connector/ssl/certType (now marked as deprecated and will issue warning if used). * Changed the default from hardcoded 'SunX509' to the value(s) returned by KeyManagerFactory#getDefaultAlgorithm() and TrustManagerFactory#getDefaultAlgorithm(). This allows the Java Broker and Client to be used out of the box on non-Sun JDKs without having to set qpid.ssl.KeyManagerFactory.algorithm or qpid.ssl.TrustManagerFactory.algorithm. * Updated client docbook documentation. Tested both Java Broker and Client on IBM JDK and ensured all 0-10 and 0-9-1 profiles pass (including SSLTest which was failing prior to this change). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237504 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Encapsulate fields, use private members and accesors (keep ↵Robert Godfrey2012-01-273-8/+8
| | | | | | checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236867 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA : [Java] Tidy up import statements across the codebase, remove ↵Robert Godfrey2012-01-2719-63/+65
| | | | | | unused/redundant imports (keep Checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236638 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3715: Fix the receiving of an empty ObjectMessage (without a body)Keith Wall2012-01-071-0/+111
| | | | | | Applied patch from Oleksandr Rudyy<orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1228583 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3714 : [Java] Performance ImprovementsRobert Godfrey2011-12-282-55/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Persistence: Store message in same transaction as enqueue if possible Memory: Remove unnecessary (un)boxing Reduce unnecessary copying of message data Cache short strings Cache queues for a given routing key on an Exchange (0-9) Use a fixed size buffer for preparing frames to write out Other: Reduce calls to System.currentTimeMillis (0-10) Special case immutable RangeSets, in particular RangeSets of a single range/point (0-10) Special case delivery properties and message properties in headers (0-9) send commit-ok as soon as data committed to store Cache publishing access control queries (0-9) Optimised long and int typed values for FieldTables (0-9) Retain FieldTable encoded form (0-9) Cache queue and topic destinations git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1225178 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: add missing licence headers to various files in the java treeRobert Gemmell2011-11-173-0/+58
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1203385 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3610: set TCP_NODELAY to true by default, add new system property for ↵Robert Gemmell2011-11-111-0/+49
| | | | | | changing default, add unit tests for system properties + connection url options. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1200803 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3519: refactor consumer argument handlingKeith Wall2011-11-091-11/+43
| | | | | | Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1199664 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3402: fix excludes files to work with spaces etc in path, make SSL ↵Robert Gemmell2011-09-251-1/+5
| | | | | | tests use relative path to keystore files to allow parsing the URLs containing them git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1175567 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3415: Change 0-10 code path to utilise the CallbackHandlerRegistry to ↵Keith Wall2011-09-191-49/+54
| | | | | | create the correct CallbackHandler. The sasl_mechs property/broker option is retained, but continues to be understood only by the 0-10 path. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1172506 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3449: adds ability to override the session timeout via JVM properties ↵Robert Gemmell2011-09-121-0/+81
| | | | | | | | qpid.sync_op_timeout and the legacy amqj.default_syncwrite_timeout, across all protocol versions Applied patch by Oleksandr Rudyy <orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1169773 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2627 : Remove dependency on MINARobert Godfrey2011-09-096-54/+125
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1167311 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3473 : Replace use of MINA IO with transport IO (joint work with Robbie ↵Robert Godfrey2011-09-074-828/+16
| | | | | | Gemmel) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1166069 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: remove test config for Logger which is no longer used, move test ↵Robert Gemmell2011-08-211-10/+63
| | | | | | start reporting to QTC so it shows up in output of non-broker tests, move log level utility methods to QTC git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1159998 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3429: ensure that SSL is enabled correctly in MinaNetworkHandler. ↵Robert Gemmell2011-08-185-71/+106
| | | | | | | | Refactor SSLContextFactory to be a factory, and present a useful interface for both client and server side use. Added keystore for the Java broker, renamed existing client trust/key stores for clarity. Fix SSL port configuration. Added new SSL tests, and ensure these are *always* run in the Java 0-10 profiles. Committing work by myself and Keith Wall. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1159250 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3342: Regression when forming SSL connections.Robert Gemmell2011-08-151-2/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1157866 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3402: revert r1155516, bad things happened without spaceRobert Gemmell2011-08-091-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1155972 13f79535-47bb-0310-9956-ffa450edef68