You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2008/07/29 21:03:40 UTC
svn commit: r680803 [1/3] - in /incubator/qpid/trunk/qpid/java: ./ client/
client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/
client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/
client/example/src/main/java/or...
Author: rhs
Date: Tue Jul 29 12:03:34 2008
New Revision: 680803
URL: http://svn.apache.org/viewvc?rev=680803&view=rev
Log:
QPID-1072: renamed org.apache.qpidity -> org.apache.qpid
Added:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/
- copied from r680787, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/filter/
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/naming/
- copied from r680787, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/
- copied from r680787, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/njms/
- copied from r680787, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/njms/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetails.java
- copied, changed from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/BrokerDetails.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetailsImpl.java
- copied, changed from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/BrokerDetailsImpl.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java
- copied, changed from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ConsoleOutput.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ErrorCode.java
- copied, changed from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ErrorCode.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/QpidConfig.java
- copied, changed from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/QpidConfig.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/QpidException.java
- copied, changed from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/QpidException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/SecurityHelper.java
- copied, changed from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/SecurityHelper.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyBroker.java
- copied, changed from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyBroker.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java
- copied, changed from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyExchange.java
- copied, changed from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyExchange.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/api/
- copied from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/api/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/dtx/
- copied from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/dtx/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/
- copied from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/security/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/
- copied from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/
- copied from r680787, incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/transport/
Removed:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/filter/
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/njms/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/BrokerDetails.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/BrokerDetailsImpl.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ConsoleOutput.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ErrorCode.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/QpidConfig.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/QpidException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/SecurityHelper.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyBroker.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyExchange.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/api/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/dtx/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/exchange/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/security/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/transport/
Modified:
incubator/qpid/trunk/qpid/java/client/build.xml
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java
incubator/qpid/trunk/qpid/java/client/pom.xml
incubator/qpid/trunk/qpid/java/client/src/main/grammar/SelectorParser.jj
incubator/qpid/trunk/qpid/java/client/src/main/java/client.log4j
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/naming/jndi.properties
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Client.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/ClosedListener.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Connection.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/DtxSession.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/JMSTestCase.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Session.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSessionDelegate.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/Constants.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/DemoClient.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/LargeMsgDemoClient.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/interop/BasicInteropTest.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/FileMessage.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ReadOnlyMessage.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/StreamingMessage.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/njms/ExceptionHelper.java
incubator/qpid/trunk/qpid/java/common/Composite.tpl
incubator/qpid/trunk/qpid/java/common/Constant.tpl
incubator/qpid/trunk/qpid/java/common/Enum.tpl
incubator/qpid/trunk/qpid/java/common/Invoker.tpl
incubator/qpid/trunk/qpid/java/common/MethodDelegate.tpl
incubator/qpid/trunk/qpid/java/common/Option.tpl
incubator/qpid/trunk/qpid/java/common/StructFactory.tpl
incubator/qpid/trunk/qpid/java/common/Type.tpl
incubator/qpid/trunk/qpid/java/common/codegen
incubator/qpid/trunk/qpid/java/common/pom.xml
incubator/qpid/trunk/qpid/java/common/src/main/java/log4j.properties
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/api/Message.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/CallbackHandlerRegistry.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/DynamicSaslRegistrar.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/JCAProvider.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClient.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClientFactory.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Binding.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Channel.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ChannelDelegate.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Data.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Echo.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Field.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Future.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Header.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Range.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Receiver.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Result.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Struct.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/TransportException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Validator.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/OutputHandler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLImpl.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/QpidURL.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/QpidURLImpl.java
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
incubator/qpid/trunk/qpid/java/log4j-test.xml
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
incubator/qpid/trunk/qpid/java/testkit/etc/test.log4j
Modified: incubator/qpid/trunk/qpid/java/client/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/build.xml?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/client/build.xml Tue Jul 29 12:03:34 2008
@@ -24,7 +24,7 @@
<import file="../module.xml"/>
- <property name="output.dir" value="${module.precompiled}/org/apache/qpidity/filter/selector"/>
+ <property name="output.dir" value="${module.precompiled}/org/apache/qpid/filter/selector"/>
<target name="precompile">
<mkdir dir="${output.dir}"/>
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java Tue Jul 29 12:03:34 2008
@@ -1,8 +1,8 @@
package org.apache.qpid.example.amqpexample.direct;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
/**
* This creates a queue a queue and binds it to the
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java Tue Jul 29 12:03:34 2008
@@ -2,14 +2,14 @@
import java.nio.ByteBuffer;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
public class DirectProducer implements MessageListener
{
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java Tue Jul 29 12:03:34 2008
@@ -2,14 +2,14 @@
import java.nio.ByteBuffer;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.transport.MessageCreditUnit;
+import org.apache.qpid.transport.MessageCreditUnit;
/**
* This listens to messages on a queue and terminates
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java Tue Jul 29 12:03:34 2008
@@ -1,8 +1,8 @@
package org.apache.qpid.example.amqpexample.fanout;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
/**
* This creates a queue a queue and binds it to the
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java Tue Jul 29 12:03:34 2008
@@ -1,11 +1,11 @@
package org.apache.qpid.example.amqpexample.fanout;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
public class FannoutProducer
{
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java Tue Jul 29 12:03:34 2008
@@ -2,16 +2,16 @@
import java.nio.ByteBuffer;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
-import org.apache.qpidity.transport.MessageCreditUnit;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
+import org.apache.qpid.transport.MessageCreditUnit;
/**
* This listens to messages on a queue and terminates
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java Tue Jul 29 12:03:34 2008
@@ -2,14 +2,14 @@
import java.nio.ByteBuffer;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.transport.MessageCreditUnit;
-import org.apache.qpidity.transport.Option;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.transport.MessageCreditUnit;
+import org.apache.qpid.transport.Option;
public class TopicListener implements MessageListener
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java Tue Jul 29 12:03:34 2008
@@ -1,11 +1,11 @@
package org.apache.qpid.example.amqpexample.pubsub;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
public class TopicPublisher
{
Modified: incubator/qpid/trunk/qpid/java/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/pom.xml?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/client/pom.xml Tue Jul 29 12:03:34 2008
@@ -112,7 +112,7 @@
<configuration>
<sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
<outputDirectory>${basedir}/target/generated-sources</outputDirectory>
- <packageName>org.apache.qpidity.filter.selector</packageName>
+ <packageName>org.apache.qpid.filter.selector</packageName>
</configuration>
<goals>
<goal>javacc</goal>
@@ -237,16 +237,16 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<excludePackageNames>
- org.apache.qpid.*:org.apache.qpidity.njms:org.apache.qpidity.njms.*:org.apache.qpidity.nclient.impl
+ org.apache.qpid.*:org.apache.qpid.njms:org.apache.qpid.njms.*:org.apache.qpid.nclient.impl
</excludePackageNames>
<groups>
<group>
<title>API</title>
- <packages>org.apache.qpidity.nclient</packages>
+ <packages>org.apache.qpid.nclient</packages>
</group>
<group>
<title>Utility Package</title>
- <packages>org.apache.qpidity.nclient.util</packages>
+ <packages>org.apache.qpid.nclient.util</packages>
</group>
</groups>
</configuration>
Modified: incubator/qpid/trunk/qpid/java/client/src/main/grammar/SelectorParser.jj
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/grammar/SelectorParser.jj?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/grammar/SelectorParser.jj (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/grammar/SelectorParser.jj Tue Jul 29 12:03:34 2008
@@ -61,20 +61,20 @@
*
*/
-package org.apache.qpidity.filter.selector;
+package org.apache.qpid.filter.selector;
import java.io.StringReader;
import java.util.ArrayList;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.filter.ArithmeticExpression;
-import org.apache.qpidity.filter.BooleanExpression;
-import org.apache.qpidity.filter.ComparisonExpression;
-import org.apache.qpidity.filter.ConstantExpression;
-import org.apache.qpidity.filter.Expression;
-import org.apache.qpidity.filter.LogicExpression;
-import org.apache.qpidity.filter.PropertyExpression;
-import org.apache.qpidity.filter.UnaryExpression;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.filter.ArithmeticExpression;
+import org.apache.qpid.filter.BooleanExpression;
+import org.apache.qpid.filter.ComparisonExpression;
+import org.apache.qpid.filter.ConstantExpression;
+import org.apache.qpid.filter.Expression;
+import org.apache.qpid.filter.LogicExpression;
+import org.apache.qpid.filter.PropertyExpression;
+import org.apache.qpid.filter.UnaryExpression;
/**
* JMS Selector Parser generated by JavaCC
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/client.log4j
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/client.log4j?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/client.log4j (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/client.log4j Tue Jul 29 12:03:34 2008
@@ -21,15 +21,10 @@
#log4j.logger.org.apache.qpid=${amqj.logging.level}, console
#log4j.additivity.org.apache.qpid=false
-#log4j.logger.org.apache.qpidity.transport=TRACE, console
log4j.logger.org.apache.qpid=ERROR, console
log4j.additivity.org.apache.qpid=false
-log4j.logger.org.apache.qpidity=ERROR, console
-log4j.additivity.org.apache.qpidity=false
-
-#log4j.logger.org.apache.qpidity.transport=DEBUG, console
#log4j.logger.org.apache.qpid.client.message.AbstractBytesTypedMessage=DEBUG, console
log4j.appender.console=org.apache.log4j.ConsoleAppender
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java Tue Jul 29 12:03:34 2008
@@ -12,11 +12,11 @@
import org.apache.qpid.framing.ProtocolVersion;
import org.apache.qpid.jms.BrokerDetails;
import org.apache.qpid.jms.Session;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.transport.ProtocolVersionException;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.transport.ProtocolVersionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,7 +35,7 @@
/**
* The QpidConeection instance that is mapped with thie JMS connection.
*/
- org.apache.qpidity.nclient.Connection _qpidConnection;
+ org.apache.qpid.nclient.Connection _qpidConnection;
//--- constructor
public AMQConnectionDelegate_0_10(AMQConnection conn)
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java Tue Jul 29 12:03:34 2008
@@ -28,16 +28,16 @@
import org.apache.qpid.client.message.MessageFactoryRegistry;
import org.apache.qpid.client.message.FiledTableSupport;
import org.apache.qpid.util.Serial;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.transport.MessageCreditUnit;
-import org.apache.qpidity.transport.MessageFlowMode;
-import org.apache.qpidity.transport.RangeSet;
-import org.apache.qpidity.transport.Option;
-import org.apache.qpidity.transport.ExchangeBoundResult;
-import org.apache.qpidity.transport.Future;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.transport.MessageCreditUnit;
+import org.apache.qpid.transport.MessageFlowMode;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.Option;
+import org.apache.qpid.transport.ExchangeBoundResult;
+import org.apache.qpid.transport.Future;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,8 +71,8 @@
private Object _currentExceptionLock = new Object();
private QpidException _currentException;
- // a ref on the qpidity connection
- protected org.apache.qpidity.nclient.Connection _qpidConnection;
+ // a ref on the qpid connection
+ protected org.apache.qpid.nclient.Connection _qpidConnection;
private RangeSet unacked = new RangeSet();
private int unackedCount = 0;
@@ -96,7 +96,7 @@
* @param defaultPrefetchLowMark The number of prefetched messages at which to resume the session.
* @param qpidConnection The qpid connection
*/
- AMQSession_0_10(org.apache.qpidity.nclient.Connection qpidConnection, AMQConnection con, int channelId,
+ AMQSession_0_10(org.apache.qpid.nclient.Connection qpidConnection, AMQConnection con, int channelId,
boolean transacted, int acknowledgeMode, MessageFactoryRegistry messageFactoryRegistry,
int defaultPrefetchHighMark, int defaultPrefetchLowMark)
{
@@ -126,7 +126,7 @@
* @param defaultPrefetchLow The number of prefetched messages at which to resume the session.
* @param qpidConnection The connection
*/
- AMQSession_0_10(org.apache.qpidity.nclient.Connection qpidConnection, AMQConnection con, int channelId,
+ AMQSession_0_10(org.apache.qpid.nclient.Connection qpidConnection, AMQConnection con, int channelId,
boolean transacted, int acknowledgeMode, int defaultPrefetchHigh, int defaultPrefetchLow)
{
@@ -594,7 +594,7 @@
*
* @return The associated Qpid Session.
*/
- protected org.apache.qpidity.nclient.Session getQpidSession()
+ protected org.apache.qpid.nclient.Session getQpidSession()
{
return _qpidSession;
}
@@ -645,7 +645,7 @@
/**
* Lstener for qpid protocol exceptions
*/
- private class QpidSessionExceptionListener implements org.apache.qpidity.nclient.ClosedListener
+ private class QpidSessionExceptionListener implements org.apache.qpid.nclient.ClosedListener
{
public void onClosed(ErrorCode errorCode, String reason, Throwable t)
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java Tue Jul 29 12:03:34 2008
@@ -27,12 +27,12 @@
import org.apache.qpid.jms.*;
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.transport.*;
-import org.apache.qpidity.transport.Session;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.filter.MessageFilter;
-import org.apache.qpidity.filter.JMSSelectorFilter;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.transport.*;
+import org.apache.qpid.transport.Session;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.filter.MessageFilter;
+import org.apache.qpid.filter.JMSSelectorFilter;
import javax.jms.InvalidSelectorException;
import javax.jms.JMSException;
@@ -46,7 +46,7 @@
* This is a 0.10 message consumer.
*/
public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], ByteBuffer>
- implements org.apache.qpidity.nclient.util.MessageListener
+ implements org.apache.qpid.nclient.util.MessageListener
{
/**
@@ -108,7 +108,7 @@
_isStarted = connection.started();
}
- // ----- Interface org.apache.qpidity.client.util.MessageListener
+ // ----- Interface org.apache.qpid.client.util.MessageListener
/**
*
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java Tue Jul 29 12:03:34 2008
@@ -33,13 +33,13 @@
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.BasicContentHeaderProperties;
import org.apache.qpid.url.AMQBindingURL;
-import org.apache.qpidity.nclient.util.ByteBufferMessage;
-import org.apache.qpidity.njms.ExceptionHelper;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageDeliveryMode;
-import org.apache.qpidity.transport.MessageDeliveryPriority;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.ReplyTo;
+import org.apache.qpid.nclient.util.ByteBufferMessage;
+import org.apache.qpid.njms.ExceptionHelper;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageDeliveryMode;
+import org.apache.qpid.transport.MessageDeliveryPriority;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.ReplyTo;
/**
* This is a 0_10 message producer.
@@ -208,7 +208,7 @@
// send the message
try
{
- org.apache.qpidity.nclient.Session ssn = ((AMQSession_0_10) getSession()).getQpidSession();
+ org.apache.qpid.nclient.Session ssn = ((AMQSession_0_10) getSession()).getQpidSession();
// if true, we need to sync the delivery of this message
boolean sync = (deliveryMode == DeliveryMode.PERSISTENT &&
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java Tue Jul 29 12:03:34 2008
@@ -21,9 +21,9 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.dtx.XidImpl;
-import org.apache.qpidity.transport.*;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.dtx.XidImpl;
+import org.apache.qpid.transport.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,7 +86,7 @@
}
catch (SessionException e)
{
- // we need to restore the qpidity session that has been closed
+ // we need to restore the qpid session that has been closed
_xaSession.createSession();
// we should get a single exception
convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -140,7 +140,7 @@
}
catch (SessionException e)
{
- // we need to restore the qpidity session that has been closed
+ // we need to restore the qpid session that has been closed
_xaSession.createSession();
// we should get a single exception
convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -169,7 +169,7 @@
}
catch (SessionException e)
{
- // we need to restore the qpidity session that has been closed
+ // we need to restore the qpid session that has been closed
_xaSession.createSession();
// we should get a single exception
convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -199,7 +199,7 @@
}
catch (SessionException e)
{
- // we need to restore the qpidity session that has been closed
+ // we need to restore the qpid session that has been closed
_xaSession.createSession();
// we should get a single exception
convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -246,7 +246,7 @@
}
catch (SessionException e)
{
- // we need to restore the qpidity session that has been closed
+ // we need to restore the qpid session that has been closed
_xaSession.createSession();
// we should get a single exception
convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -289,7 +289,7 @@
}
catch (SessionException e)
{
- // we need to restore the qpidity session that has been closed
+ // we need to restore the qpid session that has been closed
_xaSession.createSession();
// we should get a single exception
convertExecutionErrorToXAErr( e.getExceptions().get(0).getErrorCode());
@@ -298,7 +298,7 @@
int i = 0;
for (Object obj : res.getInDoubt())
{
- org.apache.qpidity.transport.Xid xid = (org.apache.qpidity.transport.Xid) obj;
+ org.apache.qpid.transport.Xid xid = (org.apache.qpid.transport.Xid) obj;
result[i] = new XidImpl(xid.getBranchId(), (int) xid.getFormat(), xid.getGlobalId());
i++;
}
@@ -327,7 +327,7 @@
}
catch (SessionException e)
{
- // we need to restore the qpidity session that has been closed
+ // we need to restore the qpid session that has been closed
_xaSession.createSession();
// we should get a single exception
convertExecutionErrorToXAErr( e.getExceptions().get(0).getErrorCode());
@@ -411,7 +411,7 @@
}
catch (SessionException e)
{
- // we need to restore the qpidity session that has been closed
+ // we need to restore the qpid session that has been closed
_xaSession.createSession();
// we should get a single exception
convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -512,7 +512,7 @@
* @return the qpid formated xid
* @throws XAException when xid is null or when it cannot be converted.
*/
- private org.apache.qpidity.transport.Xid convertXid(Xid xid) throws XAException
+ private org.apache.qpid.transport.Xid convertXid(Xid xid) throws XAException
{
if (xid == null)
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java Tue Jul 29 12:03:34 2008
@@ -17,7 +17,7 @@
*/
package org.apache.qpid.client;
-import org.apache.qpidity.nclient.DtxSession;
+import org.apache.qpid.nclient.DtxSession;
import org.apache.qpid.client.message.MessageFactoryRegistry;
import javax.jms.*;
@@ -48,7 +48,7 @@
/**
* Create a JMS XASession
*/
- public XASessionImpl(org.apache.qpidity.nclient.Connection qpidConnection, AMQConnection con, int channelId,
+ public XASessionImpl(org.apache.qpid.nclient.Connection qpidConnection, AMQConnection con, int channelId,
int defaultPrefetchHigh, int defaultPrefetchLow)
{
super(qpidConnection, con, channelId, false, // this is not a transacted session
@@ -61,7 +61,7 @@
//-- public methods
/**
- * Create a qpidity session.
+ * Create a qpid session.
*/
public void createSession()
{
@@ -126,7 +126,7 @@
*
* @return The associated Qpid Session.
*/
- protected org.apache.qpidity.nclient.DtxSession getQpidSession()
+ protected org.apache.qpid.nclient.DtxSession getQpidSession()
{
return _qpidDtxSession;
}
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java Tue Jul 29 12:03:34 2008
@@ -69,9 +69,9 @@
/**
* This is 0_10 specific
*/
- private org.apache.qpidity.api.Message _010message = null;
+ private org.apache.qpid.api.Message _010message = null;
- public void set010Message(org.apache.qpidity.api.Message m )
+ public void set010Message(org.apache.qpid.api.Message m )
{
_010message = m;
}
@@ -103,7 +103,7 @@
* End 010 specific
*/
- public org.apache.qpidity.api.Message get010Message()
+ public org.apache.qpid.api.Message get010Message()
{
return _010message;
}
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java Tue Jul 29 12:03:34 2008
@@ -27,9 +27,9 @@
import org.apache.qpid.framing.ContentBody;
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpidity.transport.Struct;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.DeliveryProperties;
+import org.apache.qpid.transport.Struct;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.DeliveryProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java Tue Jul 29 12:03:34 2008
@@ -27,7 +27,7 @@
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.Struct;
public interface MessageFactory
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java Tue Jul 29 12:03:34 2008
@@ -30,9 +30,9 @@
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.BasicContentHeaderProperties;
import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpidity.transport.Struct;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
+import org.apache.qpid.transport.Struct;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java Tue Jul 29 12:03:34 2008
@@ -25,8 +25,8 @@
import java.util.List;
import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.Struct;
/**
* This class contains everything needed to process a JMS message. It assembles the deliver body, the content header and
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java Tue Jul 29 12:03:34 2008
@@ -15,9 +15,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.client.message.AbstractJMSMessage;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java Tue Jul 29 12:03:34 2008
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
/**
* An expression which performs an operation on two expression values.
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java Tue Jul 29 12:03:34 2008
@@ -15,9 +15,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.client.message.AbstractJMSMessage;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java Tue Jul 29 12:03:34 2008
@@ -15,9 +15,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.client.message.AbstractJMSMessage;
import java.util.HashSet;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java Tue Jul 29 12:03:34 2008
@@ -15,9 +15,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.client.message.AbstractJMSMessage;
import java.math.BigDecimal;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java Tue Jul 29 12:03:34 2008
@@ -15,9 +15,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.client.message.AbstractJMSMessage;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java Tue Jul 29 12:03:34 2008
@@ -15,12 +15,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.filter.selector.SelectorParser;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.filter.selector.SelectorParser;
import org.apache.qpid.client.message.AbstractJMSMessage;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java Tue Jul 29 12:03:34 2008
@@ -15,9 +15,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.client.message.AbstractJMSMessage;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java Tue Jul 29 12:03:34 2008
@@ -15,9 +15,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.client.message.AbstractJMSMessage;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java Tue Jul 29 12:03:34 2008
@@ -15,12 +15,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
import org.apache.qpid.framing.CommonContentHeaderProperties;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.client.message.AbstractJMSMessage;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java Tue Jul 29 12:03:34 2008
@@ -15,9 +15,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.client.message.AbstractJMSMessage;
import java.math.BigDecimal;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java Tue Jul 29 12:03:34 2008
@@ -48,7 +48,7 @@
public static final long DEFAULT_CONNECT_TIMEOUT = 30000L;
public static final boolean USE_SSL_DEFAULT = false;
- // pulled these properties from the new BrokerDetails class in the qpidity package
+ // pulled these properties from the new BrokerDetails class in the qpid package
public static final String PROTOCOL_TCP = "tcp";
public static final String PROTOCOL_TLS = "tls";
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java Tue Jul 29 12:03:34 2008
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.naming;
+package org.apache.qpid.naming;
import org.apache.qpid.jndi.NameParserImpl;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/naming/jndi.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/naming/jndi.properties?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/naming/jndi.properties (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/naming/jndi.properties Tue Jul 29 12:03:34 2008
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-java.naming.factory.initial = org.apache.qpidity.naming.PropertiesFileInitialConextFactory
+java.naming.factory.initial = org.apache.qpid.naming.PropertiesFileInitialConextFactory
# use the following property to configure the default connector
#java.naming.provider.url - ignored.
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Client.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Client.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Client.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Client.java Tue Jul 29 12:03:34 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
import java.util.List;
import java.util.UUID;
@@ -29,27 +29,27 @@
import org.apache.qpid.client.url.URLParser_0_10;
import org.apache.qpid.jms.BrokerDetails;
import org.apache.qpid.url.QpidURL;
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.nclient.impl.ClientSession;
-import org.apache.qpidity.nclient.impl.ClientSessionDelegate;
-import org.apache.qpidity.transport.Channel;
-import org.apache.qpidity.transport.ClientDelegate;
-import org.apache.qpidity.transport.Connection;
-import org.apache.qpidity.transport.ConnectionClose;
-import org.apache.qpidity.transport.ConnectionCloseCode;
-import org.apache.qpidity.transport.ConnectionCloseOk;
-import org.apache.qpidity.transport.ProtocolHeader;
-import org.apache.qpidity.transport.ProtocolVersionException;
-import org.apache.qpidity.transport.SessionDelegate;
-import org.apache.qpidity.transport.network.io.IoTransport;
-import org.apache.qpidity.transport.network.mina.MinaHandler;
-import org.apache.qpidity.transport.network.nio.NioHandler;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.nclient.impl.ClientSession;
+import org.apache.qpid.nclient.impl.ClientSessionDelegate;
+import org.apache.qpid.transport.Channel;
+import org.apache.qpid.transport.ClientDelegate;
+import org.apache.qpid.transport.Connection;
+import org.apache.qpid.transport.ConnectionClose;
+import org.apache.qpid.transport.ConnectionCloseCode;
+import org.apache.qpid.transport.ConnectionCloseOk;
+import org.apache.qpid.transport.ProtocolHeader;
+import org.apache.qpid.transport.ProtocolVersionException;
+import org.apache.qpid.transport.SessionDelegate;
+import org.apache.qpid.transport.network.io.IoTransport;
+import org.apache.qpid.transport.network.mina.MinaHandler;
+import org.apache.qpid.transport.network.nio.NioHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class Client implements org.apache.qpidity.nclient.Connection
+public class Client implements org.apache.qpid.nclient.Connection
{
private Connection _conn;
private ClosedListener _closedListner;
@@ -65,7 +65,7 @@
*
* @return returns a new connection to the broker.
*/
- public static org.apache.qpidity.nclient.Connection createConnection()
+ public static org.apache.qpid.nclient.Connection createConnection()
{
return new Client();
}
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/ClosedListener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/ClosedListener.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/ClosedListener.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/ClosedListener.java Tue Jul 29 12:03:34 2008
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
-import org.apache.qpidity.ErrorCode;
+import org.apache.qpid.ErrorCode;
/**
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Connection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Connection.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Connection.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Connection.java Tue Jul 29 12:03:34 2008
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
/**
* This represents a physical connection to a broker.
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/DtxSession.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/DtxSession.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/DtxSession.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/DtxSession.java Tue Jul 29 12:03:34 2008
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
-import org.apache.qpidity.transport.Future;
-import org.apache.qpidity.transport.GetTimeoutResult;
-import org.apache.qpidity.transport.Option;
-import org.apache.qpidity.transport.RecoverResult;
-import org.apache.qpidity.transport.XaResult;
-import org.apache.qpidity.transport.Xid;
+import org.apache.qpid.transport.Future;
+import org.apache.qpid.transport.GetTimeoutResult;
+import org.apache.qpid.transport.Option;
+import org.apache.qpid.transport.RecoverResult;
+import org.apache.qpid.transport.XaResult;
+import org.apache.qpid.transport.Xid;
/**
* The resources for this session are controlled under the scope of a distributed transaction.
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/JMSTestCase.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/JMSTestCase.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/JMSTestCase.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/JMSTestCase.java Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
- package org.apache.qpidity.nclient;
+ package org.apache.qpid.nclient;
import java.util.Enumeration;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java Tue Jul 29 12:03:34 2008
@@ -15,11 +15,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
import java.nio.ByteBuffer;
-import org.apache.qpidity.transport.Header;
+import org.apache.qpid.transport.Header;
/**
* Assembles message parts.
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Session.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Session.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Session.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/Session.java Tue Jul 29 12:03:34 2008
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Map;
-import org.apache.qpidity.transport.*;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.*;
+import org.apache.qpid.api.Message;
/**
* <p>A session is associated with a connection.
@@ -116,8 +116,8 @@
* <br><b><i>This method should only be used by large messages</b></i><br>
* There are two convenience Message classes to do this.
* <ul>
- * <li> <code>{@link org.apache.qpidity.nclient.util.FileMessage}</code>
- * <li> <code>{@link org.apache.qpidity.nclient.util.StreamingMessage}</code>
+ * <li> <code>{@link org.apache.qpid.nclient.util.FileMessage}</code>
+ * <li> <code>{@link org.apache.qpid.nclient.util.StreamingMessage}</code>
* </ul>
* You can also implement a <code>Message</code> interface to wrap any
* data stream.
@@ -160,8 +160,8 @@
* Make a set of headers to be sent together with a message
*
* @param headers headers to be added
- * @see org.apache.qpidity.transport.DeliveryProperties
- * @see org.apache.qpidity.transport.MessageProperties
+ * @see org.apache.qpid.transport.DeliveryProperties
+ * @see org.apache.qpid.transport.MessageProperties
* @return The added headers.
*/
public Header header(Struct... headers);
@@ -229,7 +229,7 @@
* acquired when the transfer starts.
* </ul>
* @param listener The listener for this destination. To transfer large messages
- * use a {@link org.apache.qpidity.nclient.MessagePartListener}.
+ * use a {@link org.apache.qpid.nclient.MessagePartListener}.
* @param options Set of options. Valid options are {{@link Option#EXCLUSIVE}
* and {@link Option#NONE}.
* @param filter A set of filters for the subscription. The syntax and semantics of these filters varies
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
import java.io.EOFException;
import java.io.IOException;
@@ -7,22 +7,22 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.nclient.MessagePartListener;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
-import org.apache.qpidity.transport.Option;
-import org.apache.qpidity.transport.Range;
-import org.apache.qpidity.transport.RangeSet;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.nclient.MessagePartListener;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
+import org.apache.qpid.transport.Option;
+import org.apache.qpid.transport.Range;
+import org.apache.qpid.transport.RangeSet;
-import static org.apache.qpidity.transport.Option.*;
+import static org.apache.qpid.transport.Option.*;
/**
* Implements a Qpid Sesion.
*/
-public class ClientSession extends org.apache.qpidity.transport.Session implements org.apache.qpidity.nclient.DtxSession
+public class ClientSession extends org.apache.qpid.transport.Session implements org.apache.qpid.nclient.DtxSession
{
static
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSessionDelegate.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSessionDelegate.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSessionDelegate.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSessionDelegate.java Tue Jul 29 12:03:34 2008
@@ -1,20 +1,20 @@
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
import java.nio.ByteBuffer;
-import org.apache.qpidity.ErrorCode;
+import org.apache.qpid.ErrorCode;
-import org.apache.qpidity.nclient.MessagePartListener;
+import org.apache.qpid.nclient.MessagePartListener;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.transport.Data;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.transport.MessageReject;
-import org.apache.qpidity.transport.MessageTransfer;
-import org.apache.qpidity.transport.Range;
-import org.apache.qpidity.transport.Session;
-import org.apache.qpidity.transport.SessionDetached;
-import org.apache.qpidity.transport.SessionDelegate;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.transport.Data;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.transport.MessageReject;
+import org.apache.qpid.transport.MessageTransfer;
+import org.apache.qpid.transport.Range;
+import org.apache.qpid.transport.Session;
+import org.apache.qpid.transport.SessionDetached;
+import org.apache.qpid.transport.SessionDelegate;
public class ClientSessionDelegate extends SessionDelegate
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/Constants.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/Constants.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/Constants.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/Constants.java Tue Jul 29 12:03:34 2008
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
/**
* This class holds all the 0.10 client constants which value can be set
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/DemoClient.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/DemoClient.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/DemoClient.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/DemoClient.java Tue Jul 29 12:03:34 2008
@@ -1,17 +1,17 @@
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
-import org.apache.qpidity.transport.MessageProperties;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
+import org.apache.qpid.transport.MessageProperties;
import java.util.UUID;