client/src/main/java/org/apache/qpid/client/AMQSession.java (20 lines):
	- line 98: * TODO  Different FailoverSupport implementation are needed on the same method call, in different situations. For
	- line 105: * TODO  Two new objects created on every failover supported method call. Consider more efficient ways of doing this,
	- line 710: * TODO  Be aware of possible changes to parameter order as versions change.
	- line 725: * TODO  Be aware of possible changes to parameter order as versions change.
	- line 726: * TODO  Document the additional arguments that may be passed in the field table. Are these for headers exchanges?
	- line 771: * TODO  Be aware of possible changes to parameter order as versions change.
	- line 772: * TODO Not certain about the logic of ignoring the failover exception, because the channel won't be
	- line 774: * TODO  Note that taking the failover mutex doesn't prevent this operation being interrupted by a failover,
	- line 1362: * TODO  Be aware of possible changes to parameter order as versions change.
	- line 1382: * TODO  Be aware of possible changes to parameter order as versions change.
	- line 1854: * TODO  Be aware of possible changes to parameter order as versions change.
	- line 1965: * TODO  Be aware of possible changes to parameter order as versions change.
	- line 2278: * TODO  Be aware of possible changes to parameter order as versions change.
	- line 2455: * TODO  This should be controlled by _stopped as it pairs with the stop method fixme or check the
	- line 2907: * TODO  Be aware of possible changes to parameter order as versions change.
	- line 2989: * TODO  Verify the destiation is valid or throw an exception.
	- line 2990: * TODO  Be aware of possible changes to parameter order as versions change.
	- line 3046: * TODO  Be aware of possible changes to parameter order as versions change.
	- line 3255: producers.size())); // FIXME: removeKey
	- line 3270: * TODO  Be aware of possible changes to parameter order as versions change.


client/src/main/java/org/apache/qpid/client/AMQProtocolHandler.java (3 lines):
	- line 167: * TODO  Clarify: presumably exceptionCaught is called when the client is sending during a connection failure and
	- line 360: // FIXME Need to correctly handle other exceptions. Things like ...
	- line 648: //FIXME: At this point here we should check or before add we should check _stateManager is in an open


client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java (2 lines):
	- line 787: // @TODO should this be moved to an exception handler of sorts. Somewhere errors are converted to correct execeptions.
	- line 1271: // TODO - some way to determine the exchange type


client/src/main/java/org/apache/qpid/filter/BinaryExpression.java (2 lines):
	- line 56: * TODO: more efficient hashCode()
	- line 66: * TODO: more efficient hashCode()


client/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java (2 lines):
	- line 34: // TODO: generate these constants automatically from the xml protocol spec file
	- line 211: // TODO: add list of available versions in list to msg...


client/src/main/java/org/apache/qpid/client/XAResourceImpl.java (2 lines):
	- line 459: // TODO: The amqp spec does not allow to make the difference
	- line 461: // TODO: make sure amqp addresses that


client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java (2 lines):
	- line 48: * TODO  Might be neater if this method listener simply wrapped another that provided the method handling using a
	- line 52: * TODO  If the retrotranslator can handle it, could use a SynchronousQueue to implement this rendezvous. Need to


client/src/main/java/org/apache/qpid/filter/UnaryExpression.java (2 lines):
	- line 156: * TODO: more efficient hashCode()
	- line 166: * TODO: more efficient hashCode()


client/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java (2 lines):
	- line 34: * TODO  Document why the exception is passed to the error method. Is it so that the exception can be passed
	- line 53: * TODO Consider narrowing the exception.


client/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java (2 lines):
	- line 26: * TODO Not an AMQP exception as no status code.
	- line 28: * TODO Why replace java.nio.UnresolvedAddressException with this? This is checked, which may explain why, but it


client/src/main/java/org/apache/qpid/filter/ConstantExpression.java (2 lines):
	- line 171: * TODO: more efficient hashCode()
	- line 181: * TODO: more efficient hashCode()


client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java (2 lines):
	- line 51: * TODO  Interruption is caught but not handled. This could be allowed to fall through. This might actually be useful
	- line 55: * TODO  If the retrotranslator can handle it, could use a SynchronousQueue to implement this rendezvous. Need to


client/src/main/java/org/apache/qpid/client/Closeable.java (2 lines):
	- line 31: * TODO  Might be better to make this an interface. This whole class doesn't really encapsulate a terribly neat
	- line 34: * TODO  The convenience method {@link #checkNotClosed} is not that helpfull, what if the caller wants to do something


client/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java (1 line):
	- line 26: * TODO Not an AMQP exception as no status code.


doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml (1 line):
	- line 38: <!-- TODO:


client/src/main/java/org/apache/qpid/codec/AMQDecoder.java (1 line):
	- line 48: * TODO If protocol initiation decoder not needed, then don't create it. Probably not a big deal, but it adds to the


client/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java (1 line):
	- line 36: * TODO Why is this a seperate interface to {@link ProtocolVersionAware}, could they be combined into a single


client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java (1 line):
	- line 68: // TODO: check whether channel id of zero is appropriate


client/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java (1 line):
	- line 29: * TODO: fix MINA so that this is not necessary


client/src/main/java/org/apache/qpid/AMQPInvalidClassException.java (1 line):
	- line 26: * <p>TODO Could just re-use an exising exception like IllegalArgumentException or ClassCastException.


client/src/main/java/org/apache/qpid/framing/AMQType.java (1 line):
	- line 421: // FIXME: use proper charset encoder


client/src/main/java/org/apache/qpid/framing/EncodingUtils.java (1 line):
	- line 306: // TODO: check length fits in an unsigned byte


client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java (1 line):
	- line 38: * TODO  Make this implement java.util.Queue and hide the implementation. Then different queue types can be substituted.


client/src/main/java/org/apache/qpid/transport/Connection.java (1 line):
	- line 64: * TODO the channels map should probably be replaced with something


client/src/main/java/org/apache/qpid/client/message/MessageConverter.java (1 line):
	- line 166: // TODO: Shouldn't need to check for JMS properties here as don't think getPropertyNames() should return them


client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java (1 line):
	- line 30: * TODO  Continuation, extend some sort of re-usable Continuation interface, which might look very like this one.


doc/jms-client-0-8/src/docbkx/JMS-Client-JMS-Extensions.xml (1 line):
	- line 27: <!-- TODO perhaps mention ConnectionListener?-->


client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java (1 line):
	- line 203: // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.


client/src/main/java/org/apache/qpid/client/BrokerDetails.java (1 line):
	- line 426: //TODO do we need to compare all the options as well?


client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java (1 line):
	- line 56: * TODO  InterruptedException not handled well.


client/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java (1 line):
	- line 26: * TODO Not an AMQP exception as no status code.


client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java (1 line):
	- line 146: // TODO - this logic seems particularly strange and the assumptions it relies upon around the difference between


client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java (1 line):
	- line 89: // TODO - should really validate queue exists, but we often rely on creating the consumer to create the queue :(


client/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java (1 line):
	- line 28: * TODO A type safe enum, might be more appropriate for the exchange types.


doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml (1 line):
	- line 1829: TODO: Add some reliability option examples


client/src/main/java/org/apache/qpid/client/security/scram/AbstractScramSaslClient.java (1 line):
	- line 318: // TODO - a real implementation of SaslPrep


systests/src/main/java/org/apache/qpid/systest/core/dependency/ClasspathQuery.java (1 line):
	- line 172: // TODO handle JAR case


client/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java (1 line):
	- line 26: * TODO Not an AMQP exception as no status code.


client/src/main/java/org/apache/qpid/client/failover/FailoverException.java (1 line):
	- line 28: * TODO This exception is created and passed as an argument to a method, rather than thrown. The exception is being