summaryrefslogtreecommitdiff
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* Merged out from trunkQPID-2519Stephen D. Huston2011-10-211120-88906/+35639
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187375 13f79535-47bb-0310-9956-ffa450edef68
* Undo bad merge from trunk - merged at wrong level.Stephen D. Huston2011-10-211120-35382/+89006
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68
* Merge trunk to QPID-2519 branchStephen D. Huston2011-10-201119-88879/+35255
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1186990 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3029: Set channel and heatbeat max to correct valuesAndrew Donald Kennedy2011-02-181-5/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071972 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3065: Tidy up unused parts of DisassemblerAndrew Donald Kennedy2011-02-171-25/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071700 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3028: only hold the bytes for the cached string, instead of the entire ↵Robert Gemmell2011-02-172-1/+18
| | | | | | network read buffer array git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071676 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3028: use a small array and companion HashMap to store the incomplete ↵Robert Gemmell2011-02-171-13/+42
| | | | | | Methods, rather than pre-allocating a 64000 entry array git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071675 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3028: make assembler and disassembler use a static ThreadLocal for its ↵Robert Gemmell2011-02-173-7/+12
| | | | | | BBEncoder and BBDecoder, release buffer from BBDecoder when complete git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071674 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3066: Correct conditions for running UTF8TestAndrew Donald Kennedy2011-02-171-23/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071642 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3065: Send header and frame data as single bufferAndrew Donald Kennedy2011-02-171-10/+13
| | | | | | | The Disassembler now fills a ByteBuffer with the entire frame contents before passing it to the Sender. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071641 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3008: Fix failover behaviour in 0-10 for QueueBrowserAutoAckTestAndrew Donald Kennedy2011-02-173-26/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071631 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3047: Fix QueueDepthWithSelectorTest on 0-10Andrew Donald Kennedy2011-02-172-111/+31
| | | | | | Refactor test and fix 0-10 client session to flush acks git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071620 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3048: InternalBrokerBasecase not removing all log actorsAndrew Donald Kennedy2011-02-172-12/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071465 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3016: Store soft references to ReplyTo destinationsAndrew Donald Kennedy2011-02-171-14/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071462 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3056: remove the unused SSL certificate, and then also the newly-empty ↵Robert Gemmell2011-02-141-0/+0
| | | | | | resources folder itself git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1070544 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3055Rajith Muditha Attapattu2011-02-144-118/+70
| | | | | | | | | | | | As the first step added system properties for host, port and address and got rid of the jndi lookup. There is also a system property for URL which allows a user to specify a fully fledged URL with various connection options like SSL etc.. If the host & port is specified the URL property is ignored. I also added some documentation in the perf_report.sh suggesting recommended settings for performance testing. These are guidelines only and a prospective user needs to experiment with their environment to fine tune the settings. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1070519 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3054: remove unused java/systests/src/old_test contentsRobert Gemmell2011-02-147-1235/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1070497 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3050Rajith Muditha Attapattu2011-02-121-1/+1
| | | | | | | Modified the code to use the correct system property name. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1069998 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3043Rajith Muditha Attapattu2011-02-111-1/+1
| | | | | | | | | I had accidently marked the 'connectionLost' variable static. Removing the static identifier from the said variable. Thanks to Andrew Kennedy for spotting this. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1069858 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3043Rajith Muditha Attapattu2011-02-092-3/+23
| | | | | | | Added the extra state 'RESUMING', to ensure that any new session creation is delayed until the connection is able to reattach all existing sessions. If a connection is reconnecting then it will first go to RESUMING state (instead of OPEN) in connection-open-ok. Once the 'resume' method in Connection.java is completed the state will be set to OPEN. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1069159 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2994Rajith Muditha Attapattu2011-02-092-3/+16
| | | | | | | | | | | | | | | | | The commit made in rev 1068661 will only close and throw an exception if the user tries to invoke an action (Ex sending a message or calling commit) on the transactional session while failover is in progress (i.e session in detached state). We also need to handle the case where the application is not doing anything during failover. But the application may still be in the middle of an uncommitted transaction. Therefore any session that is marked transactional should not be resumed. This commit removes tranactional sessions and close them inside the 'resume' method in Connection.java Any subsequent operation on this session will cause an exception being thrown, saying the session is closed. However the exception doesn't really contain the reason, other than to say the session is closed. The Java client in general needs a better error reporting scheme to convey more information to a client application. That will be handled under a separate JIRA. For the purpose of this JIRA the session being closed is good enough for the time being. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1069105 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3042Rajith Muditha Attapattu2011-02-091-0/+11
| | | | | | | The createSession method in Connection.java now waits until the connection state == OPEN before it actually sends the session-attach on the wire. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1068696 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2994Rajith Muditha Attapattu2011-02-081-1/+11
| | | | | | | | | If the session is transactional, in the invoke method the session state is checked to see if it has dettached. If so the session is removed from the internal map maintained by the connection object. This prevents it from being resumed. An exception is also thrown notifying that failover may have happened in the middle of a transaction and the session is closed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1068661 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1916: default to using a local repo in the scratch dir (configurable ↵Robert Gemmell2011-02-082-5/+15
| | | | | | with maven.local.repo), generate poms into the scratch dir, make the artifacts a SNAPSHOT version by default (configurable with maven.snapshot), and tweak the SNAPSHOT output version naming not to be unique (configurable with maven.unique.version) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1068445 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2900: Changed SimpleAMQQueue to avoid race condition in the updating ↵Robert Gemmell2011-02-086-28/+396
| | | | | | | | atomic QueueContext._releasedEntry. Race was between thread SubFlushRunner (or QueueRunner) executing method SimpleAMQQueue.setLastSeenEntry and the thread executing the MessageRelase command executing method SimpleAMQQueue.updateSubRequeueEntry. Bolstered the unit tests surrounding the area of change to reduce risk of regression. Overrode TestableMemoryMessageStore#close() to avoid a NPE during tearDown silently cluttering some unit test logs (including SimpleAMQQueueTest). Applied patch from Keith Wall <keith.wall@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1068315 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1916: use module.depends to indicate module interdependencies in ↵Robert Gemmell2011-02-071-1/+4
| | | | | | generated POMs, specify 'qpid' prefix to ensure correctly named poms + artifacts + dependencies, add project url to generated POM. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1068180 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2977: simply specify the required dep info in a file rather than using ↵Robert Gemmell2011-02-0742-2678/+472
| | | | | | full POMs. Update the SLF4J, Derby, Felix dep info to match the jars currently in use. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1068179 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1916: updates to allow creation of maven artifacts for client+common ↵Robert Gemmell2011-02-074-7/+71
| | | | | | | | | modules during the release process Applied patches from Emmanuel Bourg <ebourg@apache.org> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1068178 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3039: explicitly define which debug info to include in the compiled ↵Robert Gemmell2011-02-061-1/+1
| | | | | | | | | class files, as the defaults can differ depending on the used compiler Applied patch from Rajika Kumarasiri <rajika@wso2.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1067667 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3029: actually set and negotiate the supported max num channels per ↵Robert Gemmell2011-02-0419-196/+298
| | | | | | connection during connection handshake. Enable/make the 0-10 client use channel numbers 0 to N-1 in line with the spec, rather than 1-N. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1067210 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3021: ensure the connection actor is used for connection control events ↵Robert Gemmell2011-02-045-6/+33
| | | | | | regardless of a particular sessions existence git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1067208 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1670: Implement an UncaughtExceptionHandler to log exceptions causing ↵Robert Gemmell2011-02-0410-70/+480
| | | | | | | | | the permature termination of Qpid client threads. Applied patch from Keith Wall <keith.wall@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1067108 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3017: improve error handling for the new transaction classes, add some ↵Robert Gemmell2011-01-2810-124/+1581
| | | | | | | | | logging, add unit tests Applied patches from Keith Wall git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1064629 13f79535-47bb-0310-9956-ffa450edef68
* Modified the test cases according to the fix made for QPID-3019Rajith Muditha Attapattu2011-01-281-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1064437 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3013: use an equation based delta threshold that takes processor count ↵Robert Gemmell2011-01-271-8/+5
| | | | | | into consideration git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1064108 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3022: enable the logging tests and fix issues causing failures due to ↵Robert Gemmell2011-01-277-24/+52
| | | | | | minor differences between 0-10 and 0-9 behaviour git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1064086 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3023: enable using the ServerConfiguration directly instead of ↵Robert Gemmell2011-01-274-59/+24
| | | | | | leveraging an internal broker (via IBBC) to load the vhost config required for the tests git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1064085 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3021: set the session/connection actor when the connection recieves new ↵Robert Gemmell2011-01-277-16/+66
| | | | | | events, ensure the correct thread logs close git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1064084 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3020: fix _logActor variable shadowing, use CurrentActor to log Sub ↵Robert Gemmell2011-01-252-6/+6
| | | | | | creation, dont put the created Sub actor onto the stack as the SubFlushRunner does this already when required git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1063328 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3019Rajith Muditha Attapattu2011-01-256-14/+47
| | | | | | | | | The createMessageProducer method now throws a JMSException. The MessageProducer constructors now throw an AMQException allowing any exceptions caught during destination validation to be propogated back to the createMessageProducer method. Fixed the exception handling for the 0-10 code path where all exceptions are chained properly. This allows the user to get all the relavent information by examing the stack trace. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1063123 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3014: create and use a connection actor directly, it doesnt need to be ↵Robert Gemmell2011-01-243-5/+10
| | | | | | put on the CurrentActor stack for the open messages git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1062722 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2902: remove exclusion for LargeMessageTest, I believe QPID-3010 also ↵Robert Gemmell2011-01-211-1/+0
| | | | | | resolves this issue git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1061866 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3010: ensure the SimpleByteBufferAllocator is always used and ↵Robert Gemmell2011-01-214-48/+8
| | | | | | non-direct ByteBuffers are the default, remove the old and now unused configuration methods from ServerConfiguration and update the example config.xml accordingly git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1061865 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3013: create an initial connection to force thread pool startup before ↵Robert Gemmell2011-01-211-0/+6
| | | | | | the test proceeds, as these may be processor-count dependant and throw the final result off git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1061863 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3012: reduce the cycle count such that 100 connections are used instead ↵Robert Gemmell2011-01-211-1/+1
| | | | | | of 1000 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1061862 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3011Rajith Muditha Attapattu2011-01-202-8/+26
| | | | | | | | | | Commiting a fix as per the solution outlined in the above JIRA. A null check is added in the generateDestination method in AbstractAMQMessageDelegate.java where an ExchangeInfo object is created with just the exchange name to allow the destination to be created. The correct information will be querried when a consumer or producer is created with that destination. If a replyTo address is available then the exchange info for that is querried and updated within the updateExchangeTypeMapping method in AMQMessageDelegate_0_10.java git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1061577 13f79535-47bb-0310-9956-ffa450edef68
* While commiting a fix for QPID-2994 I accidently modified the timeout value.Rajith Muditha Attapattu2011-01-111-1/+1
| | | | | | | I am restoring it to the original value. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1057927 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2991: added message counts to connection stats; fixed xxxToClient statsGordon Sim2011-01-111-0/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1057578 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2995Rajith Muditha Attapattu2011-01-111-0/+4
| | | | | | | The redelivered flag is now set on messages that are restransmitted after failover. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1057462 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2994Rajith Muditha Attapattu2011-01-112-3/+10
| | | | | | | When the session is marked transactional, message transfers are not replayed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1057460 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status