summaryrefslogtreecommitdiff
path: root/java/common
Commit message (Collapse)AuthorAgeFilesLines
...
* Updated FilterTypes to be more accurate NO_CONSUME and AUTO_CLOSEMartin Ritchie2006-12-201-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489083 13f79535-47bb-0310-9956-ffa450edef68
* Added new enum for AMQP Filter typesMartin Ritchie2006-12-201-0/+39
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489078 13f79535-47bb-0310-9956-ffa450edef68
* Maven output clean up.Martin Ritchie2006-12-191-2/+2
| | | | | | Mainly removed exception stack traces from expected exceptions. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488713 13f79535-47bb-0310-9956-ffa450edef68
* QPID-216Martin Ritchie2006-12-192-0/+75
| | | | | | | | | | | | | | | | | | BasicConsumeMethodHandler.java - Pulled the nolocal param from the method body and passed down channel to subscription. SubscriptionFactory.java / AMQQueue.java/AMQChannel.java - passed the nolocal parameter through to the Subscription ConnectionStartOkMethodHandler.java - Saved the client properties so the client identifier can be used in comparison with the publisher id to implement no_local AMQMinaProtocolSession.java - added _clientProperties to store the sent client properties. AMQProtocolSession.java - interface changes to get/set ClientProperties ConcurrentSelectorDeliveryManager.java - only need to do hasInterset as this will take care of the hasFilters optimisation check. SubscriptionImpl.java - Added code to do comparison of client ids to determin insterest in a given message. SubscriptionSet.java - tidied up code to use hasInterest as this is where the nolocal is implemented. ConnectionStartMethodHandler.java - Moved literal values to a ClientProperties.java enumeration and a QpidProperties.java values. QpidConnectionMetaData.java - updated to get values from QpidProperties.java MockProtocolSession.java - null implementation of new get/set methods git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488712 13f79535-47bb-0310-9956-ffa450edef68
* QPID-21Martin Ritchie2006-12-194-7/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added: SelectorParser.jj - ActiveMQ selector javacc grammar used to generate SelectorParser.java server/filter - Selector Filtering code from ActiveMQ project adjusted to suite our class and package structure. server/message - Decorator classes to allow access to the JMSMessage inside the AMQMessage ConcurrentSelectorDeliveryManager.java - A new DeliveryManager that utilises PreDeliveryQueues to implement selectors AMQInvalidSelectorException.java - thrown on client and broker when the Selector text is invalid. Common: log4j.properties to remove error log4j warnings on Common tests. Modified: broker/pom.xml - to generate SelectorParser.java AMQChannel.java - Addition of argument fieldtable for filter setup. BasicConsumeMethodHandler.java - writing of InvalidSelector channel close exception. AMQMessage.java - Added decorator to get access to the enclosed JMSMessage AMQQueue.java - Enhanced 'deliverymanager' property to allow the selection of the ConcurrentSelectorDeliveryManager. Subscription.java - Enhanced interface to allow a subscription to state an 'interest' in a given message. SubscriptionFactory.java - Added method to allow passing of filter arguments. SubscriptionImpl.java - Implemented new Subscription.java methods. SubscriptionManager.java - Added ability to get a list of current subscribers. SubscriptionSet.java - augmented nextSubscriber to allow the subscriber to exert the new hasInterest feature. SynchronizedDeliveryManager.java - fixed Logging class AMQSession - Added filter extraction from consume call and pass it on to the registration. ChannelCloseMethodHandler.java - Handle the reception and correct raising of the InvalidSelector Exception AbstractJMSMessage.java - Expanded imports BlockingMethodFrameListener.java - added extra info to a debug output line. SocketTransportConnection.java - made output an info not a warn. PropertiesFileInitialContextFactory.java - updated to allow the PROVIDER_URL to specify a property file to read in for the initial values. ClusteredSubscriptionManager.java - Implementation of SubscriptionSet.java NestedSubscriptionManager.java - Implementation of SubscriptionManager.java RemoteSubscriptionImpl.java - Implementation Subscription.java AMQConstant.java - Added '322' "Invalid Selector" SubscriptionTestHelper.java - Implementation of Subscription.java Edited specs/amqp-8.0.xml to add field table to consume method. Thanks to the ActiveMQ project for writing the initial SelectorParser.jj and associated filter Expressions. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488624 13f79535-47bb-0310-9956-ffa450edef68
* remove unused importsStephen Vinoski2006-12-183-8/+0
| | | | | | | | | Remove unused imports for common, broker, client, and systests as reported by Eclipse. Note that this includes imports in the Java XSL template used to generate the framing code in common. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488134 13f79535-47bb-0310-9956-ffa450edef68
* QPID-201 : Fix to throw correct exception when getting char as null in ↵Robert Greig2006-12-163-63/+48
| | | | | | JMSMapMessage git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@487779 13f79535-47bb-0310-9956-ffa450edef68
* QPID-199 Patch supplied by Rob GodfreyRobert Greig2006-12-151-9/+23
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@487627 13f79535-47bb-0310-9956-ffa450edef68
* Changed name of getType() method to avoid clash with generated method of ↵Kim van der Riet2006-12-156-6/+6
| | | | | | same name git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@487579 13f79535-47bb-0310-9956-ffa450edef68
* QPID-182Martin Ritchie2006-12-152-64/+21
| | | | | | Fixed the incorrect exception being thrown by JMSPropertyFieldTable.java. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@487548 13f79535-47bb-0310-9956-ffa450edef68
* QPID-181 QPID-180Martin Ritchie2006-12-159-548/+2653
| | | | | | | | | | | | | | AbstractJMSMessage.java - updated to use getJMSHeaders JMSMapMessage.java - JMSPropertyFieldTable.java - Moved functionality of setting and retrieving a JMS property. Now shared by the Headers and MapMessageTest.java MapMessageTest.java - Updated the exceptions that are caught as all methods should throw a JMSException i.e. MessageFormatException TextMessageTest.java - Added tests for the Message Properties common/pom.xml - Added JMS dependency for the JMSPropertyFieldTable.java and associated tests EncodingUtils.java - changed comments and changed getencodedCharLength return to an int PropertyFieldTable.java - Cleaned up and now uses enum for prefixs. Created comprehensive test of both PropertyFieldTable classes. AMQPInvalidClassException.java - created to throw a runtime exception when trying to add a non-primative value. Forcing clients to handle this would break the Map usage of the FieldTable. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@487481 13f79535-47bb-0310-9956-ffa450edef68
* QPID-179 Patch supplied by Rob Godfrey. Field table remove was fundamentally ↵Robert Greig2006-12-131-17/+10
| | | | | | broken. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486793 13f79535-47bb-0310-9956-ffa450edef68
* QPID-9Martin Ritchie2006-12-133-26/+38
| | | | | | | | Updated EncodingUtils.java to include a single Character field so we can tell the difference between a char and a string of length 1. Tests changed accordingly. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486648 13f79535-47bb-0310-9956-ffa450edef68
* QPID-172Martin Ritchie2006-12-131-1/+7
| | | | | | Applied the same change to the second call to <threadpool>.execute() to be sure that a RejectedExecutionException doesn't appear. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486626 13f79535-47bb-0310-9956-ffa450edef68
* QPID-172Martin Ritchie2006-12-131-1/+44
| | | | | | The PoolingFilterTest.java would throw an ugly NullPointerException. This was due to there being no next filter. So Created a NoOpFilter that prevents this. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486610 13f79535-47bb-0310-9956-ffa450edef68
* QPID-172Martin Ritchie2006-12-133-1/+335
| | | | | | | | | | | | | | | RejectedExecutionException. In fireEvent added additional checks :_poolReference.getPool() != null && !_poolReference.getPool().isShutdown() to if (job.activate()) As active jobs were being put on a pool that was shutdown. Included a test to check that the RejectedExecutionException doesn't occur. (add ignore for example/target) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486596 13f79535-47bb-0310-9956-ffa450edef68
* QPID-9Martin Ritchie2006-12-132-4/+22
| | | | | | | | Added ability to send NULL Strings. EncodingUtils.java now returns an empty string for a zero lengthed String. To send a null string use prefix 'n' MapMessageTest.java - Updated to test emptyString and nullString behave correctly. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486574 13f79535-47bb-0310-9956-ffa450edef68
* QPID-164Martin Ritchie2006-12-124-84/+330
| | | | | | | | | | | JMSMapMessage.java - fixed incorrect exceptions and return values. Data now sent as a Bytes message. MapMessageTest.java - updated to be more through with the testing of the returned message EncodingUtils.java - added unsignedIntegerLength() FieldTableFactory.java - removed specific PropertyFieldTable reference PropertyFieldTable.java - fixed encoding issues that were causing BufferOverflow errors. PropertyFieldTableTest.java - added test to ensure that the encoding size is correct for ALL types. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486254 13f79535-47bb-0310-9956-ffa450edef68
* Corrected compile errorKim van der Riet2006-12-111-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@485788 13f79535-47bb-0310-9956-ffa450edef68
* Added stubs for new Content interface to support new AMQP 0-9 transportKim van der Riet2006-12-112-0/+43
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@485730 13f79535-47bb-0310-9956-ffa450edef68
* minor client build changesStephen Vinoski2006-12-082-5/+6
| | | | | | | | * changed the name of the output directory for generated sources * temporary workaround to restore build avoidance wrt code generation git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@484848 13f79535-47bb-0310-9956-ffa450edef68
* Quick change to generator to generate into framing dir only. NOTE: cannot ↵Kim van der Riet2006-12-071-4/+3
| | | | | | use more than one version at the same time with this change in place (until the new generator is integrated, that is...) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@483645 13f79535-47bb-0310-9956-ffa450edef68
* QPID-9Martin Ritchie2006-12-071-1/+101
| | | | | | Added checks on the field names git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@483559 13f79535-47bb-0310-9956-ffa450edef68
* QPID-9Martin Ritchie2006-12-074-189/+338
| | | | | | | | | | BasicContentHeaderPropertiesTest.java & PropertyFieldTableTest.java updated to use EncodingUtils.java to calculate expected Sizes. PropertyFieldTable.java - Updated to use wider range of encoded values, Rather than very wasteful XML encoding. EncodingUtils.java - updated to centralise the new encodings. added target to ignore on eclipse-plugin folder git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@483503 13f79535-47bb-0310-9956-ffa450edef68
* Adding unit tests Marnie McCormack2006-12-071-0/+159
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@483404 13f79535-47bb-0310-9956-ffa450edef68
* FieldTable change.Martin Ritchie2006-12-057-492/+820
| | | | | | | | | | | | | | | | | | | | | | | | | | FieldTable is now an interface with a PropertyFieldTable.java implementation. This PropertyFieldTable has been updated to handle the wire level encoding and decoding of the underlying map. It also allows XML encoding of the data as used by JMSMapMessage. Currently the AMQP doesn't support all the Java primitives as a result all values are written out as XML using a prefix of 'X'. (See QPID-9 for further details) Changes where not specified are changes from new FieldTable() to FieldTableFactory.newFieldTable() AbstractJMSMessage.java - the type prefixing of properties is now not requried as all the functionality has been moved to PropertyFieldTable.java. In addition set/getObjectProperty is now implemented as PFT does this. basic Tests have been updated to send all property values. FieldTableKeyEnumeration.java has been removed as it is nolonger required. The PFT handles this internally. ToDo: The Tests need to be consolidated so that there is a clear view of the code coverage. QPID-158 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@482733 13f79535-47bb-0310-9956-ffa450edef68
* QPID-148Martin Ritchie2006-12-041-1/+1
| | | | | | | | | | | | | | | AMQMinaProtocolSession.java - updated comment AbstractJMSMessage.java - removed a lot of getHeaders() == null checks. Updated logic accordingly.. Now a request for a property that doesn't exist will be consistent with calls on an empty table rather than just creating a default value. BasicContentHeaderProperties.java - the culprit for QPID-148 changed new FieldTable() to setHeaders(new FieldTable()) to ensure propertyFlag is set to write headers to the wire. Added PropertyValueTest.java - that tests all the valid values on the Message. *NOTE*: A number of the tests are commented out as AMQP and therefore the FieldTable do not support these values. QPID-9 Added SVN ignores for the target directories. Updated AbstractJMSMessage.java _readableProperties to be set correctly in the constructor. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@482238 13f79535-47bb-0310-9956-ffa450edef68
* FieldTable.java no longer has a keys() method as it already has a keySet(). ↵Martin Ritchie2006-11-301-7/+2
| | | | | | Plus the implementation was broken. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@480973 13f79535-47bb-0310-9956-ffa450edef68
* QPID-139Martin Ritchie2006-11-301-2/+9
| | | | | | | | When the custom headers are empty no field table would be created. This null value would cause problems for various methods in AbstractJMSMessage. Simply create an empty FieldTable to save handling the null value. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@480912 13f79535-47bb-0310-9956-ffa450edef68
* properly limit scope for test-only dependenciesStephen Vinoski2006-11-241-5/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@479050 13f79535-47bb-0310-9956-ffa450edef68
* PropertyFieldTableTest.java - Removed system.out.printlnMartin Ritchie2006-11-222-11/+10
| | | | | | pom.xml removed skip test item and added junit dependency. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@478260 13f79535-47bb-0310-9956-ffa450edef68
* Created a PropertyFieldTable with test. Pulls the functionality that is used ↵Martin Ritchie2006-11-222-0/+958
| | | | | | in AbstractJMSMessage to a central location, FieldTable should be refactored to AMQHeaderPropertyFieldTable extending PropertyFieldTable limiting insertions to values that can be placed in the headers so that AbstractJMSMessage can then utilise that class. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@478242 13f79535-47bb-0310-9956-ffa450edef68
* QPID-108: remove obsolete ant build filesStephen Vinoski2006-11-222-233/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@478023 13f79535-47bb-0310-9956-ffa450edef68
* broker/pom.xml - removed test scope from junit to remove warning in build log.Martin Ritchie2006-11-201-63/+72
| | | | | | | | | | | | | | TransportConnection.java/AMQQueue.java - change log level on a print statement from warn to info log4j.properties - updated threashold to be 'all' so we can set the logging level with amqj.logging.level client/pom.xml - fixed mvn test run output. It wasn't using our log4.properties file. systests/pom.xml - added log4j.properties configuration broker/pom.xml - added log4j.properties configuration common/pom.xml - skipped tests as there are none, and it caused the build to fail Also adjusted spaceing to be 4 space per tab (and no tabs) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@477214 13f79535-47bb-0310-9956-ffa450edef68
* complete bringing initial maven work to trunkStephen Vinoski2006-11-1813-0/+213
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@476431 13f79535-47bb-0310-9956-ffa450edef68
* directory moves required for maven mergeStephen Vinoski2006-11-1863-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@476414 13f79535-47bb-0310-9956-ffa450edef68
* QPID-92 Changes to bring MINA use up to MINA-Head (1.1.0) compatibility Martin Ritchie2006-11-153-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@475286 13f79535-47bb-0310-9956-ffa450edef68
* update Apache licenses to the current versionStephen Vinoski2006-11-1074-975/+1200
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473568 13f79535-47bb-0310-9956-ffa450edef68
* Added attributions to notice file for saxon, slf4j and junit. Props changed ↵Marnie McCormack2006-11-101-471/+471
| | | | | | on saxon license. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473288 13f79535-47bb-0310-9956-ffa450edef68
* Name change for junit license and added MPL for saxonMarnie McCormack2006-11-102-0/+471
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473282 13f79535-47bb-0310-9956-ffa450edef68
* Removed old license fileMarnie McCormack2006-11-101-30/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473274 13f79535-47bb-0310-9956-ffa450edef68
* Removed old license filesMarnie McCormack2006-11-101-41/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473273 13f79535-47bb-0310-9956-ffa450edef68
* name changeMarnie McCormack2006-11-101-0/+41
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473272 13f79535-47bb-0310-9956-ffa450edef68
* Name updateMarnie McCormack2006-11-101-0/+30
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473271 13f79535-47bb-0310-9956-ffa450edef68
* git-svn-id: ↵Martin Ritchie2006-11-072-0/+116
| | | | https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@472041 13f79535-47bb-0310-9956-ffa450edef68
* From: end-user release.Martin Ritchie2006-11-073-0/+663
| | | | | | http://dcl.mathcs.emory.edu/util/backport-util-concurrent/ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@472033 13f79535-47bb-0310-9956-ffa450edef68
* QPID-56Martin Ritchie2006-10-312-0/+90
| | | | | | | | | Also resolves a race condition where an messages could be sent out of order. Modification of the Java ConcurrentLinkedQueue to provide a constant time size() method git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@469424 13f79535-47bb-0310-9956-ffa450edef68
* Cast to Throwable, not Exception.Gordon Sim2006-10-251-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@467589 13f79535-47bb-0310-9956-ffa450edef68
* QPID-48Martin Ritchie2006-10-241-2/+1
| | | | | | | | | | Enabled buffer compression on delivery queue as a configuration option from the xml.(advanced.compressBufferOnQueue) Changed DeliveryManager.java to use ConcurrentLinkedQueueNoSize.java this is the standard ConcurrentLinkedQueue but where the size() method returns 0(empty) or 1(has content) as it is an expensive operation. Previously there was a race condition with the use of the _queueing boolean. Under load the consumer would sometimes stop getting messages. This was due to the messages being enqueued without starting the Worker thread. There is still an issue (QPID-54) on high receiving load messages rate received by a client drops. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@467313 13f79535-47bb-0310-9956-ffa450edef68
* Moved cygwin test to top, causing problems on Unix.Alan Conway2006-10-201-5/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@466127 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status