summaryrefslogtreecommitdiff
path: root/qpid/java/common
Commit message (Collapse)AuthorAgeFilesLines
* QPID-5420: Restore ability to consume using BURLs specifying default exchange.Keith Wall2014-01-071-0/+6
| | | | | | | | | | | | * Java Broker: Changed AbstractVirtualHost so that createExchange throws ExchangeExistException before checking for a reserved exchnage name. The effect will be that the Java Broker will again accept active declaration of the built in exchanges (amq.*, qpid.* and default). * Java Broker: Changed the 0-8..0-9-1 ExchangeBoundHandler so that a null exchnage name is treated to mean the default exchange. This matches the behaviour of ServerSessionDelegate#exchangeBound() on the 0-10 path. This allows the Java client to query bindings on the default exchange. * Client: Changed AbstractAMQMessageDelegate.java so that 0-10 knows the type of the default exchange when populating the JMSDestination on received messages. * Client: Introduced system property qpid.bind_queues system property so that the exchange/queue bind side effect can be suppressed on consumer creation. Like qid.declare_exchanges and declare_queues, this system propery has effect when using BURLs. Might be useful if using a new client with older broker. * Added new system tests. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1556292 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5282: Change IoSender to cause the socket to be closed after a sender ↵Keith Wall2013-11-201-28/+52
| | | | | | | | | | timeout IoSender#send now causes the socket to be closed in response to a sender timeout (in addition to the SenderException). Note that this code path avoids the close causing the sender thread join (as this would most likely timeout too). Also improved log/exception messages to include the remote socket address (to aid problem diagnosis). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1543721 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5336: Don't hardcode location of bash in shell scriptsAndrew Stitcher2013-11-142-2/+2
| | | | | | | As bash isn't specified by POSIX its location is variable. Specifically under BSDs it isn't found in /bin/bash. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1541763 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5255: Change trunk version to 0.27Justin Ross2013-11-121-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1541283 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4534: unify client heartbeat system properties/connection url options.Keith Wall2013-10-308-148/+202
| | | | | | | | | | | * Connection url 'heartbeat' broker-option (and deprecated 'idle_timeout') now understood for all protocols * System property 'qpid.heartbeat' (and deprecated 'amqj.heartbeat.delay' and 'idle_timeout') now understood for all protocols * Enhanced heartbeat system tests * Docbook updates Original patch from Keith Wall, plus updates from Robbie Gemmell git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1537313 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5223: add system property to toggle populating the 'expiration' header ↵Robert Gemmell2013-10-131-0/+7
| | | | | | with the raw TTL value instead of the actual expiration time, for interop with e.g. RabbitMQ git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1531761 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5048: remove the groupId from sub-modules, inherit org.apache.qpid from ↵Robert Gemmell2013-10-061-1/+0
| | | | | | the parent git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1529705 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5207, QPID-5048: use the dojo release zip instead of extracting files ↵Robert Gemmell2013-10-061-1/+0
| | | | | | from the war git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1529610 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5048: add pluginManagement section to the qpid parent, to override ↵Robert Gemmell2013-09-301-15/+2
| | | | | | | | | apache parent versions as desired and set any additional config. Sets the compiler source+target values in parent and removes unecessary duplicate compiler plugin config from child modules. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527797 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5193: update the source and target values used for javac to 1.6Robert Gemmell2013-09-291-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527389 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5192: commit the protocol and logging files output by running the ↵Robert Gemmell2013-09-29491-0/+63972
| | | | | | updated explicit generation process git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527366 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5192: update protocol generation templates to remove whitespace errors ↵Robert Gemmell2013-09-2919-262/+199
| | | | | | in and improve readability of generated classes git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527357 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5192, QPID-5048: update the maven build in line with previous QPID-5192 ↵Robert Gemmell2013-09-291-48/+40
| | | | | | | | | commit, generate into the src tree but only when -Dgenerate=true is used Moves the JavaCC invocation in common and the antrun-plugin invocation in broker-core to their own profile so they dont run unless requested. The antrun-plugin in common to be similarly moved when other changes to what its doing later become possible. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527355 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5192: make the protocol and logging source generation explicitly ↵Robert Gemmell2013-09-292-23/+15
| | | | | | triggered by setting -Dgenerate=true. Generate the files directly into the src dir so as to overwrite the previous versions upon request. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527353 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5192: remove erroneous template, it causes creation of a junk file ↵Robert Gemmell2013-09-291-37/+0
| | | | | | simply called "null" which wouldnt compile if it were ever tried git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527352 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5158: remove old/duplicate create-version target, fix version.file ↵Robert Gemmell2013-09-293-0/+4
| | | | | | property location git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527351 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5184 : Setting message expiration to 0 should lead to the header ↵Robert Godfrey2013-09-272-17/+94
| | | | | | 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-5048: add initial pom files for a maven buildRobert Gemmell2013-09-231-0/+174
| | | | | | still a work-in-progress git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1525753 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5164: remove use of qpid-all.jar from scripts, use classpath wildcard ↵Robert Gemmell2013-09-231-2/+2
| | | | | | expansion to pick up .jar files in the dir instead git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1525752 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5160: add a qpid-test-utils module instead of making every modules ↵Robert Gemmell2013-09-237-809/+1
| | | | | | 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-5158: extract the generation process for the common and broker modules ↵Robert Gemmell2013-09-232-53/+140
| | | | | | into dedicated build files git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1525730 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5157: Remove dead target whose execution is conditional on a property ↵Robert Gemmell2013-09-231-21/+1
| | | | | | which is never set. Remove unused properties/refs. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1525729 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-219-149/+53
| | | | | | 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-082-114/+32
| | | | | | 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-303-48/+121
| | | | | | properly in all cases git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1508680 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4961: Change trunk version to 0.25Justin Ross2013-07-181-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1504343 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4994: Remove redundant binding URL options for subscription name and ↵Alex Rudyy2013-07-173-27/+0
| | | | | | client id git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1504185 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4659 : [Java Broker] move amqp 0-8 implementation into a pluginRobert Godfrey2013-07-161-6/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1503651 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-214-7/+57
| | | | | | 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-4934 : [Java XA] Stop redundant session creation for XA Sessions, ↵Robert Godfrey2013-06-181-1/+16
| | | | | | improve logging for XA git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1494214 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4925 : [Java Broker] Timeout connections which do not complete ↵Robert Godfrey2013-06-142-1/+10
| | | | | | connection handshake git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1493240 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4900: Add the server properties to the AMQP 1.0 SASL ProtocolEngine as ↵Robert Gemmell2013-06-061-5/+11
| | | | | | well. Use the same base property names for all protocol versions, using the standard 'version' and 'product' property names from AMQP 0-x specs. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1490260 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4904 : [Java] AMQShortString.equals should on return true if it is ↵Robert Godfrey2013-06-032-22/+15
| | | | | | being compared to another AMQShortString git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1488957 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4900 : [Java Broker] Broker should return its version to the client as ↵Robert Godfrey2013-06-021-0/+7
| | | | | | informational property in connection initiation git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1488655 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4897 : [Java Broker] Allow selectors on bindings fro non-topic exchangesRobert Godfrey2013-06-011-1/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1488561 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4873 Commiting patch by Helen Kwong.Rajith Muditha Attapattu2013-05-233-5/+57
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1485878 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4849 The previous code was assuming that "CN" was the first entryRajith Muditha Attapattu2013-05-151-2/+3
| | | | | | | in the name string. Changed the code to first find "CN" and then extract from there. testMultipleCertsInSingleStore verifies this change. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1483079 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4831 : [Java Broker] Fix closedown on SSL when SSL and TCP can use same ↵Robert Godfrey2013-05-121-6/+9
| | | | | | port git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1481502 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4382 : [Java Broker] Implement the default exchange as a facade on top ↵Robert Godfrey2013-05-111-1/+1
| | | | | | of the queue registry git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1481350 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4831 : [Java Broker] Allow SSL and non-SSL connections on the same portRobert Godfrey2013-05-112-1/+272
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1481331 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: add missing licence headers to various java filesRobert Gemmell2013-05-051-0/+20
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1479398 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4798 : use stripped BSD licensed versions of the amqp spec filesRobert Godfrey2013-05-021-4/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1478520 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4739: complete support for defining multiple key/trust stores and ↵Robert Gemmell2013-04-122-2/+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-4637: Change the Qpid version to 0.23Justin Ross2013-03-241-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1460486 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-4000 : [Java Broker] Add conversion of 0-x messages to 1-0 subscriptionsRobert Godfrey2013-03-174-0/+1090
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1457482 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-4636: add support for a broker 'peerStore' that can be used to perform ↵Robert Gemmell2013-03-143-20/+275
| | | | | | | | 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