summaryrefslogtreecommitdiff
path: root/java/common
Commit message (Collapse)AuthorAgeFilesLines
...
* (Path Qpid-337 submitted by Rupert Smith)Robert Greig2007-02-121-4/+65
| | | | | | Does 1.4 retrotranslation as part of the maven build. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@506401 13f79535-47bb-0310-9956-ffa450edef68
* QPID-358 : Field table encoding: types i and I are the wrong way roundRobert Godfrey2007-02-111-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@505892 13f79535-47bb-0310-9956-ffa450edef68
* QPID-170Bhupendra Bhusman Bhardwaj2007-02-071-0/+12
| | | | | | Management feature added - moving messages from one Queue to another git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@504507 13f79535-47bb-0310-9956-ffa450edef68
* Unused so removingMartin Ritchie2007-01-311-42/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@501920 13f79535-47bb-0310-9956-ffa450edef68
* QPID-327 : Patch supplied by Rob Godfrey - [race condition] PoolingFilter : ↵Robert Greig2007-01-297-45/+113
| | | | | | Possible race condition when completing a Job git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@501096 13f79535-47bb-0310-9956-ffa450edef68
* QPID-320 : Patch supplied by Rob Godfrey - Improve performance by ↵Robert Greig2007-01-2914-110/+283
| | | | | | remembering protocol version git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@501003 13f79535-47bb-0310-9956-ffa450edef68
* QPID-317 : Patch supplied by Rob Godfrey - Remove dependency on JMS from ↵Robert Greig2007-01-242-478/+0
| | | | | | common / broker. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@499563 13f79535-47bb-0310-9956-ffa450edef68
* QPID-50 : Patch supplied by Rob Godfrey - Virtual Host implementationRobert Greig2007-01-242-0/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@499446 13f79535-47bb-0310-9956-ffa450edef68
* QPID-310 Propagated JMS Exception to client.Martin Ritchie2007-01-221-0/+29
| | | | | | | | | | QPID-308 Configurable timeout on blockForFrame. Timeouts added but need to be configurable. QPID-311 Dispatcher Thread is not thread safe. Added the missing Synchronized code and renamed vars to make it more readable git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@498637 13f79535-47bb-0310-9956-ffa450edef68
* QPID-275 : Patch supplied by Rob Godfrey - Add support for get / purge / qos ↵Robert Greig2007-01-192-0/+18
| | | | | | size / default exchanges and some other small fixes highlighted by the python tests git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@497770 13f79535-47bb-0310-9956-ffa450edef68
* * uses LONG_STRING in place of WIDE_STRING for properties set through ↵Gordon Sim2007-01-184-18/+8
| | | | | | | | | | | | FieldTable.setString() as these appear to all be equivalent (apart from the type code) * uses setString instead of setAsciiString in creation of the connection.start-ok frames client properties * uses 4 bytes for the size of the BINARY value type as per the spec posted on the wiki git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@497352 13f79535-47bb-0310-9956-ffa450edef68
* Fix to broken build due to missing file.Robert Greig2007-01-161-0/+42
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@496833 13f79535-47bb-0310-9956-ffa450edef68
* QPID-245 reverted interop changes for the sake of JMS compliance.Robert Greig2007-01-161-15/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@496785 13f79535-47bb-0310-9956-ffa450edef68
* QPID-245 Field table now uses long str type for binary type - temporary ↵Robert Greig2007-01-161-2/+4
| | | | | | interop hack. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@496662 13f79535-47bb-0310-9956-ffa450edef68
* QPID-245 Field table now uses long str type for ascii string - temporary ↵Robert Greig2007-01-161-2/+3
| | | | | | interop hack. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@496637 13f79535-47bb-0310-9956-ffa450edef68
* QPID-245 Field table now uses short strings only for interop, pending full ↵Robert Greig2007-01-161-6/+8
| | | | | | proposal approval from AMQP git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@496626 13f79535-47bb-0310-9956-ffa450edef68
* QPID-295Bhupendra Bhusman Bhardwaj2007-01-151-1/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@496384 13f79535-47bb-0310-9956-ffa450edef68
* Created common AMQMethodListener class, allowing the Request and Response ↵Kim van der Riet2007-01-121-0/+49
| | | | | | managers to use a common interface to dispatch events to both the client and servers. Refactoring of bothe the client and broker AMQStateManagers and AMQProtocolSession classes was performed. The refactoring has run aground in the clustering, however, and this still needs to be resolved. As the cluster tests are currently disabled (by whom, I'm not sure), this does not disrupt the overall test result. JIRAs will be opened for this issue. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495754 13f79535-47bb-0310-9956-ffa450edef68
* QPID-278Martin Ritchie2007-01-121-0/+7
| | | | | | | | | broker distribution - modified to allow assembly:directory builds broker/pom.xml - moved slf4j to common/pom.xml git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495549 13f79535-47bb-0310-9956-ffa450edef68
* QPID-146 QPID-112 QPID-278Martin Ritchie2007-01-121-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary Reworked a lot of the distribution work done by the build system. This ended up with me creating a reduced client distribution (hope that is ok Steve) Each module now has has a distribution directory (except common it may need a tests build later) This will build the individual components in to a distribution binary only, binary with tests and source. To build the binary with tests in the distribution directory use profile tests so $mvn -Ptests In all cases the dependencies have been reduced and correctly assigned to the correct scope. There were a couple of cases where a runtime dependency of one of our dependencies didn't make it in to the distributions so they were added explicitly. This should be looked at again. Specifics Broker: Three new assembly files are located in the distribution/src directory (broker-bin taking heavily from distribution - bin) these generate the three distributions. SimpleFilterManager.java removed slf4j reference broker/test directory removed as it was left over from the ant system Client: Added intelij files to ignore list. client/dist deleted as it was left over from the ant system client/distribution as for the broker three assemblies matching the three distributions Renamed log4j.properties to client.log4j to prevent issues when it is packaged into the jar. Removed old_test ping and requestreply1 as they have been moved to perftests Moved broker back to a test dependency. This required modifying AMQSession.java to remove reference to ExchangeBoundHandler.java Common: Added more common dependencies from broker and client here. Distribution: Reduced the assemblies to only build the full project binary, binary with tests and source. Perftests: Added building of perftests distribution so this can be bundled separately. Resources: Moved Resources from distribution project to root level this allows them to be easily incorporated in all projects. Systests: as with perftests now builds a separate distribution that can be used on an existing installation. renamed log4j.properties to systests.log4j to prevent logging problems. As systests is a module having the code under the test folder isn't accurate as it is the main code. Test code here should be testing the tests :D !! git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495455 13f79535-47bb-0310-9956-ffa450edef68
* Refactor to create a common AMQMethodEvent object. Also created a common ↵Kim van der Riet2007-01-112-0/+97
| | | | | | AMQProtocolWriter interface for writing frames. These are required for common request and response handlers to be introduced in 0-9. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495380 13f79535-47bb-0310-9956-ffa450edef68
* QPID-32 : Add persistence to work with ShortStringsRobert Greig2007-01-111-0/+30
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495170 13f79535-47bb-0310-9956-ffa450edef68
* QPID-275 : (Patch supplied by Rob Godfrey) Fixes to allow broker to pass ↵Robert Greig2007-01-101-1/+1
| | | | | | more of the Python tests git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494769 13f79535-47bb-0310-9956-ffa450edef68
* QPID-271 : (Patch supplied by Rob Godfrey) Implement fanout exchangeRobert Greig2007-01-101-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494658 13f79535-47bb-0310-9956-ffa450edef68
* QPID-270 : (Patch supplied by Rob Godfrey) Change of use of ↵Robert Greig2007-01-091-2/+31
| | | | | | AMQConnectionException git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494655 13f79535-47bb-0310-9956-ffa450edef68
* QPID-268 : (Patch supplied by Rob Godfrey) Improvements to performance of ↵Robert Greig2007-01-0919-92/+487
| | | | | | generated code git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494650 13f79535-47bb-0310-9956-ffa450edef68
* QPID-255 : Patch Supplied by Rob Godfrey - Change to use bespoke ↵Robert Greig2007-01-0814-1712/+1635
| | | | | | AMQShortString rather than converting to String git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494121 13f79535-47bb-0310-9956-ffa450edef68
* Fixed: [QPID-253] Existing classpath breaks codegen; [QPID-254] Build ↵Kim van der Riet2007-01-082-11/+20
| | | | | | failure does not prevent timestamp from being generated. Also moved all required properties into ant build file, allowing the generation to be completed independently of Maven from the common directory. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494092 13f79535-47bb-0310-9956-ffa450edef68
* QPID-252 : Reduce unnecessary object creationRobert Greig2007-01-084-110/+117
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494042 13f79535-47bb-0310-9956-ffa450edef68
* Fixed C++ client sending protocol version 0-0 over the wire. Minor fixes and ↵Kim van der Riet2007-01-041-12/+0
| | | | | | tidy-up in related code. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@492756 13f79535-47bb-0310-9956-ffa450edef68
* QPID-248 Modified field table types to not conflict with the officially ↵Rafael H. Schloming2007-01-043-85/+64
| | | | | | specified definitions. Also reorganized type definitions to clearly distinguish between official and extended types and reenabled the AmqPlain authentication mechanism. This change allows the python interop test suite to run. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@492718 13f79535-47bb-0310-9956-ffa450edef68
* Added automatic build of generator; added dependency check on source XML ↵Kim van der Riet2007-01-022-5/+18
| | | | | | files that prevents generation if not needed git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@491879 13f79535-47bb-0310-9956-ffa450edef68
* QPID-227 Renamed version.properties to qpidversion.properties due to clash ↵Robert Greig2006-12-261-6/+40
| | | | | | with a dependency also using version.properties. Also improved robustness where properties file does not contain expected properties. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@490373 13f79535-47bb-0310-9956-ffa450edef68
* QPID-229 : Patch supplied by Rob Godfrey - Change implementation of FieldTableRobert Greig2006-12-221-45/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489754 13f79535-47bb-0310-9956-ffa450edef68
* QPID-229 : Patch supplied by Rob Godfrey - Change implementation of FieldTableRobert Greig2006-12-2211-1716/+1525
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489748 13f79535-47bb-0310-9956-ffa450edef68
* File tidy-up for AMQP version code: Removed old XSLT files; moved ↵Kim van der Riet2006-12-2213-985/+1
| | | | | | cluster.asl into spec directory; renamed spec files to better reflect version notation; updated java, c++ and python files to reference new names. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489715 13f79535-47bb-0310-9956-ffa450edef68
* AMQP version using new generator - Part 1. In these changes, all places ↵Kim van der Riet2006-12-2213-131/+77
| | | | | | where version-specific info is required, it has been hard-wired to major=8, minor=0. The next phase of changes will connect the version info to that obtained from ProtocolInitiation for the current session. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489691 13f79535-47bb-0310-9956-ffa450edef68
* QPID-227Bhupendra Bhusman Bhardwaj2006-12-211-6/+44
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489403 13f79535-47bb-0310-9956-ffa450edef68
* 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
View Lorry Controller Status