From 9a8f6e415db43a4e43ad42a87b3617b3641aa07d Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 7 Nov 2012 05:00:17 +0000 Subject: [PATCH] Refactored the classes needed to run an ActiveMQ JMS client out from the activemq-core module to the activemq-client module. git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406466 13f79535-47bb-0310-9956-ffa450edef68 --- .../transport/amqp/AmqpProtocolConverter.java | 1 - .../transport/amqp/AmqpTransportFilter.java | 2 - .../transport/amqp/AmqpTestSupport.java | 2 - .../camel/component/JournalEndpoint.java | 3 - activemq-client/pom.xml | 501 ++++++++++++++++++ .../src/main/grammar/SelectorParser.jj | 0 .../apache/activemq/ActiveMQConnection.java | 0 .../activemq/ActiveMQConnectionConsumer.java | 0 .../activemq/ActiveMQConnectionFactory.java | 2 +- .../activemq/ActiveMQConnectionMetaData.java | 0 .../apache/activemq/ActiveMQDispatcher.java | 0 .../apache/activemq/ActiveMQInputStream.java | 0 .../apache/activemq/ActiveMQMessageAudit.java | 0 .../activemq/ActiveMQMessageAuditNoSync.java | 0 .../activemq/ActiveMQMessageConsumer.java | 0 .../activemq/ActiveMQMessageProducer.java | 0 .../ActiveMQMessageProducerSupport.java | 0 .../ActiveMQMessageTransformation.java | 0 .../apache/activemq/ActiveMQOutputStream.java | 0 .../activemq/ActiveMQPrefetchPolicy.java | 0 .../apache/activemq/ActiveMQQueueBrowser.java | 0 .../activemq/ActiveMQQueueReceiver.java | 0 .../apache/activemq/ActiveMQQueueSender.java | 0 .../apache/activemq/ActiveMQQueueSession.java | 0 .../org/apache/activemq/ActiveMQSession.java | 0 .../activemq/ActiveMQSessionExecutor.java | 0 .../ActiveMQSslConnectionFactory.java | 0 .../activemq/ActiveMQTopicPublisher.java | 0 .../apache/activemq/ActiveMQTopicSession.java | 0 .../activemq/ActiveMQTopicSubscriber.java | 0 .../apache/activemq/ActiveMQXAConnection.java | 0 .../activemq/ActiveMQXAConnectionFactory.java | 0 .../apache/activemq/ActiveMQXASession.java | 0 .../org/apache/activemq/AdvisoryConsumer.java | 0 .../activemq/AlreadyClosedException.java | 0 .../org/apache/activemq/AsyncCallback.java | 0 .../java/org/apache/activemq/BlobMessage.java | 0 .../ClientInternalExceptionListener.java | 0 .../java/org/apache/activemq/Closeable.java | 0 .../activemq/ConfigurationException.java | 0 .../org/apache/activemq/ConnectionAudit.java | 0 .../activemq/ConnectionClosedException.java | 0 .../activemq/ConnectionFailedException.java | 0 .../apache/activemq/CustomDestination.java | 0 .../java/org/apache/activemq/Disposable.java | 0 .../apache/activemq/EnhancedConnection.java | 0 .../activemq/FifoMessageDispatchChannel.java | 0 .../LocalTransactionEventListener.java | 0 .../java/org/apache/activemq/Message.java | 0 .../activemq/MessageAvailableConsumer.java | 0 .../activemq/MessageAvailableListener.java | 0 .../activemq/MessageDispatchChannel.java | 0 .../apache/activemq/MessageTransformer.java | 0 .../activemq/MessageTransformerSupport.java | 0 .../apache/activemq/NotStartedException.java | 0 .../org/apache/activemq/RedeliveryPolicy.java | 0 .../org/apache/activemq/ScheduledMessage.java | 0 .../java/org/apache/activemq/Service.java | 0 .../SimplePriorityMessageDispatchChannel.java | 0 .../org/apache/activemq/StreamConnection.java | 0 .../org/apache/activemq/ThreadPriorities.java | 0 .../apache/activemq/TransactionContext.java | 0 .../activemq/TransportLoggerSupport.java | 63 +++ .../activemq/advisory/AdvisorySupport.java | 0 .../activemq/advisory/ConsumerEvent.java | 0 .../advisory/ConsumerEventSource.java | 0 .../activemq/advisory/ConsumerListener.java | 0 .../advisory/ConsumerStartedEvent.java | 0 .../advisory/ConsumerStoppedEvent.java | 0 .../activemq/advisory/DestinationEvent.java | 3 - .../advisory/DestinationListener.java | 0 .../activemq/advisory/DestinationSource.java | 1 - .../activemq/advisory/ProducerEvent.java | 0 .../advisory/ProducerEventSource.java | 0 .../activemq/advisory/ProducerListener.java | 0 .../advisory/ProducerStartedEvent.java | 0 .../advisory/ProducerStoppedEvent.java | 0 .../org/apache/activemq/advisory/package.html | 0 .../activemq/blob/BlobDownloadStrategy.java | 0 .../apache/activemq/blob/BlobDownloader.java | 0 .../activemq/blob/BlobTransferPolicy.java | 0 .../activemq/blob/BlobUploadStrategy.java | 0 .../apache/activemq/blob/BlobUploader.java | 0 .../blob/DefaultBlobDownloadStrategy.java | 0 .../blob/DefaultBlobUploadStrategy.java | 0 .../apache/activemq/blob/DefaultStrategy.java | 0 .../blob/FTPBlobDownloadStrategy.java | 0 .../activemq/blob/FTPBlobUploadStrategy.java | 0 .../org/apache/activemq/blob/FTPStrategy.java | 0 .../activemq/blob/FileSystemBlobStrategy.java | 0 .../org/apache/activemq/blob/package.html | 0 .../apache/activemq/broker/SslContext.java | 0 .../broker/region/MessageReference.java | 2 +- .../region/policy/RedeliveryPolicyMap.java | 0 .../activemq/broker/scheduler/CronParser.java | 0 .../activemq/command/ActiveMQBlobMessage.java | 0 .../command/ActiveMQBytesMessage.java | 0 .../activemq/command/ActiveMQDestination.java | 0 .../activemq/command/ActiveMQMapMessage.java | 0 .../activemq/command/ActiveMQMessage.java | 0 .../command/ActiveMQObjectMessage.java | 0 .../activemq/command/ActiveMQQueue.java | 0 .../command/ActiveMQStreamMessage.java | 0 .../command/ActiveMQTempDestination.java | 0 .../activemq/command/ActiveMQTempQueue.java | 0 .../activemq/command/ActiveMQTempTopic.java | 0 .../activemq/command/ActiveMQTextMessage.java | 0 .../activemq/command/ActiveMQTopic.java | 0 .../apache/activemq/command/BaseCommand.java | 0 .../apache/activemq/command/BaseEndpoint.java | 0 .../org/apache/activemq/command/BrokerId.java | 0 .../apache/activemq/command/BrokerInfo.java | 0 .../org/apache/activemq/command/Command.java | 0 .../apache/activemq/command/CommandTypes.java | 0 .../activemq/command/ConnectionControl.java | 0 .../activemq/command/ConnectionError.java | 0 .../apache/activemq/command/ConnectionId.java | 0 .../activemq/command/ConnectionInfo.java | 0 .../activemq/command/ConsumerControl.java | 0 .../apache/activemq/command/ConsumerId.java | 0 .../apache/activemq/command/ConsumerInfo.java | 0 .../activemq/command/ControlCommand.java | 0 .../activemq/command/DataArrayResponse.java | 0 .../apache/activemq/command/DataResponse.java | 0 .../activemq/command/DataStructure.java | 0 ...faultUnresolvedDestinationTransformer.java | 0 .../activemq/command/DestinationInfo.java | 0 .../activemq/command/DiscoveryEvent.java | 0 .../org/apache/activemq/command/Endpoint.java | 0 .../activemq/command/ExceptionResponse.java | 0 .../apache/activemq/command/FlushCommand.java | 0 .../activemq/command/IntegerResponse.java | 0 .../activemq/command/JournalQueueAck.java | 0 .../activemq/command/JournalTopicAck.java | 0 .../apache/activemq/command/JournalTrace.java | 0 .../activemq/command/JournalTransaction.java | 0 .../activemq/command/KeepAliveInfo.java | 0 .../activemq/command/LastPartialCommand.java | 0 .../activemq/command/LocalTransactionId.java | 0 .../activemq/command/MarshallAware.java | 0 .../org/apache/activemq/command/Message.java | 28 +- .../apache/activemq/command/MessageAck.java | 0 .../activemq/command/MessageDispatch.java | 0 .../command/MessageDispatchNotification.java | 0 .../apache/activemq/command/MessageId.java | 0 .../apache/activemq/command/MessagePull.java | 0 .../activemq/command/NetworkBridgeFilter.java | 0 .../activemq/command/PartialCommand.java | 0 .../apache/activemq/command/ProducerAck.java | 0 .../apache/activemq/command/ProducerId.java | 0 .../apache/activemq/command/ProducerInfo.java | 0 .../apache/activemq/command/RemoveInfo.java | 0 .../command/RemoveSubscriptionInfo.java | 0 .../activemq/command/ReplayCommand.java | 0 .../org/apache/activemq/command/Response.java | 0 .../apache/activemq/command/SessionId.java | 0 .../apache/activemq/command/SessionInfo.java | 0 .../apache/activemq/command/ShutdownInfo.java | 0 .../activemq/command/SubscriptionInfo.java | 0 .../activemq/command/TransactionId.java | 0 .../activemq/command/TransactionInfo.java | 0 .../UnresolvedDestinationTransformer.java | 0 .../activemq/command/WireFormatInfo.java | 0 .../activemq/command/XATransactionId.java | 0 .../org/apache/activemq/command/package.html | 0 .../filter/AnyChildDestinationNode.java | 0 .../activemq/filter/AnyDestination.java | 0 .../activemq/filter/ArithmeticExpression.java | 0 .../activemq/filter/BinaryExpression.java | 0 .../activemq/filter/BooleanExpression.java | 0 .../activemq/filter/ComparisonExpression.java | 0 .../filter/CompositeDestinationFilter.java | 0 .../activemq/filter/ConstantExpression.java | 0 .../filter/DefaultDestinationMapEntry.java | 0 .../activemq/filter/DestinationFilter.java | 0 .../activemq/filter/DestinationMap.java | 0 .../activemq/filter/DestinationMapEntry.java | 0 .../activemq/filter/DestinationMapNode.java | 0 .../activemq/filter/DestinationNode.java | 0 .../activemq/filter/DestinationPath.java | 0 .../apache/activemq/filter/Expression.java | 0 .../activemq/filter/LogicExpression.java | 0 .../filter/MessageEvaluationContext.java | 0 .../filter/MultiExpressionEvaluator.java | 0 .../activemq/filter/NoLocalExpression.java | 0 .../NonCachedMessageEvaluationContext.java | 0 .../filter/PrefixDestinationFilter.java | 0 .../activemq/filter/PropertyExpression.java | 0 .../filter/SimpleDestinationFilter.java | 0 .../activemq/filter/UnaryExpression.java | 0 .../filter/WildcardDestinationFilter.java | 0 .../activemq/filter/XPathExpression.java | 0 .../activemq/filter/XQueryExpression.java | 0 .../activemq/filter/XalanXPathEvaluator.java | 1 - .../org/apache/activemq/filter/package.html | 0 .../jndi/ActiveMQInitialContextFactory.java | 0 .../ActiveMQWASInitialContextFactory.java | 0 .../activemq/jndi/JNDIBaseStorable.java | 0 .../activemq/jndi/JNDIReferenceFactory.java | 0 .../activemq/jndi/JNDIStorableInterface.java | 0 .../activemq/jndi/LazyCreateContext.java | 0 .../apache/activemq/jndi/NameParserImpl.java | 0 .../apache/activemq/jndi/ReadOnlyContext.java | 0 .../org/apache/activemq/jndi/package.html | 0 .../management/BoundaryStatisticImpl.java | 0 .../management/BoundedRangeStatisticImpl.java | 0 .../management/CountStatisticImpl.java | 0 .../JCAConnectionPoolStatsImpl.java | 0 .../management/JCAConnectionStatsImpl.java | 0 .../activemq/management/JCAStatsImpl.java | 0 .../management/JMSConnectionStatsImpl.java | 0 .../management/JMSConsumerStatsImpl.java | 0 .../management/JMSEndpointStatsImpl.java | 0 .../management/JMSProducerStatsImpl.java | 0 .../management/JMSSessionStatsImpl.java | 0 .../activemq/management/JMSStatsImpl.java | 0 .../management/PollCountStatisticImpl.java | 0 .../management/RangeStatisticImpl.java | 0 .../activemq/management/Resettable.java | 0 .../activemq/management/StatisticImpl.java | 0 .../activemq/management/StatsCapable.java | 0 .../apache/activemq/management/StatsImpl.java | 0 .../management/TimeStatisticImpl.java | 0 .../apache/activemq/management/package.html | 0 .../activemq/openwire/BooleanStream.java | 0 .../openwire/CommandIdComparator.java | 0 .../openwire/DataStreamMarshaller.java | 0 .../activemq/openwire/OpenWireFormat.java | 0 .../openwire/OpenWireFormatFactory.java | 0 .../v1/ActiveMQBytesMessageMarshaller.java | 0 .../v1/ActiveMQDestinationMarshaller.java | 0 .../v1/ActiveMQMapMessageMarshaller.java | 0 .../v1/ActiveMQMessageMarshaller.java | 0 .../v1/ActiveMQObjectMessageMarshaller.java | 0 .../openwire/v1/ActiveMQQueueMarshaller.java | 0 .../v1/ActiveMQStreamMessageMarshaller.java | 0 .../v1/ActiveMQTempDestinationMarshaller.java | 0 .../v1/ActiveMQTempQueueMarshaller.java | 0 .../v1/ActiveMQTempTopicMarshaller.java | 0 .../v1/ActiveMQTextMessageMarshaller.java | 0 .../openwire/v1/ActiveMQTopicMarshaller.java | 0 .../openwire/v1/BaseCommandMarshaller.java | 0 .../openwire/v1/BaseDataStreamMarshaller.java | 0 .../openwire/v1/BrokerIdMarshaller.java | 0 .../openwire/v1/BrokerInfoMarshaller.java | 0 .../v1/ConnectionControlMarshaller.java | 0 .../v1/ConnectionErrorMarshaller.java | 0 .../openwire/v1/ConnectionIdMarshaller.java | 0 .../openwire/v1/ConnectionInfoMarshaller.java | 0 .../v1/ConsumerControlMarshaller.java | 0 .../openwire/v1/ConsumerIdMarshaller.java | 0 .../openwire/v1/ConsumerInfoMarshaller.java | 0 .../openwire/v1/ControlCommandMarshaller.java | 0 .../v1/DataArrayResponseMarshaller.java | 0 .../openwire/v1/DataResponseMarshaller.java | 0 .../v1/DataStructureSupportMarshaller.java | 0 .../v1/DestinationInfoMarshaller.java | 0 .../openwire/v1/DiscoveryEventMarshaller.java | 0 .../v1/ExceptionResponseMarshaller.java | 0 .../openwire/v1/FlushCommandMarshaller.java | 0 .../v1/IntegerResponseMarshaller.java | 0 .../v1/JournalQueueAckMarshaller.java | 0 .../v1/JournalTopicAckMarshaller.java | 0 .../openwire/v1/JournalTraceMarshaller.java | 0 .../v1/JournalTransactionMarshaller.java | 0 .../openwire/v1/KeepAliveInfoMarshaller.java | 0 .../v1/LastPartialCommandMarshaller.java | 0 .../v1/LocalTransactionIdMarshaller.java | 0 .../openwire/v1/MarshallerFactory.java | 0 .../openwire/v1/MessageAckMarshaller.java | 0 .../v1/MessageDispatchMarshaller.java | 0 ...MessageDispatchNotificationMarshaller.java | 0 .../openwire/v1/MessageIdMarshaller.java | 0 .../openwire/v1/MessageMarshaller.java | 0 .../v1/NetworkBridgeFilterMarshaller.java | 0 .../openwire/v1/PartialCommandMarshaller.java | 0 .../openwire/v1/ProducerIdMarshaller.java | 0 .../openwire/v1/ProducerInfoMarshaller.java | 0 .../openwire/v1/RemoveInfoMarshaller.java | 0 .../v1/RemoveSubscriptionInfoMarshaller.java | 0 .../openwire/v1/ReplayCommandMarshaller.java | 0 .../openwire/v1/ResponseMarshaller.java | 0 .../openwire/v1/SessionIdMarshaller.java | 0 .../openwire/v1/SessionInfoMarshaller.java | 0 .../openwire/v1/ShutdownInfoMarshaller.java | 0 .../v1/SubscriptionInfoMarshaller.java | 0 .../openwire/v1/TransactionIdMarshaller.java | 0 .../v1/TransactionInfoMarshaller.java | 0 .../openwire/v1/WireFormatInfoMarshaller.java | 0 .../v1/XATransactionIdMarshaller.java | 0 .../v2/ActiveMQBytesMessageMarshaller.java | 0 .../v2/ActiveMQDestinationMarshaller.java | 0 .../v2/ActiveMQMapMessageMarshaller.java | 0 .../v2/ActiveMQMessageMarshaller.java | 0 .../v2/ActiveMQObjectMessageMarshaller.java | 0 .../openwire/v2/ActiveMQQueueMarshaller.java | 0 .../v2/ActiveMQStreamMessageMarshaller.java | 0 .../v2/ActiveMQTempDestinationMarshaller.java | 0 .../v2/ActiveMQTempQueueMarshaller.java | 0 .../v2/ActiveMQTempTopicMarshaller.java | 0 .../v2/ActiveMQTextMessageMarshaller.java | 0 .../openwire/v2/ActiveMQTopicMarshaller.java | 0 .../openwire/v2/BaseCommandMarshaller.java | 0 .../openwire/v2/BaseDataStreamMarshaller.java | 0 .../openwire/v2/BrokerIdMarshaller.java | 0 .../openwire/v2/BrokerInfoMarshaller.java | 0 .../v2/ConnectionControlMarshaller.java | 0 .../v2/ConnectionErrorMarshaller.java | 0 .../openwire/v2/ConnectionIdMarshaller.java | 0 .../openwire/v2/ConnectionInfoMarshaller.java | 0 .../v2/ConsumerControlMarshaller.java | 0 .../openwire/v2/ConsumerIdMarshaller.java | 0 .../openwire/v2/ConsumerInfoMarshaller.java | 0 .../openwire/v2/ControlCommandMarshaller.java | 0 .../v2/DataArrayResponseMarshaller.java | 0 .../openwire/v2/DataResponseMarshaller.java | 0 .../v2/DestinationInfoMarshaller.java | 0 .../openwire/v2/DiscoveryEventMarshaller.java | 0 .../v2/ExceptionResponseMarshaller.java | 0 .../openwire/v2/FlushCommandMarshaller.java | 0 .../v2/IntegerResponseMarshaller.java | 0 .../v2/JournalQueueAckMarshaller.java | 0 .../v2/JournalTopicAckMarshaller.java | 0 .../openwire/v2/JournalTraceMarshaller.java | 0 .../v2/JournalTransactionMarshaller.java | 0 .../openwire/v2/KeepAliveInfoMarshaller.java | 0 .../v2/LastPartialCommandMarshaller.java | 0 .../v2/LocalTransactionIdMarshaller.java | 0 .../openwire/v2/MarshallerFactory.java | 0 .../openwire/v2/MessageAckMarshaller.java | 0 .../v2/MessageDispatchMarshaller.java | 0 ...MessageDispatchNotificationMarshaller.java | 0 .../openwire/v2/MessageIdMarshaller.java | 0 .../openwire/v2/MessageMarshaller.java | 0 .../openwire/v2/MessagePullMarshaller.java | 0 .../v2/NetworkBridgeFilterMarshaller.java | 0 .../openwire/v2/PartialCommandMarshaller.java | 0 .../openwire/v2/ProducerIdMarshaller.java | 0 .../openwire/v2/ProducerInfoMarshaller.java | 0 .../openwire/v2/RemoveInfoMarshaller.java | 0 .../v2/RemoveSubscriptionInfoMarshaller.java | 0 .../openwire/v2/ReplayCommandMarshaller.java | 0 .../openwire/v2/ResponseMarshaller.java | 0 .../openwire/v2/SessionIdMarshaller.java | 0 .../openwire/v2/SessionInfoMarshaller.java | 0 .../openwire/v2/ShutdownInfoMarshaller.java | 0 .../v2/SubscriptionInfoMarshaller.java | 0 .../openwire/v2/TransactionIdMarshaller.java | 0 .../v2/TransactionInfoMarshaller.java | 0 .../openwire/v2/WireFormatInfoMarshaller.java | 0 .../v2/XATransactionIdMarshaller.java | 0 .../v3/ActiveMQBlobMessageMarshaller.java | 0 .../v3/ActiveMQBytesMessageMarshaller.java | 0 .../v3/ActiveMQDestinationMarshaller.java | 0 .../v3/ActiveMQMapMessageMarshaller.java | 0 .../v3/ActiveMQMessageMarshaller.java | 0 .../v3/ActiveMQObjectMessageMarshaller.java | 0 .../openwire/v3/ActiveMQQueueMarshaller.java | 0 .../v3/ActiveMQStreamMessageMarshaller.java | 0 .../v3/ActiveMQTempDestinationMarshaller.java | 0 .../v3/ActiveMQTempQueueMarshaller.java | 0 .../v3/ActiveMQTempTopicMarshaller.java | 0 .../v3/ActiveMQTextMessageMarshaller.java | 0 .../openwire/v3/ActiveMQTopicMarshaller.java | 0 .../openwire/v3/BaseCommandMarshaller.java | 0 .../openwire/v3/BaseDataStreamMarshaller.java | 0 .../openwire/v3/BrokerIdMarshaller.java | 0 .../openwire/v3/BrokerInfoMarshaller.java | 0 .../v3/ConnectionControlMarshaller.java | 0 .../v3/ConnectionErrorMarshaller.java | 0 .../openwire/v3/ConnectionIdMarshaller.java | 0 .../openwire/v3/ConnectionInfoMarshaller.java | 0 .../v3/ConsumerControlMarshaller.java | 0 .../openwire/v3/ConsumerIdMarshaller.java | 0 .../openwire/v3/ConsumerInfoMarshaller.java | 0 .../openwire/v3/ControlCommandMarshaller.java | 0 .../v3/DataArrayResponseMarshaller.java | 0 .../openwire/v3/DataResponseMarshaller.java | 0 .../v3/DestinationInfoMarshaller.java | 0 .../openwire/v3/DiscoveryEventMarshaller.java | 0 .../v3/ExceptionResponseMarshaller.java | 0 .../openwire/v3/FlushCommandMarshaller.java | 0 .../v3/IntegerResponseMarshaller.java | 0 .../v3/JournalQueueAckMarshaller.java | 0 .../v3/JournalTopicAckMarshaller.java | 0 .../openwire/v3/JournalTraceMarshaller.java | 0 .../v3/JournalTransactionMarshaller.java | 0 .../openwire/v3/KeepAliveInfoMarshaller.java | 0 .../v3/LastPartialCommandMarshaller.java | 0 .../v3/LocalTransactionIdMarshaller.java | 0 .../openwire/v3/MarshallerFactory.java | 0 .../openwire/v3/MessageAckMarshaller.java | 0 .../v3/MessageDispatchMarshaller.java | 0 ...MessageDispatchNotificationMarshaller.java | 0 .../openwire/v3/MessageIdMarshaller.java | 0 .../openwire/v3/MessageMarshaller.java | 0 .../openwire/v3/MessagePullMarshaller.java | 0 .../v3/NetworkBridgeFilterMarshaller.java | 0 .../openwire/v3/PartialCommandMarshaller.java | 0 .../openwire/v3/ProducerAckMarshaller.java | 0 .../openwire/v3/ProducerIdMarshaller.java | 0 .../openwire/v3/ProducerInfoMarshaller.java | 0 .../openwire/v3/RemoveInfoMarshaller.java | 0 .../v3/RemoveSubscriptionInfoMarshaller.java | 0 .../openwire/v3/ReplayCommandMarshaller.java | 0 .../openwire/v3/ResponseMarshaller.java | 0 .../openwire/v3/SessionIdMarshaller.java | 0 .../openwire/v3/SessionInfoMarshaller.java | 0 .../openwire/v3/ShutdownInfoMarshaller.java | 0 .../v3/SubscriptionInfoMarshaller.java | 0 .../openwire/v3/TransactionIdMarshaller.java | 0 .../v3/TransactionInfoMarshaller.java | 0 .../openwire/v3/WireFormatInfoMarshaller.java | 0 .../v3/XATransactionIdMarshaller.java | 0 .../v4/ActiveMQBlobMessageMarshaller.java | 0 .../v4/ActiveMQBytesMessageMarshaller.java | 0 .../v4/ActiveMQDestinationMarshaller.java | 0 .../v4/ActiveMQMapMessageMarshaller.java | 0 .../v4/ActiveMQMessageMarshaller.java | 0 .../v4/ActiveMQObjectMessageMarshaller.java | 0 .../openwire/v4/ActiveMQQueueMarshaller.java | 0 .../v4/ActiveMQStreamMessageMarshaller.java | 0 .../v4/ActiveMQTempDestinationMarshaller.java | 0 .../v4/ActiveMQTempQueueMarshaller.java | 0 .../v4/ActiveMQTempTopicMarshaller.java | 0 .../v4/ActiveMQTextMessageMarshaller.java | 0 .../openwire/v4/ActiveMQTopicMarshaller.java | 0 .../openwire/v4/BaseCommandMarshaller.java | 0 .../openwire/v4/BaseDataStreamMarshaller.java | 0 .../openwire/v4/BrokerIdMarshaller.java | 0 .../openwire/v4/BrokerInfoMarshaller.java | 0 .../v4/ConnectionControlMarshaller.java | 0 .../v4/ConnectionErrorMarshaller.java | 0 .../openwire/v4/ConnectionIdMarshaller.java | 0 .../openwire/v4/ConnectionInfoMarshaller.java | 0 .../v4/ConsumerControlMarshaller.java | 0 .../openwire/v4/ConsumerIdMarshaller.java | 0 .../openwire/v4/ConsumerInfoMarshaller.java | 0 .../openwire/v4/ControlCommandMarshaller.java | 0 .../v4/DataArrayResponseMarshaller.java | 0 .../openwire/v4/DataResponseMarshaller.java | 0 .../v4/DestinationInfoMarshaller.java | 0 .../openwire/v4/DiscoveryEventMarshaller.java | 0 .../v4/ExceptionResponseMarshaller.java | 0 .../openwire/v4/FlushCommandMarshaller.java | 0 .../v4/IntegerResponseMarshaller.java | 0 .../v4/JournalQueueAckMarshaller.java | 0 .../v4/JournalTopicAckMarshaller.java | 0 .../openwire/v4/JournalTraceMarshaller.java | 0 .../v4/JournalTransactionMarshaller.java | 0 .../openwire/v4/KeepAliveInfoMarshaller.java | 0 .../v4/LastPartialCommandMarshaller.java | 0 .../v4/LocalTransactionIdMarshaller.java | 0 .../openwire/v4/MarshallerFactory.java | 0 .../openwire/v4/MessageAckMarshaller.java | 0 .../v4/MessageDispatchMarshaller.java | 0 ...MessageDispatchNotificationMarshaller.java | 0 .../openwire/v4/MessageIdMarshaller.java | 0 .../openwire/v4/MessageMarshaller.java | 0 .../openwire/v4/MessagePullMarshaller.java | 0 .../v4/NetworkBridgeFilterMarshaller.java | 0 .../openwire/v4/PartialCommandMarshaller.java | 0 .../openwire/v4/ProducerAckMarshaller.java | 0 .../openwire/v4/ProducerIdMarshaller.java | 0 .../openwire/v4/ProducerInfoMarshaller.java | 0 .../openwire/v4/RemoveInfoMarshaller.java | 0 .../v4/RemoveSubscriptionInfoMarshaller.java | 0 .../openwire/v4/ReplayCommandMarshaller.java | 0 .../openwire/v4/ResponseMarshaller.java | 0 .../openwire/v4/SessionIdMarshaller.java | 0 .../openwire/v4/SessionInfoMarshaller.java | 0 .../openwire/v4/ShutdownInfoMarshaller.java | 0 .../v4/SubscriptionInfoMarshaller.java | 0 .../openwire/v4/TransactionIdMarshaller.java | 0 .../v4/TransactionInfoMarshaller.java | 0 .../openwire/v4/WireFormatInfoMarshaller.java | 0 .../v4/XATransactionIdMarshaller.java | 0 .../v5/ActiveMQBlobMessageMarshaller.java | 0 .../v5/ActiveMQBytesMessageMarshaller.java | 0 .../v5/ActiveMQDestinationMarshaller.java | 0 .../v5/ActiveMQMapMessageMarshaller.java | 0 .../v5/ActiveMQMessageMarshaller.java | 0 .../v5/ActiveMQObjectMessageMarshaller.java | 0 .../openwire/v5/ActiveMQQueueMarshaller.java | 0 .../v5/ActiveMQStreamMessageMarshaller.java | 0 .../v5/ActiveMQTempDestinationMarshaller.java | 0 .../v5/ActiveMQTempQueueMarshaller.java | 0 .../v5/ActiveMQTempTopicMarshaller.java | 0 .../v5/ActiveMQTextMessageMarshaller.java | 0 .../openwire/v5/ActiveMQTopicMarshaller.java | 0 .../openwire/v5/BaseCommandMarshaller.java | 0 .../openwire/v5/BaseDataStreamMarshaller.java | 0 .../openwire/v5/BrokerIdMarshaller.java | 0 .../openwire/v5/BrokerInfoMarshaller.java | 0 .../v5/ConnectionControlMarshaller.java | 0 .../v5/ConnectionErrorMarshaller.java | 0 .../openwire/v5/ConnectionIdMarshaller.java | 0 .../openwire/v5/ConnectionInfoMarshaller.java | 0 .../v5/ConsumerControlMarshaller.java | 0 .../openwire/v5/ConsumerIdMarshaller.java | 0 .../openwire/v5/ConsumerInfoMarshaller.java | 0 .../openwire/v5/ControlCommandMarshaller.java | 0 .../v5/DataArrayResponseMarshaller.java | 0 .../openwire/v5/DataResponseMarshaller.java | 0 .../v5/DestinationInfoMarshaller.java | 0 .../openwire/v5/DiscoveryEventMarshaller.java | 0 .../v5/ExceptionResponseMarshaller.java | 0 .../openwire/v5/FlushCommandMarshaller.java | 0 .../v5/IntegerResponseMarshaller.java | 0 .../v5/JournalQueueAckMarshaller.java | 0 .../v5/JournalTopicAckMarshaller.java | 0 .../openwire/v5/JournalTraceMarshaller.java | 0 .../v5/JournalTransactionMarshaller.java | 0 .../openwire/v5/KeepAliveInfoMarshaller.java | 0 .../v5/LastPartialCommandMarshaller.java | 0 .../v5/LocalTransactionIdMarshaller.java | 0 .../openwire/v5/MarshallerFactory.java | 0 .../openwire/v5/MessageAckMarshaller.java | 0 .../v5/MessageDispatchMarshaller.java | 0 ...MessageDispatchNotificationMarshaller.java | 0 .../openwire/v5/MessageIdMarshaller.java | 0 .../openwire/v5/MessageMarshaller.java | 0 .../openwire/v5/MessagePullMarshaller.java | 0 .../v5/NetworkBridgeFilterMarshaller.java | 0 .../openwire/v5/PartialCommandMarshaller.java | 0 .../openwire/v5/ProducerAckMarshaller.java | 0 .../openwire/v5/ProducerIdMarshaller.java | 0 .../openwire/v5/ProducerInfoMarshaller.java | 0 .../openwire/v5/RemoveInfoMarshaller.java | 0 .../v5/RemoveSubscriptionInfoMarshaller.java | 0 .../openwire/v5/ReplayCommandMarshaller.java | 0 .../openwire/v5/ResponseMarshaller.java | 0 .../openwire/v5/SessionIdMarshaller.java | 0 .../openwire/v5/SessionInfoMarshaller.java | 0 .../openwire/v5/ShutdownInfoMarshaller.java | 0 .../v5/SubscriptionInfoMarshaller.java | 0 .../openwire/v5/TransactionIdMarshaller.java | 0 .../v5/TransactionInfoMarshaller.java | 0 .../openwire/v5/WireFormatInfoMarshaller.java | 0 .../v5/XATransactionIdMarshaller.java | 0 .../v6/ActiveMQBlobMessageMarshaller.java | 0 .../v6/ActiveMQBytesMessageMarshaller.java | 0 .../v6/ActiveMQDestinationMarshaller.java | 0 .../v6/ActiveMQMapMessageMarshaller.java | 0 .../v6/ActiveMQMessageMarshaller.java | 0 .../v6/ActiveMQObjectMessageMarshaller.java | 0 .../openwire/v6/ActiveMQQueueMarshaller.java | 0 .../v6/ActiveMQStreamMessageMarshaller.java | 0 .../v6/ActiveMQTempDestinationMarshaller.java | 0 .../v6/ActiveMQTempQueueMarshaller.java | 0 .../v6/ActiveMQTempTopicMarshaller.java | 0 .../v6/ActiveMQTextMessageMarshaller.java | 0 .../openwire/v6/ActiveMQTopicMarshaller.java | 0 .../openwire/v6/BaseCommandMarshaller.java | 0 .../openwire/v6/BaseDataStreamMarshaller.java | 0 .../openwire/v6/BrokerIdMarshaller.java | 0 .../openwire/v6/BrokerInfoMarshaller.java | 0 .../v6/ConnectionControlMarshaller.java | 0 .../v6/ConnectionErrorMarshaller.java | 0 .../openwire/v6/ConnectionIdMarshaller.java | 0 .../openwire/v6/ConnectionInfoMarshaller.java | 0 .../v6/ConsumerControlMarshaller.java | 0 .../openwire/v6/ConsumerIdMarshaller.java | 0 .../openwire/v6/ConsumerInfoMarshaller.java | 0 .../openwire/v6/ControlCommandMarshaller.java | 0 .../v6/DataArrayResponseMarshaller.java | 0 .../openwire/v6/DataResponseMarshaller.java | 0 .../v6/DestinationInfoMarshaller.java | 0 .../openwire/v6/DiscoveryEventMarshaller.java | 0 .../v6/ExceptionResponseMarshaller.java | 0 .../openwire/v6/FlushCommandMarshaller.java | 0 .../v6/IntegerResponseMarshaller.java | 0 .../v6/JournalQueueAckMarshaller.java | 0 .../v6/JournalTopicAckMarshaller.java | 0 .../openwire/v6/JournalTraceMarshaller.java | 0 .../v6/JournalTransactionMarshaller.java | 0 .../openwire/v6/KeepAliveInfoMarshaller.java | 0 .../v6/LastPartialCommandMarshaller.java | 0 .../v6/LocalTransactionIdMarshaller.java | 0 .../openwire/v6/MarshallerFactory.java | 0 .../openwire/v6/MessageAckMarshaller.java | 0 .../v6/MessageDispatchMarshaller.java | 0 ...MessageDispatchNotificationMarshaller.java | 0 .../openwire/v6/MessageIdMarshaller.java | 0 .../openwire/v6/MessageMarshaller.java | 0 .../openwire/v6/MessagePullMarshaller.java | 0 .../v6/NetworkBridgeFilterMarshaller.java | 0 .../openwire/v6/PartialCommandMarshaller.java | 0 .../openwire/v6/ProducerAckMarshaller.java | 0 .../openwire/v6/ProducerIdMarshaller.java | 0 .../openwire/v6/ProducerInfoMarshaller.java | 0 .../openwire/v6/RemoveInfoMarshaller.java | 0 .../v6/RemoveSubscriptionInfoMarshaller.java | 0 .../openwire/v6/ReplayCommandMarshaller.java | 0 .../openwire/v6/ResponseMarshaller.java | 0 .../openwire/v6/SessionIdMarshaller.java | 0 .../openwire/v6/SessionInfoMarshaller.java | 0 .../openwire/v6/ShutdownInfoMarshaller.java | 0 .../v6/SubscriptionInfoMarshaller.java | 0 .../openwire/v6/TransactionIdMarshaller.java | 0 .../v6/TransactionInfoMarshaller.java | 0 .../openwire/v6/WireFormatInfoMarshaller.java | 0 .../v6/XATransactionIdMarshaller.java | 0 .../v7/ActiveMQBlobMessageMarshaller.java | 0 .../v7/ActiveMQBytesMessageMarshaller.java | 0 .../v7/ActiveMQDestinationMarshaller.java | 0 .../v7/ActiveMQMapMessageMarshaller.java | 0 .../v7/ActiveMQMessageMarshaller.java | 0 .../v7/ActiveMQObjectMessageMarshaller.java | 0 .../openwire/v7/ActiveMQQueueMarshaller.java | 0 .../v7/ActiveMQStreamMessageMarshaller.java | 0 .../v7/ActiveMQTempDestinationMarshaller.java | 0 .../v7/ActiveMQTempQueueMarshaller.java | 0 .../v7/ActiveMQTempTopicMarshaller.java | 0 .../v7/ActiveMQTextMessageMarshaller.java | 0 .../openwire/v7/ActiveMQTopicMarshaller.java | 0 .../openwire/v7/BaseCommandMarshaller.java | 0 .../openwire/v7/BaseDataStreamMarshaller.java | 0 .../openwire/v7/BrokerIdMarshaller.java | 0 .../openwire/v7/BrokerInfoMarshaller.java | 0 .../v7/ConnectionControlMarshaller.java | 0 .../v7/ConnectionErrorMarshaller.java | 0 .../openwire/v7/ConnectionIdMarshaller.java | 0 .../openwire/v7/ConnectionInfoMarshaller.java | 0 .../v7/ConsumerControlMarshaller.java | 0 .../openwire/v7/ConsumerIdMarshaller.java | 0 .../openwire/v7/ConsumerInfoMarshaller.java | 0 .../openwire/v7/ControlCommandMarshaller.java | 0 .../v7/DataArrayResponseMarshaller.java | 0 .../openwire/v7/DataResponseMarshaller.java | 0 .../v7/DestinationInfoMarshaller.java | 0 .../openwire/v7/DiscoveryEventMarshaller.java | 0 .../v7/ExceptionResponseMarshaller.java | 0 .../openwire/v7/FlushCommandMarshaller.java | 0 .../v7/IntegerResponseMarshaller.java | 0 .../v7/JournalQueueAckMarshaller.java | 0 .../v7/JournalTopicAckMarshaller.java | 0 .../openwire/v7/JournalTraceMarshaller.java | 0 .../v7/JournalTransactionMarshaller.java | 0 .../openwire/v7/KeepAliveInfoMarshaller.java | 0 .../v7/LastPartialCommandMarshaller.java | 0 .../v7/LocalTransactionIdMarshaller.java | 0 .../openwire/v7/MarshallerFactory.java | 0 .../openwire/v7/MessageAckMarshaller.java | 0 .../v7/MessageDispatchMarshaller.java | 0 ...MessageDispatchNotificationMarshaller.java | 0 .../openwire/v7/MessageIdMarshaller.java | 0 .../openwire/v7/MessageMarshaller.java | 0 .../openwire/v7/MessagePullMarshaller.java | 0 .../v7/NetworkBridgeFilterMarshaller.java | 0 .../openwire/v7/PartialCommandMarshaller.java | 0 .../openwire/v7/ProducerAckMarshaller.java | 0 .../openwire/v7/ProducerIdMarshaller.java | 0 .../openwire/v7/ProducerInfoMarshaller.java | 0 .../openwire/v7/RemoveInfoMarshaller.java | 0 .../v7/RemoveSubscriptionInfoMarshaller.java | 0 .../openwire/v7/ReplayCommandMarshaller.java | 0 .../openwire/v7/ResponseMarshaller.java | 0 .../openwire/v7/SessionIdMarshaller.java | 0 .../openwire/v7/SessionInfoMarshaller.java | 0 .../openwire/v7/ShutdownInfoMarshaller.java | 0 .../v7/SubscriptionInfoMarshaller.java | 0 .../openwire/v7/TransactionIdMarshaller.java | 0 .../v7/TransactionInfoMarshaller.java | 0 .../openwire/v7/WireFormatInfoMarshaller.java | 0 .../v7/XATransactionIdMarshaller.java | 0 .../v8/ActiveMQBlobMessageMarshaller.java | 0 .../v8/ActiveMQBytesMessageMarshaller.java | 0 .../v8/ActiveMQDestinationMarshaller.java | 0 .../v8/ActiveMQMapMessageMarshaller.java | 0 .../v8/ActiveMQMessageMarshaller.java | 0 .../v8/ActiveMQObjectMessageMarshaller.java | 0 .../openwire/v8/ActiveMQQueueMarshaller.java | 0 .../v8/ActiveMQStreamMessageMarshaller.java | 0 .../v8/ActiveMQTempDestinationMarshaller.java | 0 .../v8/ActiveMQTempQueueMarshaller.java | 0 .../v8/ActiveMQTempTopicMarshaller.java | 0 .../v8/ActiveMQTextMessageMarshaller.java | 0 .../openwire/v8/ActiveMQTopicMarshaller.java | 0 .../openwire/v8/BaseCommandMarshaller.java | 0 .../openwire/v8/BaseDataStreamMarshaller.java | 0 .../openwire/v8/BrokerIdMarshaller.java | 0 .../openwire/v8/BrokerInfoMarshaller.java | 0 .../v8/ConnectionControlMarshaller.java | 0 .../v8/ConnectionErrorMarshaller.java | 0 .../openwire/v8/ConnectionIdMarshaller.java | 0 .../openwire/v8/ConnectionInfoMarshaller.java | 0 .../v8/ConsumerControlMarshaller.java | 0 .../openwire/v8/ConsumerIdMarshaller.java | 0 .../openwire/v8/ConsumerInfoMarshaller.java | 0 .../openwire/v8/ControlCommandMarshaller.java | 0 .../v8/DataArrayResponseMarshaller.java | 0 .../openwire/v8/DataResponseMarshaller.java | 0 .../v8/DestinationInfoMarshaller.java | 0 .../openwire/v8/DiscoveryEventMarshaller.java | 0 .../v8/ExceptionResponseMarshaller.java | 0 .../openwire/v8/FlushCommandMarshaller.java | 0 .../v8/IntegerResponseMarshaller.java | 0 .../v8/JournalQueueAckMarshaller.java | 0 .../v8/JournalTopicAckMarshaller.java | 0 .../openwire/v8/JournalTraceMarshaller.java | 0 .../v8/JournalTransactionMarshaller.java | 0 .../openwire/v8/KeepAliveInfoMarshaller.java | 0 .../v8/LastPartialCommandMarshaller.java | 0 .../v8/LocalTransactionIdMarshaller.java | 0 .../openwire/v8/MarshallerFactory.java | 0 .../openwire/v8/MessageAckMarshaller.java | 0 .../v8/MessageDispatchMarshaller.java | 0 ...MessageDispatchNotificationMarshaller.java | 0 .../openwire/v8/MessageIdMarshaller.java | 0 .../openwire/v8/MessageMarshaller.java | 0 .../openwire/v8/MessagePullMarshaller.java | 0 .../v8/NetworkBridgeFilterMarshaller.java | 0 .../openwire/v8/PartialCommandMarshaller.java | 0 .../openwire/v8/ProducerAckMarshaller.java | 0 .../openwire/v8/ProducerIdMarshaller.java | 0 .../openwire/v8/ProducerInfoMarshaller.java | 0 .../openwire/v8/RemoveInfoMarshaller.java | 0 .../v8/RemoveSubscriptionInfoMarshaller.java | 0 .../openwire/v8/ReplayCommandMarshaller.java | 0 .../openwire/v8/ResponseMarshaller.java | 0 .../openwire/v8/SessionIdMarshaller.java | 0 .../openwire/v8/SessionInfoMarshaller.java | 0 .../openwire/v8/ShutdownInfoMarshaller.java | 0 .../v8/SubscriptionInfoMarshaller.java | 0 .../openwire/v8/TransactionIdMarshaller.java | 0 .../v8/TransactionInfoMarshaller.java | 0 .../openwire/v8/WireFormatInfoMarshaller.java | 0 .../v8/XATransactionIdMarshaller.java | 0 .../v9/ActiveMQBlobMessageMarshaller.java | 0 .../v9/ActiveMQBytesMessageMarshaller.java | 0 .../v9/ActiveMQDestinationMarshaller.java | 0 .../v9/ActiveMQMapMessageMarshaller.java | 0 .../v9/ActiveMQMessageMarshaller.java | 0 .../v9/ActiveMQObjectMessageMarshaller.java | 0 .../openwire/v9/ActiveMQQueueMarshaller.java | 0 .../v9/ActiveMQStreamMessageMarshaller.java | 0 .../v9/ActiveMQTempDestinationMarshaller.java | 0 .../v9/ActiveMQTempQueueMarshaller.java | 0 .../v9/ActiveMQTempTopicMarshaller.java | 0 .../v9/ActiveMQTextMessageMarshaller.java | 0 .../openwire/v9/ActiveMQTopicMarshaller.java | 0 .../openwire/v9/BaseCommandMarshaller.java | 0 .../openwire/v9/BaseDataStreamMarshaller.java | 0 .../openwire/v9/BrokerIdMarshaller.java | 0 .../openwire/v9/BrokerInfoMarshaller.java | 0 .../v9/ConnectionControlMarshaller.java | 0 .../v9/ConnectionErrorMarshaller.java | 0 .../openwire/v9/ConnectionIdMarshaller.java | 0 .../openwire/v9/ConnectionInfoMarshaller.java | 0 .../v9/ConsumerControlMarshaller.java | 0 .../openwire/v9/ConsumerIdMarshaller.java | 0 .../openwire/v9/ConsumerInfoMarshaller.java | 0 .../openwire/v9/ControlCommandMarshaller.java | 0 .../v9/DataArrayResponseMarshaller.java | 0 .../openwire/v9/DataResponseMarshaller.java | 0 .../v9/DestinationInfoMarshaller.java | 0 .../openwire/v9/DiscoveryEventMarshaller.java | 0 .../v9/ExceptionResponseMarshaller.java | 0 .../openwire/v9/FlushCommandMarshaller.java | 0 .../v9/IntegerResponseMarshaller.java | 0 .../v9/JournalQueueAckMarshaller.java | 0 .../v9/JournalTopicAckMarshaller.java | 0 .../openwire/v9/JournalTraceMarshaller.java | 0 .../v9/JournalTransactionMarshaller.java | 0 .../openwire/v9/KeepAliveInfoMarshaller.java | 0 .../v9/LastPartialCommandMarshaller.java | 0 .../v9/LocalTransactionIdMarshaller.java | 0 .../openwire/v9/MarshallerFactory.java | 0 .../openwire/v9/MessageAckMarshaller.java | 0 .../v9/MessageDispatchMarshaller.java | 0 ...MessageDispatchNotificationMarshaller.java | 0 .../openwire/v9/MessageIdMarshaller.java | 0 .../openwire/v9/MessageMarshaller.java | 0 .../openwire/v9/MessagePullMarshaller.java | 0 .../v9/NetworkBridgeFilterMarshaller.java | 0 .../openwire/v9/PartialCommandMarshaller.java | 0 .../openwire/v9/ProducerAckMarshaller.java | 0 .../openwire/v9/ProducerIdMarshaller.java | 0 .../openwire/v9/ProducerInfoMarshaller.java | 0 .../openwire/v9/RemoveInfoMarshaller.java | 0 .../v9/RemoveSubscriptionInfoMarshaller.java | 0 .../openwire/v9/ReplayCommandMarshaller.java | 0 .../openwire/v9/ResponseMarshaller.java | 0 .../openwire/v9/SessionIdMarshaller.java | 0 .../openwire/v9/SessionInfoMarshaller.java | 0 .../openwire/v9/ShutdownInfoMarshaller.java | 0 .../v9/SubscriptionInfoMarshaller.java | 0 .../openwire/v9/TransactionIdMarshaller.java | 0 .../v9/TransactionInfoMarshaller.java | 0 .../openwire/v9/WireFormatInfoMarshaller.java | 0 .../v9/XATransactionIdMarshaller.java | 0 .../java/org/apache/activemq/package.html | 0 .../apache/activemq/state/CommandVisitor.java | 0 .../activemq/state/CommandVisitorAdapter.java | 0 .../activemq/state/ConnectionState.java | 0 .../state/ConnectionStateTracker.java | 0 .../apache/activemq/state/ConsumerState.java | 0 .../apache/activemq/state/ProducerState.java | 0 .../activemq/state/ResponseHandler.java | 0 .../apache/activemq/state/SessionState.java | 0 .../org/apache/activemq/state/Tracked.java | 0 .../activemq/state/TransactionState.java | 0 .../activemq/thread/DedicatedTaskRunner.java | 0 .../activemq/thread/DefaultThreadPools.java | 0 .../thread/DeterministicTaskRunner.java | 0 .../activemq/thread/PooledTaskRunner.java | 0 .../org/apache/activemq/thread/Scheduler.java | 0 .../activemq/thread/SchedulerTimerTask.java | 0 .../java/org/apache/activemq/thread/Task.java | 0 .../apache/activemq/thread/TaskRunner.java | 0 .../activemq/thread/TaskRunnerFactory.java | 0 .../activemq/transaction/Synchronization.java | 0 .../transport/AbstractInactivityMonitor.java | 0 .../activemq/transport/CommandJoiner.java | 0 .../transport/CompositeTransport.java | 0 .../transport/DefaultTransportListener.java | 0 .../activemq/transport/FutureResponse.java | 0 .../transport/InactivityIOException.java | 0 .../activemq/transport/InactivityMonitor.java | 0 .../apache/activemq/transport/LogWriter.java | 0 .../transport/MarshallingTransportFilter.java | 0 .../activemq/transport/MutexTransport.java | 0 .../transport/RequestTimedOutIOException.java | 0 .../activemq/transport/ResponseCallback.java | 0 .../transport/ResponseCorrelator.java | 0 .../activemq/transport/ThreadNameFilter.java | 0 .../apache/activemq/transport/Transport.java | 0 .../transport/TransportAcceptListener.java | 0 .../TransportDisposedIOException.java | 0 .../activemq/transport/TransportFactory.java | 34 +- .../activemq/transport/TransportFilter.java | 0 .../activemq/transport/TransportListener.java | 0 .../activemq/transport/TransportServer.java | 0 .../transport/TransportServerFilter.java | 0 .../transport/TransportServerSupport.java | 0 .../TransportServerThreadSupport.java | 0 .../activemq/transport/TransportSupport.java | 0 .../transport/TransportThreadSupport.java | 0 .../transport/WireFormatNegotiator.java | 0 .../transport/WriteTimeoutFilter.java | 0 .../transport/discovery/DiscoveryAgent.java | 0 .../discovery/DiscoveryAgentFactory.java | 0 .../discovery/DiscoveryListener.java | 0 .../discovery/DiscoveryTransport.java | 0 .../discovery/DiscoveryTransportFactory.java | 0 .../MasterSlaveDiscoveryAgent.java | 0 .../MasterSlaveDiscoveryAgentFactory.java | 0 .../discovery/masterslave/package.html | 0 .../multicast/MulticastDiscoveryAgent.java | 0 .../MulticastDiscoveryAgentFactory.java | 0 .../discovery/multicast/package.html | 0 .../activemq/transport/discovery/package.html | 0 .../simple/SimpleDiscoveryAgent.java | 0 .../simple/SimpleDiscoveryAgentFactory.java | 0 .../transport/discovery/simple/package.html | 0 .../discovery/zeroconf/JmDNSFactory.java | 0 .../zeroconf/ZeroconfDiscoveryAgent.java | 0 .../ZeroconfDiscoveryAgentFactory.java | 0 .../transport/discovery/zeroconf/package.html | 0 .../transport/failover/BackupTransport.java | 0 .../transport/failover/FailoverTransport.java | 0 .../failover/FailoverTransportFactory.java | 0 .../activemq/transport/failover/package.html | 0 .../transport/fanout/FanoutTransport.java | 0 .../fanout/FanoutTransportFactory.java | 0 .../activemq/transport/fanout/package.html | 0 .../transport/mock/MockTransport.java | 0 .../transport/mock/MockTransportFactory.java | 0 .../activemq/transport/mock/package.html | 0 .../MulticastDatagramHeaderMarshaller.java | 0 .../multicast/MulticastTransport.java | 0 .../multicast/MulticastTransportFactory.java | 0 .../activemq/transport/multicast/package.html | 0 .../transport/nio/NIOBufferedInputStream.java | 0 .../transport/nio/NIOInputStream.java | 0 .../transport/nio/NIOOutputStream.java | 0 .../transport/nio/NIOSSLTransport.java | 0 .../transport/nio/NIOSSLTransportFactory.java | 0 .../transport/nio/NIOSSLTransportServer.java | 0 .../activemq/transport/nio/NIOTransport.java | 0 .../transport/nio/NIOTransportFactory.java | 0 .../transport/nio/SelectorManager.java | 0 .../transport/nio/SelectorSelection.java | 0 .../transport/nio/SelectorWorker.java | 0 .../apache/activemq/transport/package.html | 0 .../reliable/DefaultReplayBuffer.java | 0 .../reliable/DefaultReplayStrategy.java | 0 .../ExceptionIfDroppedReplayStrategy.java | 0 .../transport/reliable/ReliableTransport.java | 0 .../transport/reliable/ReplayBuffer.java | 0 .../reliable/ReplayBufferListener.java | 0 .../transport/reliable/ReplayStrategy.java | 0 .../activemq/transport/reliable/Replayer.java | 0 .../activemq/transport/reliable/package.html | 0 .../ExceededMaximumConnectionsException.java | 0 .../transport/tcp/QualityOfServiceUtils.java | 0 .../transport/tcp/ResponseHolder.java | 0 .../activemq/transport/tcp/SslTransport.java | 0 .../transport/tcp/SslTransportFactory.java | 0 .../transport/tcp/SslTransportServer.java | 0 .../transport/tcp/TcpBufferedInputStream.java | 0 .../tcp/TcpBufferedOutputStream.java | 0 .../activemq/transport/tcp/TcpTransport.java | 36 +- .../transport/tcp/TcpTransportFactory.java | 12 +- .../transport/tcp/TcpTransportServer.java | 4 +- .../transport/tcp/TimeStampStream.java | 0 .../activemq/transport/tcp/package.html | 0 .../transport/udp/ByteBufferPool.java | 0 .../transport/udp/CommandChannel.java | 0 .../transport/udp/CommandChannelSupport.java | 0 .../transport/udp/CommandDatagramChannel.java | 0 .../transport/udp/CommandDatagramSocket.java | 0 .../transport/udp/DatagramEndpoint.java | 0 .../udp/DatagramHeaderMarshaller.java | 0 .../transport/udp/DefaultBufferPool.java | 0 .../udp/ResponseRedirectInterceptor.java | 0 .../transport/udp/SimpleBufferPool.java | 0 .../activemq/transport/udp/UdpTransport.java | 0 .../transport/udp/UdpTransportFactory.java | 40 +- .../transport/udp/UdpTransportServer.java | 0 .../activemq/transport/udp/package.html | 0 .../activemq/usage/DefaultUsageCapacity.java | 0 .../apache/activemq/usage/MemoryUsage.java | 0 .../java/org/apache/activemq/usage/Usage.java | 0 .../apache/activemq/usage/UsageCapacity.java | 0 .../apache/activemq/usage/UsageListener.java | 0 .../org/apache/activemq/util/BitArray.java | 0 .../org/apache/activemq/util/BitArrayBin.java | 0 .../activemq/util/ByteArrayInputStream.java | 0 .../activemq/util/ByteArrayOutputStream.java | 0 .../apache/activemq/util/ByteSequence.java | 0 .../activemq/util/ByteSequenceData.java | 0 .../org/apache/activemq/util/Callback.java | 0 .../ClassLoadingAwareObjectInputStream.java | 0 .../util/DataByteArrayInputStream.java | 0 .../util/DataByteArrayOutputStream.java | 0 .../apache/activemq/util/FactoryFinder.java | 0 .../activemq/util/IOExceptionSupport.java | 0 .../org/apache/activemq/util/IdGenerator.java | 0 .../apache/activemq/util/IndentPrinter.java | 0 .../apache/activemq/util/InetAddressUtil.java | 0 .../activemq/util/IntSequenceGenerator.java | 0 .../activemq/util/IntrospectionSupport.java | 0 .../activemq/util/JMSExceptionSupport.java | 0 .../org/apache/activemq/util/LRUCache.java | 0 .../activemq/util/LongSequenceGenerator.java | 0 .../org/apache/activemq/util/MapHelper.java | 0 .../activemq/util/MarshallingSupport.java | 0 .../apache/activemq/util/ServiceListener.java | 0 .../apache/activemq/util/ServiceStopper.java | 0 .../apache/activemq/util/ServiceSupport.java | 0 .../org/apache/activemq/util/StopWatch.java | 0 .../activemq/util/StringArrayConverter.java | 0 ...gToListOfActiveMQDestinationConverter.java | 0 .../apache/activemq/util/ThreadPoolUtils.java | 0 .../org/apache/activemq/util/TimeUtils.java | 0 .../activemq/util/TypeConversionSupport.java | 0 .../org/apache/activemq/util/URISupport.java | 0 .../wireformat/ObjectStreamWireFormat.java | 0 .../activemq/wireformat/WireFormat.java | 0 .../wireformat/WireFormatFactory.java | 0 .../apache/activemq/wireformat/package.html | 0 .../org/apache/activemq/transport/discovery | 0 .../transport/discoveryagent/masterslave | 0 .../transport/discoveryagent/multicast | 0 .../activemq/transport/discoveryagent/simple | 0 .../activemq/transport/discoveryagent/static | 0 .../transport/discoveryagent/zeroconf | 0 .../org/apache/activemq/transport/failover | 0 .../org/apache/activemq/transport/fanout | 0 .../org/apache/activemq/transport/mock | 0 .../org/apache/activemq/transport/multicast | 0 .../org/apache/activemq/transport/nio | 0 .../org/apache/activemq/transport/nio+ssl | 0 .../org/apache/activemq/transport/ssl | 0 .../org/apache/activemq/transport/tcp | 0 .../org/apache/activemq/transport/udp | 0 .../org/apache/activemq/wireformat/default | 0 .../broker/scheduler/CronParserTest.java | 0 .../apache/activemq/util/BitArrayBinTest.java | 0 .../util/DataByteArrayInputStreamTest.java | 0 .../util/DataByteArrayOutputStreamTest.java | 0 .../apache/activemq/util/LRUCacheTest.java | 0 .../util/StringArrayConverterTest.java | 0 .../command/store/amq/reader/AMQIterator.java | 1 - activemq-core/pom.xml | 55 +- .../activemq/broker/AbstractLocker.java | 1 - .../apache/activemq/broker/BrokerService.java | 4 +- .../activemq/broker/SslBrokerService.java | 3 +- .../activemq/broker/TransportConnector.java | 7 +- .../broker/region/AbstractSubscription.java | 3 +- .../activemq/broker/region/Destination.java | 2 +- .../region/DurableTopicSubscription.java | 6 +- .../region/IndirectMessageReference.java | 2 +- .../broker/region/PrefetchSubscription.java | 42 +- .../broker/region/QueueDispatchSelector.java | 9 - .../broker/region/QueueSubscription.java | 2 +- .../activemq/broker/region/RegionBroker.java | 6 +- .../broker/region/TopicSubscription.java | 18 +- .../cursors/FilePendingMessageCursor.java | 6 +- .../cursors/StoreDurableSubscriberCursor.java | 4 +- .../policy/AbstractDeadLetterStrategy.java | 3 - .../region/policy/DeadLetterStrategy.java | 1 - .../policy/IndividualDeadLetterStrategy.java | 12 +- ...UniquePropertyMessageEvictionStrategy.java | 1 - .../activemq/broker/util/CommandAgent.java | 1 - .../broker/util/RedeliveryPlugin.java | 10 +- .../broker/util/TimeStampingBrokerPlugin.java | 8 +- .../impl/async/ReadOnlyAsyncDataManager.java | 2 - ...ConditionalNetworkBridgeFilterFactory.java | 4 +- .../store/amq/AMQPersistenceAdapter.java | 1 - .../store/journal/JournalMessageStore.java | 1 - .../store/kahadaptor/KahaMessageStore.java | 3 - .../store/kahadb/scheduler/JobImpl.java | 4 - .../store/memory/MemoryMessageStore.java | 3 - .../transport/TransportFactorySupport.java | 30 ++ .../transport/TransportLoggerFactorySPI.java | 20 + .../transport/TransportLoggerView.java | 2 +- .../activemq/RemoveDestinationTest.java | 1 - .../advisory/ConsumerListenerTest.java | 1 - .../java/org/apache/activemq/broker/Main.java | 1 - .../broker/advisory/AdvisoryBrokerTest.java | 4 - .../broker/advisory/AdvisoryJmxTest.java | 2 - .../policy/NoConsumerDeadLetterTest.java | 1 - .../region/QueueDuplicatesFromStoreTest.java | 1 - .../QueueOptimizedDispatchExceptionTest.java | 2 - .../FilePendingMessageCursorTestSupport.java | 9 - .../region/cursors/NegativeQueueTest.java | 2 - .../org/apache/activemq/bugs/AMQ2149Test.java | 2 - .../org/apache/activemq/bugs/AMQ3014Test.java | 7 +- .../org/apache/activemq/bugs/AMQ3903Test.java | 3 - .../activemq/command/MessageSendTest.java | 1 - .../kaha/impl/async/JournalImplTest.java | 1 - .../DataFileGeneratorTestSupport.java | 1 - .../openwire/v1/MessageTestSupport.java | 1 - .../openwire/v4/MessageTestSupport.java | 5 - .../openwire/v5/MessageTestSupport.java | 5 - .../openwire/v6/MessageTestSupport.java | 5 - .../openwire/v7/MessageTestSupport.java | 2 +- .../openwire/v8/MessageTestSupport.java | 2 +- .../openwire/v9/MessageTestSupport.java | 2 +- .../security/LDAPAuthorizationMapTest.java | 3 - .../store/jdbc/JDBCCommitExceptionTest.java | 5 - .../DiscoveryNetworkReconnectTest.java | 1 - .../transport/tcp/TcpFaultyTransport.java | 8 - .../tcp/TcpFaultyTransportFactory.java | 11 - .../tcp/TcpFaultyTransportServer.java | 8 - .../transport/tcp/TcpTransportServerTest.java | 1 - .../store/kahadb/KahaDBVersion1/db-1.log | Bin 729155 -> 751723 bytes .../store/kahadb/KahaDBVersion2/db-1.log | Bin 719149 -> 754644 bytes .../store/kahadb/KahaDBVersion3/db-1.log | Bin 719147 -> 744361 bytes .../java/org/apache/activemq/ra/MDBTest.java | 2 - .../transport/xmpp/XmppTransport.java | 2 - .../transport/xmpp/XmppWireFormat.java | 2 - .../config/BrokerXmlConfigStartTest.java | 3 - pom.xml | 6 + 1057 files changed, 770 insertions(+), 355 deletions(-) create mode 100755 activemq-client/pom.xml rename {activemq-core => activemq-client}/src/main/grammar/SelectorParser.jj (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQConnection.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java (99%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQDispatcher.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQInputStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQMessageAudit.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQMessageAuditNoSync.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQOutputStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQQueueSender.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQQueueSession.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQSession.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQTopicSession.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQXAConnection.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ActiveMQXASession.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/AdvisoryConsumer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/AlreadyClosedException.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/AsyncCallback.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/BlobMessage.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ClientInternalExceptionListener.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/Closeable.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ConfigurationException.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ConnectionAudit.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ConnectionClosedException.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ConnectionFailedException.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/CustomDestination.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/Disposable.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/EnhancedConnection.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/FifoMessageDispatchChannel.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/LocalTransactionEventListener.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/Message.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/MessageAvailableConsumer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/MessageAvailableListener.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/MessageDispatchChannel.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/MessageTransformer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/MessageTransformerSupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/NotStartedException.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/RedeliveryPolicy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ScheduledMessage.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/Service.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/SimplePriorityMessageDispatchChannel.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/StreamConnection.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/ThreadPriorities.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/TransactionContext.java (100%) create mode 100644 activemq-client/src/main/java/org/apache/activemq/TransportLoggerSupport.java rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/ConsumerListener.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/DestinationEvent.java (96%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/DestinationListener.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/DestinationSource.java (99%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/ProducerEvent.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/ProducerListener.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/ProducerStartedEvent.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/ProducerStoppedEvent.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/advisory/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/blob/BlobDownloadStrategy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/blob/BlobDownloader.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/blob/BlobTransferPolicy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/blob/BlobUploadStrategy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/blob/BlobUploader.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/blob/DefaultBlobDownloadStrategy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/blob/DefaultBlobUploadStrategy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/blob/DefaultStrategy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/blob/FTPBlobDownloadStrategy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/blob/FTPBlobUploadStrategy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/blob/FTPStrategy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/blob/FileSystemBlobStrategy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/blob/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/broker/SslContext.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/broker/region/MessageReference.java (97%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/broker/region/policy/RedeliveryPolicyMap.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ActiveMQBlobMessage.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ActiveMQDestination.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ActiveMQMessage.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ActiveMQQueue.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ActiveMQTopic.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/BaseCommand.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/BaseEndpoint.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/BrokerId.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/BrokerInfo.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/Command.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/CommandTypes.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ConnectionControl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ConnectionError.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ConnectionId.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ConnectionInfo.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ConsumerControl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ConsumerId.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ConsumerInfo.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ControlCommand.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/DataArrayResponse.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/DataResponse.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/DataStructure.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/DestinationInfo.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/DiscoveryEvent.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/Endpoint.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ExceptionResponse.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/FlushCommand.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/IntegerResponse.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/JournalQueueAck.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/JournalTopicAck.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/JournalTrace.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/JournalTransaction.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/KeepAliveInfo.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/LastPartialCommand.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/LocalTransactionId.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/MarshallAware.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/Message.java (97%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/MessageAck.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/MessageDispatch.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/MessageDispatchNotification.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/MessageId.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/MessagePull.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/PartialCommand.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ProducerAck.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ProducerId.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ProducerInfo.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/RemoveInfo.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ReplayCommand.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/Response.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/SessionId.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/SessionInfo.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/ShutdownInfo.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/SubscriptionInfo.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/TransactionId.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/TransactionInfo.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/WireFormatInfo.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/XATransactionId.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/command/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/AnyDestination.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/BinaryExpression.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/BooleanExpression.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/ComparisonExpression.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/CompositeDestinationFilter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/ConstantExpression.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/DefaultDestinationMapEntry.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/DestinationFilter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/DestinationMap.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/DestinationMapEntry.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/DestinationMapNode.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/DestinationNode.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/DestinationPath.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/Expression.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/LogicExpression.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/MessageEvaluationContext.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/NoLocalExpression.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/NonCachedMessageEvaluationContext.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/PrefixDestinationFilter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/PropertyExpression.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/UnaryExpression.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/WildcardDestinationFilter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/XPathExpression.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/XQueryExpression.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java (99%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/filter/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/jndi/JNDIBaseStorable.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/jndi/JNDIStorableInterface.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/jndi/NameParserImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/jndi/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/BoundaryStatisticImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/BoundedRangeStatisticImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/CountStatisticImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/JCAConnectionPoolStatsImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/JCAConnectionStatsImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/JCAStatsImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/JMSConnectionStatsImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/JMSSessionStatsImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/JMSStatsImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/PollCountStatisticImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/RangeStatisticImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/Resettable.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/StatisticImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/StatsCapable.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/StatsImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/management/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/BooleanStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/CommandIdComparator.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ConnectionControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ConsumerControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/DataStructureSupportMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/LastPartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/PartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ReplayCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ActiveMQBytesMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ActiveMQDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMapMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ActiveMQObjectMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ActiveMQQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ActiveMQStreamMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTextMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/BaseCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/BrokerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/BrokerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ConnectionControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ConnectionErrorMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ConnectionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ConnectionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ConsumerControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ConsumerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ControlCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/DataArrayResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/DataResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/DestinationInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/DiscoveryEventMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ExceptionResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/FlushCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/IntegerResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/JournalQueueAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/JournalTopicAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/JournalTraceMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/JournalTransactionMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/KeepAliveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/LastPartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/LocalTransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/MessageAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/MessageIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/MessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/MessagePullMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/PartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ProducerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ProducerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/RemoveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMapMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ConnectionControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ConsumerControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/DestinationInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/JournalTopicAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/MarshallerFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/RemoveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBlobMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBytesMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ActiveMQDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMapMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ActiveMQObjectMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ActiveMQQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ActiveMQStreamMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTextMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/BaseCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/BrokerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/BrokerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ConnectionControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ConnectionErrorMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ConnectionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ConnectionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ConsumerControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ConsumerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ConsumerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ControlCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/DataArrayResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/DataResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/DestinationInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/DiscoveryEventMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ExceptionResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/FlushCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/IntegerResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/JournalQueueAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/JournalTopicAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/JournalTraceMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/JournalTransactionMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/KeepAliveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/LastPartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/LocalTransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/MarshallerFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/MessageAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchNotificationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/MessageIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/MessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/MessagePullMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/NetworkBridgeFilterMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/PartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ProducerAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ProducerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ProducerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/RemoveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ReplayCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/SessionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/SessionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/ShutdownInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/TransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/TransactionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/WireFormatInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v4/XATransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBlobMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBytesMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ActiveMQDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMapMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ActiveMQObjectMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ActiveMQQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ActiveMQStreamMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTextMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/BaseCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/BrokerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/BrokerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ConnectionControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ConnectionErrorMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ConnectionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ConnectionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ConsumerControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ConsumerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ConsumerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ControlCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/DataArrayResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/DataResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/DestinationInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/DiscoveryEventMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ExceptionResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/FlushCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/IntegerResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/JournalQueueAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/JournalTopicAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/JournalTraceMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/JournalTransactionMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/KeepAliveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/LastPartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/LocalTransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/MarshallerFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/MessageAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchNotificationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/MessageIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/MessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/MessagePullMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/NetworkBridgeFilterMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/PartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ProducerAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ProducerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ProducerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/RemoveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ReplayCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/SessionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/SessionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/ShutdownInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/TransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/TransactionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/WireFormatInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v5/XATransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBlobMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBytesMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ActiveMQDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMapMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ActiveMQObjectMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ActiveMQQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ActiveMQStreamMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTextMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/BaseCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/BaseDataStreamMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/BrokerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/BrokerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ConnectionControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ConnectionErrorMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ConnectionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ConnectionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ConsumerControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ConsumerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ConsumerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ControlCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/DataArrayResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/DataResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/DestinationInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/DiscoveryEventMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ExceptionResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/FlushCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/IntegerResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/JournalQueueAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/JournalTopicAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/JournalTraceMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/JournalTransactionMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/KeepAliveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/LastPartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/LocalTransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/MarshallerFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/MessageAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchNotificationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/MessageIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/MessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/MessagePullMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/NetworkBridgeFilterMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/PartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ProducerAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ProducerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ProducerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/RemoveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/RemoveSubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ReplayCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/SessionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/SessionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/ShutdownInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/SubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/TransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/TransactionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/WireFormatInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v6/XATransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTextMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/BaseCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/BaseDataStreamMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/BrokerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/BrokerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ConnectionControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ConnectionErrorMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ConnectionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ConnectionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ConsumerControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ConsumerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ConsumerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ControlCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/DataArrayResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/DataResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/DestinationInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/DiscoveryEventMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ExceptionResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/FlushCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/IntegerResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/JournalQueueAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/JournalTopicAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/JournalTraceMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/JournalTransactionMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/KeepAliveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/LastPartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/LocalTransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/MarshallerFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/MessageAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchNotificationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/MessageIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/MessagePullMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/NetworkBridgeFilterMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ProducerAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ProducerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ProducerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/RemoveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/RemoveSubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ReplayCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/SessionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/SessionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/ShutdownInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/SubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/TransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/TransactionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBlobMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBytesMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ActiveMQDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMapMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ActiveMQObjectMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ActiveMQQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ActiveMQStreamMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTextMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/BaseCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/BaseDataStreamMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/BrokerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/BrokerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ConnectionControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ConnectionErrorMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ConnectionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ConnectionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ConsumerControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ConsumerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ConsumerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ControlCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/DataArrayResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/DataResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/DestinationInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/DiscoveryEventMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ExceptionResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/FlushCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/IntegerResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/JournalQueueAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/JournalTopicAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/JournalTraceMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/JournalTransactionMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/KeepAliveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/LastPartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/LocalTransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/MarshallerFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/MessageAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchNotificationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/MessageIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/MessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/MessagePullMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/NetworkBridgeFilterMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/PartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ProducerAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ProducerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ProducerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/RemoveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/RemoveSubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ReplayCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/SessionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/SessionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/ShutdownInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/SubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/TransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/TransactionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/WireFormatInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v8/XATransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBlobMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBytesMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ActiveMQDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMapMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ActiveMQObjectMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ActiveMQQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ActiveMQStreamMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempDestinationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempQueueMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTextMessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTopicMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/BaseCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/BaseDataStreamMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/BrokerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/BrokerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ConnectionControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ConnectionErrorMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ConnectionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ConnectionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ConsumerControlMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ConsumerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ConsumerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ControlCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/DataArrayResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/DataResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/DestinationInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/DiscoveryEventMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ExceptionResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/FlushCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/IntegerResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/JournalQueueAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/JournalTopicAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/JournalTraceMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/JournalTransactionMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/KeepAliveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/LastPartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/LocalTransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/MarshallerFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/MessageAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchNotificationMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/MessageIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/MessageMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/MessagePullMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/NetworkBridgeFilterMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/PartialCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ProducerAckMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ProducerIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ProducerInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/RemoveInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/RemoveSubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ReplayCommandMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ResponseMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/SessionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/SessionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/ShutdownInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/SubscriptionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/TransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/TransactionInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/WireFormatInfoMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/openwire/v9/XATransactionIdMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/state/CommandVisitor.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/state/CommandVisitorAdapter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/state/ConnectionState.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/state/ConsumerState.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/state/ProducerState.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/state/ResponseHandler.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/state/SessionState.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/state/Tracked.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/state/TransactionState.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/thread/DeterministicTaskRunner.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/thread/PooledTaskRunner.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/thread/Scheduler.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/thread/SchedulerTimerTask.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/thread/Task.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/thread/TaskRunner.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transaction/Synchronization.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/CommandJoiner.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/CompositeTransport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/DefaultTransportListener.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/FutureResponse.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/InactivityIOException.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/InactivityMonitor.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/LogWriter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/MutexTransport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/RequestTimedOutIOException.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/ResponseCallback.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/ThreadNameFilter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/Transport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/TransportDisposedIOException.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/TransportFactory.java (92%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/TransportFilter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/TransportListener.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/TransportServer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/TransportServerFilter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/TransportServerSupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/TransportSupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/WriteTimeoutFilter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransportFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgent.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgentFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/masterslave/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/multicast/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/simple/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/failover/BackupTransport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/failover/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/fanout/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/mock/MockTransport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/mock/MockTransportFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/mock/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/multicast/MulticastDatagramHeaderMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/multicast/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/nio/NIOBufferedInputStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/nio/NIOInputStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportServer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/nio/NIOTransportFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayStrategy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/reliable/ExceptionIfDroppedReplayStrategy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/reliable/ReplayBuffer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/reliable/ReplayBufferListener.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/reliable/ReplayStrategy.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/reliable/Replayer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/reliable/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/tcp/QualityOfServiceUtils.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/tcp/SslTransportServer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedInputStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedOutputStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java (98%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java (91%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java (99%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/tcp/TimeStampStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/tcp/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/ByteBufferPool.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/CommandChannel.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/CommandChannelSupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/DatagramEndpoint.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/DatagramHeaderMarshaller.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/DefaultBufferPool.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/ResponseRedirectInterceptor.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/SimpleBufferPool.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java (86%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/transport/udp/package.html (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/usage/DefaultUsageCapacity.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/usage/MemoryUsage.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/usage/Usage.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/usage/UsageCapacity.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/usage/UsageListener.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/BitArray.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/BitArrayBin.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/ByteArrayInputStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/ByteArrayOutputStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/ByteSequence.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/ByteSequenceData.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/Callback.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/DataByteArrayInputStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/DataByteArrayOutputStream.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/FactoryFinder.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/IOExceptionSupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/IdGenerator.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/IndentPrinter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/InetAddressUtil.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/IntSequenceGenerator.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/IntrospectionSupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/LRUCache.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/LongSequenceGenerator.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/MapHelper.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/MarshallingSupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/ServiceListener.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/ServiceStopper.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/ServiceSupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/StopWatch.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/StringArrayConverter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/TimeUtils.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/TypeConversionSupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/util/URISupport.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/wireformat/WireFormat.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java (100%) rename {activemq-core => activemq-client}/src/main/java/org/apache/activemq/wireformat/package.html (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/failover (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/mock (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/nio (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/nio+ssl (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/transport/udp (100%) rename {activemq-core => activemq-client}/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default (100%) rename {activemq-core => activemq-client}/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java (100%) rename {activemq-core => activemq-client}/src/test/java/org/apache/activemq/util/BitArrayBinTest.java (100%) rename {activemq-core => activemq-client}/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java (100%) rename {activemq-core => activemq-client}/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java (100%) rename {activemq-core => activemq-client}/src/test/java/org/apache/activemq/util/LRUCacheTest.java (100%) rename {activemq-core => activemq-client}/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java (100%) create mode 100644 activemq-core/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java create mode 100644 activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java index 97cacb48db..fd8e0964e7 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java @@ -35,7 +35,6 @@ import org.apache.qpid.proton.type.messaging.Released; import org.apache.qpid.proton.type.transaction.*; import org.apache.qpid.proton.type.transport.DeliveryState; import org.apache.qpid.proton.type.transport.SenderSettleMode; -import org.apache.qpid.proton.type.transport.Source; import org.fusesource.hawtbuf.Buffer; import org.fusesource.hawtbuf.ByteArrayOutputStream; import org.slf4j.Logger; diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpTransportFilter.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpTransportFilter.java index 4b34babc74..03d4a0ce7d 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpTransportFilter.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpTransportFilter.java @@ -25,11 +25,9 @@ import org.apache.activemq.transport.amqp.transform.InboundTransformer; import org.apache.activemq.transport.tcp.SslTransport; import org.apache.activemq.util.IOExceptionSupport; import org.apache.activemq.wireformat.WireFormat; -import org.fusesource.hawtbuf.Buffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.jms.JMSException; import java.io.IOException; import java.security.cert.X509Certificate; diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java index a95be4817a..a893555fc3 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java @@ -16,10 +16,8 @@ */ package org.apache.activemq.transport.amqp; -import junit.framework.TestCase; import org.apache.activemq.AutoFailTestSupport; import org.apache.activemq.broker.BrokerService; -import org.apache.activemq.broker.SslContext; import org.apache.activemq.broker.TransportConnector; import org.apache.activemq.spring.SpringSslContext; import org.junit.After; diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalEndpoint.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalEndpoint.java index 2e92f476bb..83c598f1fe 100644 --- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalEndpoint.java +++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalEndpoint.java @@ -27,14 +27,11 @@ import org.apache.activemq.util.ByteSequence; import org.apache.camel.CamelExchangeException; import org.apache.camel.Consumer; import org.apache.camel.Exchange; -import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.ExchangePattern; import org.apache.camel.impl.DefaultConsumer; import org.apache.camel.impl.DefaultEndpoint; -import org.apache.camel.impl.DefaultExchange; import org.apache.camel.impl.DefaultProducer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml new file mode 100755 index 0000000000..067cafd9a2 --- /dev/null +++ b/activemq-client/pom.xml @@ -0,0 +1,501 @@ + + + + + 4.0.0 + + + org.apache.activemq + activemq-parent + 5.8-SNAPSHOT + + + activemq-client + jar + ActiveMQ :: Client + The ActiveMQ Client implementation + + + -Xmx512M + + + + + + + + org.slf4j + slf4j-api + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + + + ${project.groupId} + activeio-core + true + + + org.apache.activemq.protobuf + activemq-protobuf + false + + + org.fusesource.mqtt-client + mqtt-client + + + + + + + + org.osgi + org.osgi.core + provided + true + + + org.apache.activemq + activemq-jaas + true + + + org.apache.geronimo.specs + geronimo-jta_1.0.1B_spec + true + + + org.apache.geronimo.specs + geronimo-j2ee-management_1.1_spec + + + org.apache.geronimo.specs + geronimo-annotation_1.0_spec + true + + + org.apache.geronimo.specs + geronimo-jacc_1.1_spec + true + + + com.thoughtworks.xstream + xstream + true + + + org.codehaus.jettison + jettison + true + + + + + org.apache.xbean + xbean-spring + true + + + org.springframework + spring-context + + + org.apache.derby + derby + true + + + xalan + xalan + true + + + commons-net + commons-net + + + + + org.apache.activemq + activemq-openwire-generator + true + + + + + + + junit + junit + test + + + org.hamcrest + hamcrest-all + test + + + org.slf4j + slf4j-log4j12 + test + + + log4j + log4j + test + + + org.springframework + spring-jms + test + + + org.springframework + spring-test + test + + + commons-io + commons-io + test + + + javax.jmdns + jmdns + true + + + org.jasypt + jasypt + + + org.jasypt + jasypt-spring3 + ${jasypt-version} + true + + + org.mortbay.jetty + jetty-util + 6.1.26 + test + + + + + commons-collections + commons-collections + test + + + commons-primitives + commons-primitives + test + + + axion + axion + test + + + regexp + regexp + test + + + + + org.fusesource.joram-jms-tests + joram-jms-tests + 1.0 + test + + + + org.eclipse.jetty.aggregate + jetty-all-server + test + + + + + org.apache.directory.server + apacheds-core-integ + ${directory-version} + test + + + org.apache.directory.server + apacheds-server-integ + ${directory-version} + test + + + org.jmock + jmock-junit4 + test + + + org.jmock + jmock-legacy + test + + + org.apache.ftpserver + ftpserver-core + ${ftpserver-version} + test + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + ${javase-javadoc-url} + ${javaee-javadoc-url} + ${slf4j-javadoc-url} + http://junit.sourceforge.net/javadoc/ + + ${basedir}/../etc/css/stylesheet.css + true + 256m + ${source-version} + + + JMS Client + org.apache.activemq:org.apache.activemq.command + + + JMS Client support classes for working with BLOBs and JNDI + org.apache.activemq.blob:org.apache.activemq.jndi + + + Enterprise Integration Pattern support via Camel + org.apache.activemq.camel:org.apache.activemq.camel.* + + + Spring support + org.apache.activemq.spring:org.apache.activemq.xbean:org.apache.activemq.pool + + + JMS Client Implementation classes + org.apache.activemq.filter:org.apache.activemq.management:org.apache.activemq.selector:org.apache.activemq.thread + + + Broker implementation + org.apache.activemq.advisory:org.apache.activemq.broker:org.apache.activemq.broker.*:org.apache.activemq.state:org.apache.activemq.security:org.apache.activemq.transaction + + + Broker Persistent Store + org.apache.activemq.store:org.apache.activemq.store.* + + + Kaha fast file based storage + org.apache.activemq.kaha:org.apache.activemq.kaha.* + + + Transports + org.apache.activemq.transport:org.apache.activemq.transport.* + + + Memory handling + org.apache.activemq.memory:org.apache.activemq.memory.* + + + Networks of Brokers + org.apache.activemq.network:org.apache.activemq.network.* + + + OpenWire support + org.apache.activemq.openwire:org.apache.activemq.openwire.* + + + Utility classes + org.apache.activemq.util:org.apache.activemq.wireformat:org.apache.activemq.proxy + + + + + + org.codehaus.mojo + findbugs-maven-plugin + ${findbugs-maven-plugin-version} + + Normal + Default + + + + + + + + + ${project.basedir}/src/main/resources + + **/* + + + + ${project.basedir}/src/main/filtered-resources + true + + **/* + + + + + + + + + + + + + + + maven-surefire-plugin + + always + ${surefire.argLine} + alphabetical + + + + org.apache.activemq.default.directory.prefix + target/ + + + + + + **/*Test.* + + + + + + org.codehaus.mojo + javacc-maven-plugin + + + generate-sources + + ${basedir}/src/main/grammar + ${basedir}/target/generated-javacc + org.apache.activemq.selector + + + javacc + + + + + + org.codehaus.mojo + cobertura-maven-plugin + + + 50 + 50 + true + 50 + 50 + + + + + + + + openwire-generate + + + org.apache.activemq + activemq-openwire-generator + ${project.version} + true + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + default + generate-sources + + + Running OpenWire Generator + + + + + + run + + + + + + + + + diff --git a/activemq-core/src/main/grammar/SelectorParser.jj b/activemq-client/src/main/grammar/SelectorParser.jj similarity index 100% rename from activemq-core/src/main/grammar/SelectorParser.jj rename to activemq-client/src/main/grammar/SelectorParser.jj diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java similarity index 99% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java index 3d8844bf34..994f4a97a8 100755 --- a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java @@ -1135,7 +1135,7 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne * Sets the amount of time between scheduled sends of any outstanding Message Acks for consumers that * have been configured with optimizeAcknowledge enabled. * - * @param scheduledOptimizedAckInterval the scheduledOptimizedAckInterval to set + * @param optimizedAckScheduledAckInterval the scheduledOptimizedAckInterval to set */ public void setOptimizedAckScheduledAckInterval(long optimizedAckScheduledAckInterval) { this.optimizedAckScheduledAckInterval = optimizedAckScheduledAckInterval; diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQDispatcher.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQDispatcher.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQDispatcher.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQDispatcher.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQInputStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQInputStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageAudit.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageAudit.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageAudit.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageAudit.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageAuditNoSync.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageAuditNoSync.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageAuditNoSync.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageAuditNoSync.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQOutputStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQOutputStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSender.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSender.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSender.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSender.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSession.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSession.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSession.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSession.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSession.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSession.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnection.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnection.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASession.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java rename to activemq-client/src/main/java/org/apache/activemq/ActiveMQXASession.java diff --git a/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java b/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java rename to activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/AlreadyClosedException.java b/activemq-client/src/main/java/org/apache/activemq/AlreadyClosedException.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/AlreadyClosedException.java rename to activemq-client/src/main/java/org/apache/activemq/AlreadyClosedException.java diff --git a/activemq-core/src/main/java/org/apache/activemq/AsyncCallback.java b/activemq-client/src/main/java/org/apache/activemq/AsyncCallback.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/AsyncCallback.java rename to activemq-client/src/main/java/org/apache/activemq/AsyncCallback.java diff --git a/activemq-core/src/main/java/org/apache/activemq/BlobMessage.java b/activemq-client/src/main/java/org/apache/activemq/BlobMessage.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/BlobMessage.java rename to activemq-client/src/main/java/org/apache/activemq/BlobMessage.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ClientInternalExceptionListener.java b/activemq-client/src/main/java/org/apache/activemq/ClientInternalExceptionListener.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ClientInternalExceptionListener.java rename to activemq-client/src/main/java/org/apache/activemq/ClientInternalExceptionListener.java diff --git a/activemq-core/src/main/java/org/apache/activemq/Closeable.java b/activemq-client/src/main/java/org/apache/activemq/Closeable.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/Closeable.java rename to activemq-client/src/main/java/org/apache/activemq/Closeable.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ConfigurationException.java b/activemq-client/src/main/java/org/apache/activemq/ConfigurationException.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ConfigurationException.java rename to activemq-client/src/main/java/org/apache/activemq/ConfigurationException.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ConnectionAudit.java b/activemq-client/src/main/java/org/apache/activemq/ConnectionAudit.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ConnectionAudit.java rename to activemq-client/src/main/java/org/apache/activemq/ConnectionAudit.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ConnectionClosedException.java b/activemq-client/src/main/java/org/apache/activemq/ConnectionClosedException.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ConnectionClosedException.java rename to activemq-client/src/main/java/org/apache/activemq/ConnectionClosedException.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ConnectionFailedException.java b/activemq-client/src/main/java/org/apache/activemq/ConnectionFailedException.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ConnectionFailedException.java rename to activemq-client/src/main/java/org/apache/activemq/ConnectionFailedException.java diff --git a/activemq-core/src/main/java/org/apache/activemq/CustomDestination.java b/activemq-client/src/main/java/org/apache/activemq/CustomDestination.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/CustomDestination.java rename to activemq-client/src/main/java/org/apache/activemq/CustomDestination.java diff --git a/activemq-core/src/main/java/org/apache/activemq/Disposable.java b/activemq-client/src/main/java/org/apache/activemq/Disposable.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/Disposable.java rename to activemq-client/src/main/java/org/apache/activemq/Disposable.java diff --git a/activemq-core/src/main/java/org/apache/activemq/EnhancedConnection.java b/activemq-client/src/main/java/org/apache/activemq/EnhancedConnection.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/EnhancedConnection.java rename to activemq-client/src/main/java/org/apache/activemq/EnhancedConnection.java diff --git a/activemq-core/src/main/java/org/apache/activemq/FifoMessageDispatchChannel.java b/activemq-client/src/main/java/org/apache/activemq/FifoMessageDispatchChannel.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/FifoMessageDispatchChannel.java rename to activemq-client/src/main/java/org/apache/activemq/FifoMessageDispatchChannel.java diff --git a/activemq-core/src/main/java/org/apache/activemq/LocalTransactionEventListener.java b/activemq-client/src/main/java/org/apache/activemq/LocalTransactionEventListener.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/LocalTransactionEventListener.java rename to activemq-client/src/main/java/org/apache/activemq/LocalTransactionEventListener.java diff --git a/activemq-core/src/main/java/org/apache/activemq/Message.java b/activemq-client/src/main/java/org/apache/activemq/Message.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/Message.java rename to activemq-client/src/main/java/org/apache/activemq/Message.java diff --git a/activemq-core/src/main/java/org/apache/activemq/MessageAvailableConsumer.java b/activemq-client/src/main/java/org/apache/activemq/MessageAvailableConsumer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/MessageAvailableConsumer.java rename to activemq-client/src/main/java/org/apache/activemq/MessageAvailableConsumer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/MessageAvailableListener.java b/activemq-client/src/main/java/org/apache/activemq/MessageAvailableListener.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/MessageAvailableListener.java rename to activemq-client/src/main/java/org/apache/activemq/MessageAvailableListener.java diff --git a/activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java b/activemq-client/src/main/java/org/apache/activemq/MessageDispatchChannel.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java rename to activemq-client/src/main/java/org/apache/activemq/MessageDispatchChannel.java diff --git a/activemq-core/src/main/java/org/apache/activemq/MessageTransformer.java b/activemq-client/src/main/java/org/apache/activemq/MessageTransformer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/MessageTransformer.java rename to activemq-client/src/main/java/org/apache/activemq/MessageTransformer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/MessageTransformerSupport.java b/activemq-client/src/main/java/org/apache/activemq/MessageTransformerSupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/MessageTransformerSupport.java rename to activemq-client/src/main/java/org/apache/activemq/MessageTransformerSupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/NotStartedException.java b/activemq-client/src/main/java/org/apache/activemq/NotStartedException.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/NotStartedException.java rename to activemq-client/src/main/java/org/apache/activemq/NotStartedException.java diff --git a/activemq-core/src/main/java/org/apache/activemq/RedeliveryPolicy.java b/activemq-client/src/main/java/org/apache/activemq/RedeliveryPolicy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/RedeliveryPolicy.java rename to activemq-client/src/main/java/org/apache/activemq/RedeliveryPolicy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ScheduledMessage.java b/activemq-client/src/main/java/org/apache/activemq/ScheduledMessage.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ScheduledMessage.java rename to activemq-client/src/main/java/org/apache/activemq/ScheduledMessage.java diff --git a/activemq-core/src/main/java/org/apache/activemq/Service.java b/activemq-client/src/main/java/org/apache/activemq/Service.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/Service.java rename to activemq-client/src/main/java/org/apache/activemq/Service.java diff --git a/activemq-core/src/main/java/org/apache/activemq/SimplePriorityMessageDispatchChannel.java b/activemq-client/src/main/java/org/apache/activemq/SimplePriorityMessageDispatchChannel.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/SimplePriorityMessageDispatchChannel.java rename to activemq-client/src/main/java/org/apache/activemq/SimplePriorityMessageDispatchChannel.java diff --git a/activemq-core/src/main/java/org/apache/activemq/StreamConnection.java b/activemq-client/src/main/java/org/apache/activemq/StreamConnection.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/StreamConnection.java rename to activemq-client/src/main/java/org/apache/activemq/StreamConnection.java diff --git a/activemq-core/src/main/java/org/apache/activemq/ThreadPriorities.java b/activemq-client/src/main/java/org/apache/activemq/ThreadPriorities.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/ThreadPriorities.java rename to activemq-client/src/main/java/org/apache/activemq/ThreadPriorities.java diff --git a/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java b/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/TransactionContext.java rename to activemq-client/src/main/java/org/apache/activemq/TransactionContext.java diff --git a/activemq-client/src/main/java/org/apache/activemq/TransportLoggerSupport.java b/activemq-client/src/main/java/org/apache/activemq/TransportLoggerSupport.java new file mode 100644 index 0000000000..d56f641e6f --- /dev/null +++ b/activemq-client/src/main/java/org/apache/activemq/TransportLoggerSupport.java @@ -0,0 +1,63 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq; + +import org.apache.activemq.transport.Transport; + +import java.io.IOException; + +/** + * @author Hiram Chirino + */ +public class TransportLoggerSupport { + + public static String defaultLogWriterName = "default"; + + public static interface SPI { + public Transport createTransportLogger(Transport transport) throws IOException; + public Transport createTransportLogger(Transport transport, String logWriterName, boolean dynamicManagement, boolean startLogging, int jmxPort) throws IOException; + } + + final static public SPI spi; + static { + SPI temp; + try { + temp = (SPI) TransportLoggerSupport.class.getClassLoader().loadClass("org.apache.activemq.transport.TransportLoggerFactorySPI").newInstance(); + } catch (Throwable e) { + temp = null; + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } + spi = temp; + } + + public static Transport createTransportLogger(Transport transport) throws IOException { + if( spi!=null ) { + return spi.createTransportLogger(transport); + } else { + return transport; + } + } + + public static Transport createTransportLogger(Transport transport, String logWriterName, boolean dynamicManagement, boolean startLogging, int jmxPort) throws IOException { + if( spi!=null ) { + return spi.createTransportLogger(transport, logWriterName, dynamicManagement, startLogging, jmxPort); + } else { + return transport; + } + } + +} diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java b/activemq-client/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerListener.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerListener.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerListener.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerListener.java diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationEvent.java similarity index 96% rename from activemq-core/src/main/java/org/apache/activemq/advisory/DestinationEvent.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/DestinationEvent.java index e46350e4d9..df0dbc5df9 100644 --- a/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationEvent.java +++ b/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationEvent.java @@ -18,9 +18,6 @@ package org.apache.activemq.advisory; import java.util.EventObject; -import javax.jms.Destination; - -import org.apache.activemq.command.ConsumerId; import org.apache.activemq.command.DestinationInfo; import org.apache.activemq.command.ActiveMQDestination; diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationListener.java b/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationListener.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/advisory/DestinationListener.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/DestinationListener.java diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationSource.java b/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java similarity index 99% rename from activemq-core/src/main/java/org/apache/activemq/advisory/DestinationSource.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java index 41fece5530..3d11fcab97 100644 --- a/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationSource.java +++ b/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java @@ -27,7 +27,6 @@ import javax.jms.MessageConsumer; import javax.jms.MessageListener; import javax.jms.Session; -import org.apache.activemq.Service; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQQueue; diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEvent.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/advisory/ProducerEvent.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEvent.java diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerListener.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerListener.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/advisory/ProducerListener.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/ProducerListener.java diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerStartedEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerStartedEvent.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/advisory/ProducerStartedEvent.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/ProducerStartedEvent.java diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerStoppedEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerStoppedEvent.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/advisory/ProducerStoppedEvent.java rename to activemq-client/src/main/java/org/apache/activemq/advisory/ProducerStoppedEvent.java diff --git a/activemq-core/src/main/java/org/apache/activemq/advisory/package.html b/activemq-client/src/main/java/org/apache/activemq/advisory/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/advisory/package.html rename to activemq-client/src/main/java/org/apache/activemq/advisory/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/BlobDownloadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloadStrategy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/blob/BlobDownloadStrategy.java rename to activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloadStrategy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/BlobDownloader.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloader.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/blob/BlobDownloader.java rename to activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloader.java diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/BlobTransferPolicy.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobTransferPolicy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/blob/BlobTransferPolicy.java rename to activemq-client/src/main/java/org/apache/activemq/blob/BlobTransferPolicy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/BlobUploadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobUploadStrategy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/blob/BlobUploadStrategy.java rename to activemq-client/src/main/java/org/apache/activemq/blob/BlobUploadStrategy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/BlobUploader.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobUploader.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/blob/BlobUploader.java rename to activemq-client/src/main/java/org/apache/activemq/blob/BlobUploader.java diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/DefaultBlobDownloadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobDownloadStrategy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/blob/DefaultBlobDownloadStrategy.java rename to activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobDownloadStrategy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/DefaultBlobUploadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobUploadStrategy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/blob/DefaultBlobUploadStrategy.java rename to activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobUploadStrategy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/DefaultStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/DefaultStrategy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/blob/DefaultStrategy.java rename to activemq-client/src/main/java/org/apache/activemq/blob/DefaultStrategy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/FTPBlobDownloadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/FTPBlobDownloadStrategy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/blob/FTPBlobDownloadStrategy.java rename to activemq-client/src/main/java/org/apache/activemq/blob/FTPBlobDownloadStrategy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/FTPBlobUploadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/FTPBlobUploadStrategy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/blob/FTPBlobUploadStrategy.java rename to activemq-client/src/main/java/org/apache/activemq/blob/FTPBlobUploadStrategy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/FTPStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/FTPStrategy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/blob/FTPStrategy.java rename to activemq-client/src/main/java/org/apache/activemq/blob/FTPStrategy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/FileSystemBlobStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/FileSystemBlobStrategy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/blob/FileSystemBlobStrategy.java rename to activemq-client/src/main/java/org/apache/activemq/blob/FileSystemBlobStrategy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/blob/package.html b/activemq-client/src/main/java/org/apache/activemq/blob/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/blob/package.html rename to activemq-client/src/main/java/org/apache/activemq/blob/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/SslContext.java b/activemq-client/src/main/java/org/apache/activemq/broker/SslContext.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/broker/SslContext.java rename to activemq-client/src/main/java/org/apache/activemq/broker/SslContext.java diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReference.java b/activemq-client/src/main/java/org/apache/activemq/broker/region/MessageReference.java similarity index 97% rename from activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReference.java rename to activemq-client/src/main/java/org/apache/activemq/broker/region/MessageReference.java index 76dfbe63ff..64c91fa0a1 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReference.java +++ b/activemq-client/src/main/java/org/apache/activemq/broker/region/MessageReference.java @@ -34,7 +34,7 @@ public interface MessageReference { Message getMessage(); boolean isPersistent(); - Destination getRegionDestination(); + Message.MessageDestination getRegionDestination(); int getRedeliveryCounter(); void incrementRedeliveryCounter(); diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RedeliveryPolicyMap.java b/activemq-client/src/main/java/org/apache/activemq/broker/region/policy/RedeliveryPolicyMap.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RedeliveryPolicyMap.java rename to activemq-client/src/main/java/org/apache/activemq/broker/region/policy/RedeliveryPolicyMap.java diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java b/activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java rename to activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBlobMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBlobMessage.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBlobMessage.java rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBlobMessage.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQDestination.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQDestination.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQDestination.java rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQDestination.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQQueue.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQQueue.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQQueue.java rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQQueue.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTopic.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTopic.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTopic.java rename to activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTopic.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/BaseCommand.java b/activemq-client/src/main/java/org/apache/activemq/command/BaseCommand.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/BaseCommand.java rename to activemq-client/src/main/java/org/apache/activemq/command/BaseCommand.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/BaseEndpoint.java b/activemq-client/src/main/java/org/apache/activemq/command/BaseEndpoint.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/BaseEndpoint.java rename to activemq-client/src/main/java/org/apache/activemq/command/BaseEndpoint.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/BrokerId.java b/activemq-client/src/main/java/org/apache/activemq/command/BrokerId.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/BrokerId.java rename to activemq-client/src/main/java/org/apache/activemq/command/BrokerId.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/BrokerInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/BrokerInfo.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/BrokerInfo.java rename to activemq-client/src/main/java/org/apache/activemq/command/BrokerInfo.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/Command.java b/activemq-client/src/main/java/org/apache/activemq/command/Command.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/Command.java rename to activemq-client/src/main/java/org/apache/activemq/command/Command.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java b/activemq-client/src/main/java/org/apache/activemq/command/CommandTypes.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java rename to activemq-client/src/main/java/org/apache/activemq/command/CommandTypes.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConnectionControl.java b/activemq-client/src/main/java/org/apache/activemq/command/ConnectionControl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ConnectionControl.java rename to activemq-client/src/main/java/org/apache/activemq/command/ConnectionControl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConnectionError.java b/activemq-client/src/main/java/org/apache/activemq/command/ConnectionError.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ConnectionError.java rename to activemq-client/src/main/java/org/apache/activemq/command/ConnectionError.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConnectionId.java b/activemq-client/src/main/java/org/apache/activemq/command/ConnectionId.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ConnectionId.java rename to activemq-client/src/main/java/org/apache/activemq/command/ConnectionId.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/ConnectionInfo.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java rename to activemq-client/src/main/java/org/apache/activemq/command/ConnectionInfo.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConsumerControl.java b/activemq-client/src/main/java/org/apache/activemq/command/ConsumerControl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ConsumerControl.java rename to activemq-client/src/main/java/org/apache/activemq/command/ConsumerControl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConsumerId.java b/activemq-client/src/main/java/org/apache/activemq/command/ConsumerId.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ConsumerId.java rename to activemq-client/src/main/java/org/apache/activemq/command/ConsumerId.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java rename to activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ControlCommand.java b/activemq-client/src/main/java/org/apache/activemq/command/ControlCommand.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ControlCommand.java rename to activemq-client/src/main/java/org/apache/activemq/command/ControlCommand.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/DataArrayResponse.java b/activemq-client/src/main/java/org/apache/activemq/command/DataArrayResponse.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/DataArrayResponse.java rename to activemq-client/src/main/java/org/apache/activemq/command/DataArrayResponse.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/DataResponse.java b/activemq-client/src/main/java/org/apache/activemq/command/DataResponse.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/DataResponse.java rename to activemq-client/src/main/java/org/apache/activemq/command/DataResponse.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/DataStructure.java b/activemq-client/src/main/java/org/apache/activemq/command/DataStructure.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/DataStructure.java rename to activemq-client/src/main/java/org/apache/activemq/command/DataStructure.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java b/activemq-client/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java rename to activemq-client/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/DestinationInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/DestinationInfo.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/DestinationInfo.java rename to activemq-client/src/main/java/org/apache/activemq/command/DestinationInfo.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/DiscoveryEvent.java b/activemq-client/src/main/java/org/apache/activemq/command/DiscoveryEvent.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/DiscoveryEvent.java rename to activemq-client/src/main/java/org/apache/activemq/command/DiscoveryEvent.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/Endpoint.java b/activemq-client/src/main/java/org/apache/activemq/command/Endpoint.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/Endpoint.java rename to activemq-client/src/main/java/org/apache/activemq/command/Endpoint.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ExceptionResponse.java b/activemq-client/src/main/java/org/apache/activemq/command/ExceptionResponse.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ExceptionResponse.java rename to activemq-client/src/main/java/org/apache/activemq/command/ExceptionResponse.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/FlushCommand.java b/activemq-client/src/main/java/org/apache/activemq/command/FlushCommand.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/FlushCommand.java rename to activemq-client/src/main/java/org/apache/activemq/command/FlushCommand.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/IntegerResponse.java b/activemq-client/src/main/java/org/apache/activemq/command/IntegerResponse.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/IntegerResponse.java rename to activemq-client/src/main/java/org/apache/activemq/command/IntegerResponse.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/JournalQueueAck.java b/activemq-client/src/main/java/org/apache/activemq/command/JournalQueueAck.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/JournalQueueAck.java rename to activemq-client/src/main/java/org/apache/activemq/command/JournalQueueAck.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/JournalTopicAck.java b/activemq-client/src/main/java/org/apache/activemq/command/JournalTopicAck.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/JournalTopicAck.java rename to activemq-client/src/main/java/org/apache/activemq/command/JournalTopicAck.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/JournalTrace.java b/activemq-client/src/main/java/org/apache/activemq/command/JournalTrace.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/JournalTrace.java rename to activemq-client/src/main/java/org/apache/activemq/command/JournalTrace.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/JournalTransaction.java b/activemq-client/src/main/java/org/apache/activemq/command/JournalTransaction.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/JournalTransaction.java rename to activemq-client/src/main/java/org/apache/activemq/command/JournalTransaction.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/KeepAliveInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/KeepAliveInfo.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/KeepAliveInfo.java rename to activemq-client/src/main/java/org/apache/activemq/command/KeepAliveInfo.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/LastPartialCommand.java b/activemq-client/src/main/java/org/apache/activemq/command/LastPartialCommand.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/LastPartialCommand.java rename to activemq-client/src/main/java/org/apache/activemq/command/LastPartialCommand.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/LocalTransactionId.java b/activemq-client/src/main/java/org/apache/activemq/command/LocalTransactionId.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/LocalTransactionId.java rename to activemq-client/src/main/java/org/apache/activemq/command/LocalTransactionId.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/MarshallAware.java b/activemq-client/src/main/java/org/apache/activemq/command/MarshallAware.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/MarshallAware.java rename to activemq-client/src/main/java/org/apache/activemq/command/MarshallAware.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/Message.java b/activemq-client/src/main/java/org/apache/activemq/command/Message.java similarity index 97% rename from activemq-core/src/main/java/org/apache/activemq/command/Message.java rename to activemq-client/src/main/java/org/apache/activemq/command/Message.java index 65e4397e2f..4e8590e133 100755 --- a/activemq-core/src/main/java/org/apache/activemq/command/Message.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/Message.java @@ -29,9 +29,7 @@ import javax.jms.JMSException; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.advisory.AdvisorySupport; -import org.apache.activemq.broker.region.Destination; import org.apache.activemq.broker.region.MessageReference; -import org.apache.activemq.broker.region.RegionBroker; import org.apache.activemq.usage.MemoryUsage; import org.apache.activemq.util.ByteArrayInputStream; import org.apache.activemq.util.ByteArrayOutputStream; @@ -46,6 +44,7 @@ import org.apache.activemq.wireformat.WireFormat; * */ public abstract class Message extends BaseCommand implements MarshallAware, MessageReference { + public static final String ORIGINAL_EXPIRATION = "originalExpiration"; /** * The default minimum amount of memory a message is assumed to use @@ -90,12 +89,17 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess private transient short referenceCount; private transient ActiveMQConnection connection; - private transient org.apache.activemq.broker.region.Destination regionDestination; - private transient MemoryUsage memoryUsage; + transient MessageDestination regionDestination; + transient MemoryUsage memoryUsage; private BrokerId[] brokerPath; private BrokerId[] cluster; + public static interface MessageDestination { + int getMinimumMessageSize(); + MemoryUsage getMemoryUsage(); + } + public abstract Message copy(); public abstract void clearBody() throws JMSException; public abstract void storeContent(); @@ -130,7 +134,7 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess copy.properties = new HashMap(properties); // The new message hasn't expired, so remove this feild. - copy.properties.remove(RegionBroker.ORIGINAL_EXPIRATION); + copy.properties.remove(ORIGINAL_EXPIRATION); } else { copy.properties = properties; } @@ -588,17 +592,17 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess return this; } - public org.apache.activemq.broker.region.Destination getRegionDestination() { - return regionDestination; - } - - public void setRegionDestination(org.apache.activemq.broker.region.Destination destination) { + public void setRegionDestination(MessageDestination destination) { this.regionDestination = destination; if(this.memoryUsage==null) { - this.memoryUsage=regionDestination.getMemoryUsage(); + this.memoryUsage=destination.getMemoryUsage(); } } + public MessageDestination getRegionDestination() { + return regionDestination; + } + public MemoryUsage getMemoryUsage() { return this.memoryUsage; } @@ -666,7 +670,7 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess protected int getMinimumMessageSize() { int result = DEFAULT_MINIMUM_MESSAGE_SIZE; //let destination override - Destination dest = regionDestination; + MessageDestination dest = regionDestination; if (dest != null) { result=dest.getMinimumMessageSize(); } diff --git a/activemq-core/src/main/java/org/apache/activemq/command/MessageAck.java b/activemq-client/src/main/java/org/apache/activemq/command/MessageAck.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/MessageAck.java rename to activemq-client/src/main/java/org/apache/activemq/command/MessageAck.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/MessageDispatch.java b/activemq-client/src/main/java/org/apache/activemq/command/MessageDispatch.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/MessageDispatch.java rename to activemq-client/src/main/java/org/apache/activemq/command/MessageDispatch.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/MessageDispatchNotification.java b/activemq-client/src/main/java/org/apache/activemq/command/MessageDispatchNotification.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/MessageDispatchNotification.java rename to activemq-client/src/main/java/org/apache/activemq/command/MessageDispatchNotification.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/MessageId.java b/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/MessageId.java rename to activemq-client/src/main/java/org/apache/activemq/command/MessageId.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/MessagePull.java b/activemq-client/src/main/java/org/apache/activemq/command/MessagePull.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/MessagePull.java rename to activemq-client/src/main/java/org/apache/activemq/command/MessagePull.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java b/activemq-client/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java rename to activemq-client/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/PartialCommand.java b/activemq-client/src/main/java/org/apache/activemq/command/PartialCommand.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/PartialCommand.java rename to activemq-client/src/main/java/org/apache/activemq/command/PartialCommand.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ProducerAck.java b/activemq-client/src/main/java/org/apache/activemq/command/ProducerAck.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ProducerAck.java rename to activemq-client/src/main/java/org/apache/activemq/command/ProducerAck.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ProducerId.java b/activemq-client/src/main/java/org/apache/activemq/command/ProducerId.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ProducerId.java rename to activemq-client/src/main/java/org/apache/activemq/command/ProducerId.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ProducerInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/ProducerInfo.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ProducerInfo.java rename to activemq-client/src/main/java/org/apache/activemq/command/ProducerInfo.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/RemoveInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/RemoveInfo.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/RemoveInfo.java rename to activemq-client/src/main/java/org/apache/activemq/command/RemoveInfo.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java rename to activemq-client/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ReplayCommand.java b/activemq-client/src/main/java/org/apache/activemq/command/ReplayCommand.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ReplayCommand.java rename to activemq-client/src/main/java/org/apache/activemq/command/ReplayCommand.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/Response.java b/activemq-client/src/main/java/org/apache/activemq/command/Response.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/Response.java rename to activemq-client/src/main/java/org/apache/activemq/command/Response.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/SessionId.java b/activemq-client/src/main/java/org/apache/activemq/command/SessionId.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/SessionId.java rename to activemq-client/src/main/java/org/apache/activemq/command/SessionId.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/SessionInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/SessionInfo.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/SessionInfo.java rename to activemq-client/src/main/java/org/apache/activemq/command/SessionInfo.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ShutdownInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/ShutdownInfo.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/ShutdownInfo.java rename to activemq-client/src/main/java/org/apache/activemq/command/ShutdownInfo.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/SubscriptionInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/SubscriptionInfo.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/SubscriptionInfo.java rename to activemq-client/src/main/java/org/apache/activemq/command/SubscriptionInfo.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/TransactionId.java b/activemq-client/src/main/java/org/apache/activemq/command/TransactionId.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/TransactionId.java rename to activemq-client/src/main/java/org/apache/activemq/command/TransactionId.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/TransactionInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/TransactionInfo.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/TransactionInfo.java rename to activemq-client/src/main/java/org/apache/activemq/command/TransactionInfo.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java b/activemq-client/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java rename to activemq-client/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java b/activemq-client/src/main/java/org/apache/activemq/command/WireFormatInfo.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java rename to activemq-client/src/main/java/org/apache/activemq/command/WireFormatInfo.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/XATransactionId.java b/activemq-client/src/main/java/org/apache/activemq/command/XATransactionId.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/XATransactionId.java rename to activemq-client/src/main/java/org/apache/activemq/command/XATransactionId.java diff --git a/activemq-core/src/main/java/org/apache/activemq/command/package.html b/activemq-client/src/main/java/org/apache/activemq/command/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/command/package.html rename to activemq-client/src/main/java/org/apache/activemq/command/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java b/activemq-client/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java rename to activemq-client/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/AnyDestination.java b/activemq-client/src/main/java/org/apache/activemq/filter/AnyDestination.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/AnyDestination.java rename to activemq-client/src/main/java/org/apache/activemq/filter/AnyDestination.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java rename to activemq-client/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/BinaryExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/BinaryExpression.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/BinaryExpression.java rename to activemq-client/src/main/java/org/apache/activemq/filter/BinaryExpression.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/BooleanExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/BooleanExpression.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/BooleanExpression.java rename to activemq-client/src/main/java/org/apache/activemq/filter/BooleanExpression.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/ComparisonExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/ComparisonExpression.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/ComparisonExpression.java rename to activemq-client/src/main/java/org/apache/activemq/filter/ComparisonExpression.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/CompositeDestinationFilter.java b/activemq-client/src/main/java/org/apache/activemq/filter/CompositeDestinationFilter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/CompositeDestinationFilter.java rename to activemq-client/src/main/java/org/apache/activemq/filter/CompositeDestinationFilter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/ConstantExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/ConstantExpression.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/ConstantExpression.java rename to activemq-client/src/main/java/org/apache/activemq/filter/ConstantExpression.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DefaultDestinationMapEntry.java b/activemq-client/src/main/java/org/apache/activemq/filter/DefaultDestinationMapEntry.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/DefaultDestinationMapEntry.java rename to activemq-client/src/main/java/org/apache/activemq/filter/DefaultDestinationMapEntry.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DestinationFilter.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/DestinationFilter.java rename to activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DestinationMap.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMap.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/DestinationMap.java rename to activemq-client/src/main/java/org/apache/activemq/filter/DestinationMap.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapEntry.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMapEntry.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapEntry.java rename to activemq-client/src/main/java/org/apache/activemq/filter/DestinationMapEntry.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapNode.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMapNode.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapNode.java rename to activemq-client/src/main/java/org/apache/activemq/filter/DestinationMapNode.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DestinationNode.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationNode.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/DestinationNode.java rename to activemq-client/src/main/java/org/apache/activemq/filter/DestinationNode.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/DestinationPath.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationPath.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/DestinationPath.java rename to activemq-client/src/main/java/org/apache/activemq/filter/DestinationPath.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/Expression.java b/activemq-client/src/main/java/org/apache/activemq/filter/Expression.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/Expression.java rename to activemq-client/src/main/java/org/apache/activemq/filter/Expression.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/LogicExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/LogicExpression.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/LogicExpression.java rename to activemq-client/src/main/java/org/apache/activemq/filter/LogicExpression.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/MessageEvaluationContext.java b/activemq-client/src/main/java/org/apache/activemq/filter/MessageEvaluationContext.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/MessageEvaluationContext.java rename to activemq-client/src/main/java/org/apache/activemq/filter/MessageEvaluationContext.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java b/activemq-client/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java rename to activemq-client/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/NoLocalExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/NoLocalExpression.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/NoLocalExpression.java rename to activemq-client/src/main/java/org/apache/activemq/filter/NoLocalExpression.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/NonCachedMessageEvaluationContext.java b/activemq-client/src/main/java/org/apache/activemq/filter/NonCachedMessageEvaluationContext.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/NonCachedMessageEvaluationContext.java rename to activemq-client/src/main/java/org/apache/activemq/filter/NonCachedMessageEvaluationContext.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/PrefixDestinationFilter.java b/activemq-client/src/main/java/org/apache/activemq/filter/PrefixDestinationFilter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/PrefixDestinationFilter.java rename to activemq-client/src/main/java/org/apache/activemq/filter/PrefixDestinationFilter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/PropertyExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/PropertyExpression.java rename to activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java b/activemq-client/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java rename to activemq-client/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/UnaryExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/UnaryExpression.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/UnaryExpression.java rename to activemq-client/src/main/java/org/apache/activemq/filter/UnaryExpression.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/WildcardDestinationFilter.java b/activemq-client/src/main/java/org/apache/activemq/filter/WildcardDestinationFilter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/WildcardDestinationFilter.java rename to activemq-client/src/main/java/org/apache/activemq/filter/WildcardDestinationFilter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/XPathExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/XPathExpression.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/XPathExpression.java rename to activemq-client/src/main/java/org/apache/activemq/filter/XPathExpression.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/XQueryExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/XQueryExpression.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/XQueryExpression.java rename to activemq-client/src/main/java/org/apache/activemq/filter/XQueryExpression.java diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java b/activemq-client/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java similarity index 99% rename from activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java rename to activemq-client/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java index 421ad5601f..ffb96fa185 100755 --- a/activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java @@ -24,7 +24,6 @@ import javax.jms.JMSException; import javax.jms.TextMessage; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.xpath.XPath; import org.w3c.dom.Document; import org.w3c.dom.traversal.NodeIterator; diff --git a/activemq-core/src/main/java/org/apache/activemq/filter/package.html b/activemq-client/src/main/java/org/apache/activemq/filter/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/filter/package.html rename to activemq-client/src/main/java/org/apache/activemq/filter/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java b/activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java rename to activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactory.java b/activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactory.java rename to activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/JNDIBaseStorable.java b/activemq-client/src/main/java/org/apache/activemq/jndi/JNDIBaseStorable.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/jndi/JNDIBaseStorable.java rename to activemq-client/src/main/java/org/apache/activemq/jndi/JNDIBaseStorable.java diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java b/activemq-client/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java rename to activemq-client/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/JNDIStorableInterface.java b/activemq-client/src/main/java/org/apache/activemq/jndi/JNDIStorableInterface.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/jndi/JNDIStorableInterface.java rename to activemq-client/src/main/java/org/apache/activemq/jndi/JNDIStorableInterface.java diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java b/activemq-client/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java rename to activemq-client/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/NameParserImpl.java b/activemq-client/src/main/java/org/apache/activemq/jndi/NameParserImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/jndi/NameParserImpl.java rename to activemq-client/src/main/java/org/apache/activemq/jndi/NameParserImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java b/activemq-client/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java rename to activemq-client/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/package.html b/activemq-client/src/main/java/org/apache/activemq/jndi/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/jndi/package.html rename to activemq-client/src/main/java/org/apache/activemq/jndi/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/management/BoundaryStatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/BoundaryStatisticImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/BoundaryStatisticImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/BoundaryStatisticImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/BoundedRangeStatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/BoundedRangeStatisticImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/BoundedRangeStatisticImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/BoundedRangeStatisticImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/CountStatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/CountStatisticImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/CountStatisticImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/CountStatisticImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionPoolStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JCAConnectionPoolStatsImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionPoolStatsImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/JCAConnectionPoolStatsImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JCAConnectionStatsImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionStatsImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/JCAConnectionStatsImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JCAStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JCAStatsImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/JCAStatsImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/JCAStatsImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JMSConnectionStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSConnectionStatsImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/JMSConnectionStatsImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/JMSConnectionStatsImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JMSSessionStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSSessionStatsImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/JMSSessionStatsImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/JMSSessionStatsImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/JMSStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSStatsImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/JMSStatsImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/JMSStatsImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/PollCountStatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/PollCountStatisticImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/PollCountStatisticImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/PollCountStatisticImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/RangeStatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/RangeStatisticImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/RangeStatisticImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/RangeStatisticImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/Resettable.java b/activemq-client/src/main/java/org/apache/activemq/management/Resettable.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/Resettable.java rename to activemq-client/src/main/java/org/apache/activemq/management/Resettable.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/StatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/StatisticImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/StatisticImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/StatisticImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/StatsCapable.java b/activemq-client/src/main/java/org/apache/activemq/management/StatsCapable.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/StatsCapable.java rename to activemq-client/src/main/java/org/apache/activemq/management/StatsCapable.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/StatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/StatsImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/StatsImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/StatsImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java rename to activemq-client/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java diff --git a/activemq-core/src/main/java/org/apache/activemq/management/package.html b/activemq-client/src/main/java/org/apache/activemq/management/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/management/package.html rename to activemq-client/src/main/java/org/apache/activemq/management/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java b/activemq-client/src/main/java/org/apache/activemq/openwire/BooleanStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/BooleanStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/CommandIdComparator.java b/activemq-client/src/main/java/org/apache/activemq/openwire/CommandIdComparator.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/CommandIdComparator.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/CommandIdComparator.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java b/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConsumerControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConsumerControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataStructureSupportMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/DataStructureSupportMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataStructureSupportMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/DataStructureSupportMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/LastPartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/LastPartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/LastPartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/PartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/PartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/PartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ReplayCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ReplayCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ReplayCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQBytesMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQBytesMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQBytesMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMapMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMapMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMapMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQObjectMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQObjectMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQObjectMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQStreamMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQStreamMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQStreamMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTextMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTextMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTextMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/BaseCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/BaseCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/BrokerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/BrokerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/BrokerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/BrokerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionErrorMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionErrorMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionErrorMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConnectionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConsumerControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConsumerControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConsumerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConsumerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ControlCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ControlCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ControlCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/DataArrayResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataArrayResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/DataArrayResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/DataResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/DataResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/DestinationInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/DestinationInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/DestinationInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/DiscoveryEventMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/DiscoveryEventMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/DiscoveryEventMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ExceptionResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ExceptionResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ExceptionResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/FlushCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/FlushCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/FlushCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/IntegerResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/IntegerResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/IntegerResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalQueueAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalQueueAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalQueueAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalTopicAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTopicAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalTopicAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalTraceMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTraceMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalTraceMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalTransactionMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTransactionMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/JournalTransactionMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/KeepAliveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/KeepAliveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/KeepAliveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/LastPartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/LastPartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/LastPartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/LocalTransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/LocalTransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/LocalTransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessagePullMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessagePullMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/MessagePullMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/PartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/PartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/PartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ProducerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ProducerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ProducerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ProducerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/RemoveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/RemoveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMapMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMapMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMapMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConsumerControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConsumerControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/DestinationInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/DestinationInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/DestinationInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalTopicAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTopicAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalTopicAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MarshallerFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MarshallerFactory.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MarshallerFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/RemoveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/RemoveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBlobMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBlobMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBlobMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBytesMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBytesMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQBytesMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMapMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMapMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMapMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQObjectMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQObjectMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQObjectMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQStreamMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQStreamMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQStreamMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTempTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTextMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTextMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTextMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ActiveMQTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/BaseCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/BaseCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/BaseCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/BrokerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/BrokerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/BrokerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/BrokerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/BrokerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/BrokerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionErrorMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionErrorMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionErrorMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConnectionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConnectionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConsumerControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConsumerControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConsumerControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConsumerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConsumerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConsumerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConsumerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ConsumerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ConsumerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ControlCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ControlCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ControlCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/DataArrayResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/DataArrayResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/DataArrayResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/DataResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/DataResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/DataResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/DestinationInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/DestinationInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/DestinationInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/DiscoveryEventMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/DiscoveryEventMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/DiscoveryEventMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ExceptionResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ExceptionResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ExceptionResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/FlushCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/FlushCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/FlushCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/IntegerResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/IntegerResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/IntegerResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalQueueAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalQueueAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalQueueAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalTopicAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalTopicAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalTopicAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalTraceMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalTraceMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalTraceMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalTransactionMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/JournalTransactionMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/JournalTransactionMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/KeepAliveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/KeepAliveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/KeepAliveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/LastPartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/LastPartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/LastPartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/LocalTransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/LocalTransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/LocalTransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MarshallerFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MarshallerFactory.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MarshallerFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchNotificationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchNotificationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageDispatchNotificationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessagePullMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/MessagePullMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/MessagePullMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/NetworkBridgeFilterMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/NetworkBridgeFilterMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/NetworkBridgeFilterMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/PartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/PartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/PartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ProducerAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ProducerAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ProducerAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ProducerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ProducerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ProducerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ProducerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ProducerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ProducerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/RemoveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/RemoveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/RemoveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ReplayCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ReplayCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ReplayCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/SessionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/SessionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/SessionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/SessionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/SessionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/SessionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/ShutdownInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/ShutdownInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/ShutdownInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/TransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/TransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/TransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/TransactionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/TransactionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/TransactionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/WireFormatInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/WireFormatInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/WireFormatInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v4/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v4/XATransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v4/XATransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v4/XATransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBlobMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBlobMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBlobMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBytesMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBytesMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQBytesMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMapMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMapMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMapMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQObjectMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQObjectMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQObjectMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQStreamMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQStreamMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQStreamMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTempTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTextMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTextMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTextMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ActiveMQTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/BaseCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/BaseCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/BaseCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/BrokerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/BrokerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/BrokerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/BrokerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/BrokerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/BrokerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionErrorMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionErrorMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionErrorMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConnectionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConnectionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConsumerControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConsumerControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConsumerControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConsumerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConsumerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConsumerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConsumerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ConsumerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ConsumerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ControlCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ControlCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ControlCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/DataArrayResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/DataArrayResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/DataArrayResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/DataResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/DataResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/DataResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/DestinationInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/DestinationInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/DestinationInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/DiscoveryEventMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/DiscoveryEventMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/DiscoveryEventMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ExceptionResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ExceptionResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ExceptionResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/FlushCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/FlushCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/FlushCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/IntegerResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/IntegerResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/IntegerResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalQueueAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalQueueAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalQueueAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalTopicAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalTopicAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalTopicAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalTraceMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalTraceMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalTraceMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalTransactionMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/JournalTransactionMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/JournalTransactionMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/KeepAliveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/KeepAliveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/KeepAliveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/LastPartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/LastPartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/LastPartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/LocalTransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/LocalTransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/LocalTransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MarshallerFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MarshallerFactory.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MarshallerFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchNotificationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchNotificationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageDispatchNotificationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessagePullMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/MessagePullMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/MessagePullMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/NetworkBridgeFilterMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/NetworkBridgeFilterMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/NetworkBridgeFilterMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/PartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/PartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/PartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ProducerAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ProducerAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ProducerAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ProducerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ProducerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ProducerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ProducerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ProducerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ProducerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/RemoveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/RemoveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/RemoveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ReplayCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ReplayCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ReplayCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/SessionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/SessionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/SessionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/SessionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/SessionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/SessionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/ShutdownInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/ShutdownInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/ShutdownInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/TransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/TransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/TransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/TransactionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/TransactionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/TransactionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/WireFormatInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/WireFormatInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/WireFormatInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v5/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v5/XATransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v5/XATransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v5/XATransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBlobMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBlobMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBlobMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBytesMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBytesMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQBytesMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMapMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMapMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMapMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQObjectMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQObjectMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQObjectMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQStreamMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQStreamMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQStreamMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTempTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTextMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTextMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTextMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ActiveMQTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/BaseCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/BaseCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/BaseCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/BaseDataStreamMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/BaseDataStreamMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/BaseDataStreamMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/BrokerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/BrokerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/BrokerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/BrokerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/BrokerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/BrokerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionErrorMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionErrorMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionErrorMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConnectionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConnectionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConsumerControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConsumerControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConsumerControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConsumerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConsumerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConsumerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConsumerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ConsumerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ConsumerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ControlCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ControlCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ControlCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/DataArrayResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/DataArrayResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/DataArrayResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/DataResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/DataResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/DataResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/DestinationInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/DestinationInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/DestinationInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/DiscoveryEventMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/DiscoveryEventMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/DiscoveryEventMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ExceptionResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ExceptionResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ExceptionResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/FlushCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/FlushCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/FlushCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/IntegerResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/IntegerResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/IntegerResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalQueueAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalQueueAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalQueueAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalTopicAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalTopicAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalTopicAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalTraceMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalTraceMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalTraceMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalTransactionMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/JournalTransactionMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/JournalTransactionMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/KeepAliveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/KeepAliveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/KeepAliveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/LastPartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/LastPartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/LastPartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/LocalTransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/LocalTransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/LocalTransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MarshallerFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MarshallerFactory.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MarshallerFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchNotificationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchNotificationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageDispatchNotificationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessagePullMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/MessagePullMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/MessagePullMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/NetworkBridgeFilterMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/NetworkBridgeFilterMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/NetworkBridgeFilterMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/PartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/PartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/PartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ProducerAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ProducerAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ProducerAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ProducerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ProducerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ProducerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ProducerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ProducerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ProducerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/RemoveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/RemoveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/RemoveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/RemoveSubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/RemoveSubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/RemoveSubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ReplayCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ReplayCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ReplayCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/SessionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/SessionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/SessionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/SessionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/SessionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/SessionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/ShutdownInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/ShutdownInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/ShutdownInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/SubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/SubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/SubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/TransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/TransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/TransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/TransactionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/TransactionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/TransactionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/WireFormatInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/WireFormatInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/WireFormatInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v6/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v6/XATransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v6/XATransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v6/XATransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTextMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTextMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTextMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/BaseCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/BaseCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/BaseCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/BaseDataStreamMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/BaseDataStreamMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/BaseDataStreamMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/BrokerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/BrokerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/BrokerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/BrokerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/BrokerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/BrokerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionErrorMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionErrorMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionErrorMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConnectionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConsumerControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConsumerControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConsumerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConsumerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConsumerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ConsumerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ControlCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ControlCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ControlCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/DataArrayResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/DataArrayResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/DataArrayResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/DataResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/DataResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/DataResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/DestinationInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/DestinationInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/DestinationInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/DiscoveryEventMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/DiscoveryEventMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/DiscoveryEventMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ExceptionResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ExceptionResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ExceptionResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/FlushCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/FlushCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/FlushCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/IntegerResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/IntegerResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/IntegerResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalQueueAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalQueueAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalQueueAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalTopicAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTopicAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalTopicAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalTraceMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTraceMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalTraceMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalTransactionMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTransactionMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/JournalTransactionMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/KeepAliveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/KeepAliveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/KeepAliveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/LastPartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/LastPartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/LastPartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/LocalTransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/LocalTransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/LocalTransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MarshallerFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MarshallerFactory.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MarshallerFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchNotificationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchNotificationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchNotificationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessagePullMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessagePullMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/MessagePullMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/NetworkBridgeFilterMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/NetworkBridgeFilterMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/NetworkBridgeFilterMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ProducerAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ProducerAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ProducerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ProducerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ProducerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ProducerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/RemoveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/RemoveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/RemoveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/RemoveSubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/RemoveSubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/RemoveSubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ReplayCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ReplayCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ReplayCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/SessionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/SessionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/SessionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/SessionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/SessionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/SessionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/ShutdownInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/ShutdownInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/ShutdownInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/SubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/SubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/SubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/TransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/TransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/TransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/TransactionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/TransactionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/TransactionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBlobMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBlobMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBlobMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBytesMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBytesMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQBytesMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMapMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMapMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMapMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQObjectMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQObjectMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQObjectMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQStreamMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQStreamMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQStreamMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTempTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTextMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTextMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTextMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ActiveMQTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/BaseCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/BaseCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/BaseCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/BaseDataStreamMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/BaseDataStreamMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/BaseDataStreamMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/BrokerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/BrokerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/BrokerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/BrokerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/BrokerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/BrokerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionErrorMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionErrorMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionErrorMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConnectionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConnectionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConsumerControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConsumerControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConsumerControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConsumerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConsumerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConsumerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConsumerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ConsumerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ConsumerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ControlCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ControlCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ControlCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/DataArrayResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/DataArrayResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/DataArrayResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/DataResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/DataResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/DataResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/DestinationInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/DestinationInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/DestinationInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/DiscoveryEventMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/DiscoveryEventMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/DiscoveryEventMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ExceptionResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ExceptionResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ExceptionResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/FlushCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/FlushCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/FlushCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/IntegerResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/IntegerResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/IntegerResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalQueueAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalQueueAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalQueueAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalTopicAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalTopicAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalTopicAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalTraceMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalTraceMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalTraceMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalTransactionMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/JournalTransactionMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/JournalTransactionMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/KeepAliveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/KeepAliveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/KeepAliveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/LastPartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/LastPartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/LastPartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/LocalTransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/LocalTransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/LocalTransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MarshallerFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MarshallerFactory.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MarshallerFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchNotificationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchNotificationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageDispatchNotificationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessagePullMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/MessagePullMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/MessagePullMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/NetworkBridgeFilterMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/NetworkBridgeFilterMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/NetworkBridgeFilterMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/PartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/PartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/PartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ProducerAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ProducerAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ProducerAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ProducerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ProducerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ProducerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ProducerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ProducerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ProducerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/RemoveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/RemoveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/RemoveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/RemoveSubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/RemoveSubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/RemoveSubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ReplayCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ReplayCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ReplayCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/SessionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/SessionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/SessionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/SessionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/SessionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/SessionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/ShutdownInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/ShutdownInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/ShutdownInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/SubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/SubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/SubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/TransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/TransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/TransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/TransactionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/TransactionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/TransactionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/WireFormatInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/WireFormatInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/WireFormatInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v8/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v8/XATransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v8/XATransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v8/XATransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBlobMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBlobMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBlobMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBlobMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBytesMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBytesMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBytesMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQBytesMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMapMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMapMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMapMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMapMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQObjectMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQObjectMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQObjectMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQObjectMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQStreamMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQStreamMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQStreamMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQStreamMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempDestinationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempDestinationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempDestinationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempDestinationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempQueueMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempQueueMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempQueueMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempQueueMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTempTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTextMessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTextMessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTextMessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTextMessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTopicMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTopicMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTopicMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ActiveMQTopicMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/BaseCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/BaseCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/BaseCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/BaseCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/BaseDataStreamMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/BaseDataStreamMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/BaseDataStreamMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/BaseDataStreamMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/BrokerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/BrokerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/BrokerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/BrokerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/BrokerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/BrokerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/BrokerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/BrokerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionErrorMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionErrorMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionErrorMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionErrorMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConnectionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConsumerControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConsumerControlMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConsumerControlMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConsumerControlMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConsumerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConsumerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConsumerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConsumerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConsumerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConsumerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ConsumerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConsumerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ControlCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ControlCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ControlCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ControlCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/DataArrayResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/DataArrayResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/DataArrayResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/DataArrayResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/DataResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/DataResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/DataResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/DataResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/DestinationInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/DestinationInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/DestinationInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/DestinationInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/DiscoveryEventMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/DiscoveryEventMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/DiscoveryEventMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/DiscoveryEventMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ExceptionResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ExceptionResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ExceptionResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ExceptionResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/FlushCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/FlushCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/FlushCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/FlushCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/IntegerResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/IntegerResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/IntegerResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/IntegerResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalQueueAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalQueueAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalQueueAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalQueueAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalTopicAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalTopicAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalTopicAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalTopicAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalTraceMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalTraceMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalTraceMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalTraceMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalTransactionMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalTransactionMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/JournalTransactionMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/JournalTransactionMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/KeepAliveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/KeepAliveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/KeepAliveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/KeepAliveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/LastPartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/LastPartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/LastPartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/LastPartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/LocalTransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/LocalTransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/LocalTransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/LocalTransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MarshallerFactory.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MarshallerFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MarshallerFactory.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MarshallerFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchNotificationMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchNotificationMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchNotificationMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageDispatchNotificationMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessageMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessagePullMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessagePullMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/MessagePullMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessagePullMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/NetworkBridgeFilterMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/NetworkBridgeFilterMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/NetworkBridgeFilterMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/NetworkBridgeFilterMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/PartialCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/PartialCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/PartialCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ProducerAckMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ProducerAckMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ProducerAckMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ProducerAckMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ProducerIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ProducerIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ProducerIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ProducerIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ProducerInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ProducerInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ProducerInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ProducerInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/RemoveInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/RemoveInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/RemoveInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/RemoveInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/RemoveSubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/RemoveSubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/RemoveSubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/RemoveSubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ReplayCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ReplayCommandMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ReplayCommandMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ReplayCommandMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ResponseMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ResponseMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ResponseMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ResponseMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/SessionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/SessionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/SessionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/SessionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/SessionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/SessionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/SessionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/SessionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/ShutdownInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ShutdownInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/ShutdownInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/ShutdownInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/SubscriptionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/SubscriptionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/SubscriptionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/SubscriptionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/TransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/TransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/TransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/TransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/TransactionInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/TransactionInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/TransactionInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/TransactionInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/WireFormatInfoMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/WireFormatInfoMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/WireFormatInfoMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v9/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/XATransactionIdMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/openwire/v9/XATransactionIdMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/openwire/v9/XATransactionIdMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/package.html b/activemq-client/src/main/java/org/apache/activemq/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/package.html rename to activemq-client/src/main/java/org/apache/activemq/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java b/activemq-client/src/main/java/org/apache/activemq/state/CommandVisitor.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java rename to activemq-client/src/main/java/org/apache/activemq/state/CommandVisitor.java diff --git a/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitorAdapter.java b/activemq-client/src/main/java/org/apache/activemq/state/CommandVisitorAdapter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/state/CommandVisitorAdapter.java rename to activemq-client/src/main/java/org/apache/activemq/state/CommandVisitorAdapter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java b/activemq-client/src/main/java/org/apache/activemq/state/ConnectionState.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java rename to activemq-client/src/main/java/org/apache/activemq/state/ConnectionState.java diff --git a/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java b/activemq-client/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java rename to activemq-client/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java diff --git a/activemq-core/src/main/java/org/apache/activemq/state/ConsumerState.java b/activemq-client/src/main/java/org/apache/activemq/state/ConsumerState.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/state/ConsumerState.java rename to activemq-client/src/main/java/org/apache/activemq/state/ConsumerState.java diff --git a/activemq-core/src/main/java/org/apache/activemq/state/ProducerState.java b/activemq-client/src/main/java/org/apache/activemq/state/ProducerState.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/state/ProducerState.java rename to activemq-client/src/main/java/org/apache/activemq/state/ProducerState.java diff --git a/activemq-core/src/main/java/org/apache/activemq/state/ResponseHandler.java b/activemq-client/src/main/java/org/apache/activemq/state/ResponseHandler.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/state/ResponseHandler.java rename to activemq-client/src/main/java/org/apache/activemq/state/ResponseHandler.java diff --git a/activemq-core/src/main/java/org/apache/activemq/state/SessionState.java b/activemq-client/src/main/java/org/apache/activemq/state/SessionState.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/state/SessionState.java rename to activemq-client/src/main/java/org/apache/activemq/state/SessionState.java diff --git a/activemq-core/src/main/java/org/apache/activemq/state/Tracked.java b/activemq-client/src/main/java/org/apache/activemq/state/Tracked.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/state/Tracked.java rename to activemq-client/src/main/java/org/apache/activemq/state/Tracked.java diff --git a/activemq-core/src/main/java/org/apache/activemq/state/TransactionState.java b/activemq-client/src/main/java/org/apache/activemq/state/TransactionState.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/state/TransactionState.java rename to activemq-client/src/main/java/org/apache/activemq/state/TransactionState.java diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java b/activemq-client/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java rename to activemq-client/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java b/activemq-client/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java rename to activemq-client/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/DeterministicTaskRunner.java b/activemq-client/src/main/java/org/apache/activemq/thread/DeterministicTaskRunner.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/thread/DeterministicTaskRunner.java rename to activemq-client/src/main/java/org/apache/activemq/thread/DeterministicTaskRunner.java diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/PooledTaskRunner.java b/activemq-client/src/main/java/org/apache/activemq/thread/PooledTaskRunner.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/thread/PooledTaskRunner.java rename to activemq-client/src/main/java/org/apache/activemq/thread/PooledTaskRunner.java diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java b/activemq-client/src/main/java/org/apache/activemq/thread/Scheduler.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java rename to activemq-client/src/main/java/org/apache/activemq/thread/Scheduler.java diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/SchedulerTimerTask.java b/activemq-client/src/main/java/org/apache/activemq/thread/SchedulerTimerTask.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/thread/SchedulerTimerTask.java rename to activemq-client/src/main/java/org/apache/activemq/thread/SchedulerTimerTask.java diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/Task.java b/activemq-client/src/main/java/org/apache/activemq/thread/Task.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/thread/Task.java rename to activemq-client/src/main/java/org/apache/activemq/thread/Task.java diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunner.java b/activemq-client/src/main/java/org/apache/activemq/thread/TaskRunner.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/thread/TaskRunner.java rename to activemq-client/src/main/java/org/apache/activemq/thread/TaskRunner.java diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java b/activemq-client/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java rename to activemq-client/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java b/activemq-client/src/main/java/org/apache/activemq/transaction/Synchronization.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java rename to activemq-client/src/main/java/org/apache/activemq/transaction/Synchronization.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java b/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java rename to activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/CommandJoiner.java b/activemq-client/src/main/java/org/apache/activemq/transport/CommandJoiner.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/CommandJoiner.java rename to activemq-client/src/main/java/org/apache/activemq/transport/CommandJoiner.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/CompositeTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/CompositeTransport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/CompositeTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/CompositeTransport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/DefaultTransportListener.java b/activemq-client/src/main/java/org/apache/activemq/transport/DefaultTransportListener.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/DefaultTransportListener.java rename to activemq-client/src/main/java/org/apache/activemq/transport/DefaultTransportListener.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java b/activemq-client/src/main/java/org/apache/activemq/transport/FutureResponse.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java rename to activemq-client/src/main/java/org/apache/activemq/transport/FutureResponse.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/InactivityIOException.java b/activemq-client/src/main/java/org/apache/activemq/transport/InactivityIOException.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/InactivityIOException.java rename to activemq-client/src/main/java/org/apache/activemq/transport/InactivityIOException.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java b/activemq-client/src/main/java/org/apache/activemq/transport/InactivityMonitor.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java rename to activemq-client/src/main/java/org/apache/activemq/transport/InactivityMonitor.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/LogWriter.java b/activemq-client/src/main/java/org/apache/activemq/transport/LogWriter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/LogWriter.java rename to activemq-client/src/main/java/org/apache/activemq/transport/LogWriter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java b/activemq-client/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java rename to activemq-client/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/MutexTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/MutexTransport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/MutexTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/MutexTransport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/RequestTimedOutIOException.java b/activemq-client/src/main/java/org/apache/activemq/transport/RequestTimedOutIOException.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/RequestTimedOutIOException.java rename to activemq-client/src/main/java/org/apache/activemq/transport/RequestTimedOutIOException.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/ResponseCallback.java b/activemq-client/src/main/java/org/apache/activemq/transport/ResponseCallback.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/ResponseCallback.java rename to activemq-client/src/main/java/org/apache/activemq/transport/ResponseCallback.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java b/activemq-client/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java rename to activemq-client/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/ThreadNameFilter.java b/activemq-client/src/main/java/org/apache/activemq/transport/ThreadNameFilter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/ThreadNameFilter.java rename to activemq-client/src/main/java/org/apache/activemq/transport/ThreadNameFilter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/Transport.java b/activemq-client/src/main/java/org/apache/activemq/transport/Transport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/Transport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/Transport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportDisposedIOException.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportDisposedIOException.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportDisposedIOException.java rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportDisposedIOException.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportFactory.java similarity index 92% rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportFactory.java index b99ae14039..d68ffc430b 100755 --- a/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java +++ b/activemq-client/src/main/java/org/apache/activemq/transport/TransportFactory.java @@ -16,6 +16,13 @@ */ package org.apache.activemq.transport; +import org.apache.activemq.util.FactoryFinder; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.URISupport; +import org.apache.activemq.wireformat.WireFormat; +import org.apache.activemq.wireformat.WireFormatFactory; + import java.io.IOException; import java.net.MalformedURLException; import java.net.URI; @@ -26,16 +33,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; -import org.apache.activemq.broker.BrokerService; -import org.apache.activemq.broker.BrokerServiceAware; -import org.apache.activemq.broker.SslContext; -import org.apache.activemq.util.FactoryFinder; -import org.apache.activemq.util.IOExceptionSupport; -import org.apache.activemq.util.IntrospectionSupport; -import org.apache.activemq.util.URISupport; -import org.apache.activemq.wireformat.WireFormat; -import org.apache.activemq.wireformat.WireFormatFactory; - public abstract class TransportFactory { private static final FactoryFinder TRANSPORT_FACTORY_FINDER = new FactoryFinder("META-INF/services/org/apache/activemq/transport/"); @@ -112,21 +109,6 @@ public abstract class TransportFactory { return tf.doBind(location); } - public static TransportServer bind(BrokerService brokerService, URI location) throws IOException { - TransportFactory tf = findTransportFactory(location); - if( brokerService!=null && tf instanceof BrokerServiceAware ) { - ((BrokerServiceAware)tf).setBrokerService(brokerService); - } - try { - if( brokerService!=null ) { - SslContext.setCurrentSslContext(brokerService.getSslContext()); - } - return tf.doBind(location); - } finally { - SslContext.setCurrentSslContext(null); - } - } - public Transport doConnect(URI location) throws Exception { try { Map options = new HashMap(URISupport.parseParameters(location)); @@ -181,7 +163,7 @@ public abstract class TransportFactory { * @return * @throws IOException */ - private static TransportFactory findTransportFactory(URI location) throws IOException { + public static TransportFactory findTransportFactory(URI location) throws IOException { String scheme = location.getScheme(); if (scheme == null) { throw new IOException("Transport not scheme specified: [" + location + "]"); diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportFilter.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportFilter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportFilter.java rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportFilter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportListener.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportListener.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportListener.java rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportListener.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportServer.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportServer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportServer.java rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportServer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerFilter.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportServerFilter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportServerFilter.java rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportServerFilter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerSupport.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportServerSupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportServerSupport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportServerSupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportSupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportSupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java b/activemq-client/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java b/activemq-client/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java rename to activemq-client/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/WriteTimeoutFilter.java b/activemq-client/src/main/java/org/apache/activemq/transport/WriteTimeoutFilter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/WriteTimeoutFilter.java rename to activemq-client/src/main/java/org/apache/activemq/transport/WriteTimeoutFilter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransportFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransportFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransportFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgent.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgent.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgent.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgent.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgentFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgentFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgentFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgentFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/masterslave/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/masterslave/package.html rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/package.html rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/package.html rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/simple/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/package.html rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/simple/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html rename to activemq-client/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/failover/BackupTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/failover/BackupTransport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/failover/BackupTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/failover/BackupTransport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/failover/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/failover/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/failover/package.html rename to activemq-client/src/main/java/org/apache/activemq/transport/failover/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/fanout/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/fanout/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/fanout/package.html rename to activemq-client/src/main/java/org/apache/activemq/transport/fanout/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/mock/MockTransport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/mock/MockTransport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/mock/MockTransportFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransportFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/mock/MockTransportFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/mock/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/mock/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/mock/package.html rename to activemq-client/src/main/java/org/apache/activemq/transport/mock/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastDatagramHeaderMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/transport/multicast/MulticastDatagramHeaderMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastDatagramHeaderMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/transport/multicast/MulticastDatagramHeaderMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/multicast/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/multicast/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/multicast/package.html rename to activemq-client/src/main/java/org/apache/activemq/transport/multicast/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOBufferedInputStream.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOBufferedInputStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOBufferedInputStream.java rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOBufferedInputStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOInputStream.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOInputStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOInputStream.java rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOInputStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportServer.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportServer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportServer.java rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransportServer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOTransportFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransportFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOTransportFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java b/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java rename to activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/package.html rename to activemq-client/src/main/java/org/apache/activemq/transport/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayStrategy.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayStrategy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayStrategy.java rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayStrategy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ExceptionIfDroppedReplayStrategy.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/ExceptionIfDroppedReplayStrategy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/ExceptionIfDroppedReplayStrategy.java rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/ExceptionIfDroppedReplayStrategy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReplayBuffer.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReplayBuffer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReplayBuffer.java rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReplayBuffer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReplayBufferListener.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReplayBufferListener.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReplayBufferListener.java rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReplayBufferListener.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReplayStrategy.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReplayStrategy.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReplayStrategy.java rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/ReplayStrategy.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/Replayer.java b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/Replayer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/Replayer.java rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/Replayer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/reliable/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/reliable/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/reliable/package.html rename to activemq-client/src/main/java/org/apache/activemq/transport/reliable/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/QualityOfServiceUtils.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/QualityOfServiceUtils.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/QualityOfServiceUtils.java rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/QualityOfServiceUtils.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportServer.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransportServer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportServer.java rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransportServer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedInputStream.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedInputStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedInputStream.java rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedInputStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedOutputStream.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedOutputStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedOutputStream.java rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedOutputStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java similarity index 98% rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java index a0ff42d9ed..4a22e6b29f 100755 --- a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java +++ b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java @@ -16,30 +16,10 @@ gxfdgvdfg * Licensed to the Apache Software Foundation (ASF) under one or more */ package org.apache.activemq.transport.tcp; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.InterruptedIOException; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.Socket; -import java.net.SocketAddress; -import java.net.SocketException; -import java.net.SocketTimeoutException; -import java.net.URI; -import java.net.UnknownHostException; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; - -import javax.net.SocketFactory; - import org.apache.activemq.Service; +import org.apache.activemq.TransportLoggerSupport; import org.apache.activemq.thread.TaskRunnerFactory; import org.apache.activemq.transport.Transport; -import org.apache.activemq.transport.TransportLoggerFactory; import org.apache.activemq.transport.TransportThreadSupport; import org.apache.activemq.util.InetAddressUtil; import org.apache.activemq.util.IntrospectionSupport; @@ -48,6 +28,18 @@ import org.apache.activemq.wireformat.WireFormat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.net.SocketFactory; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InterruptedIOException; +import java.net.*; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; + /** * An implementation of the {@link Transport} interface using raw tcp/ip * @@ -99,7 +91,7 @@ public class TcpTransport extends TransportThreadSupport implements Transport, S * Names are mapped to classes in the resources/META-INF/services/org/apache/activemq/transport/logwriters directory. * This parameter is most probably set in Connection or TransportConnector URIs. */ - protected String logWriterName = TransportLoggerFactory.defaultLogWriterName; + protected String logWriterName = TransportLoggerSupport.defaultLogWriterName; /** * Specifies if the TransportLogger will be manageable by JMX or not. * Also, as long as there is at least 1 TransportLogger which is manageable, diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java similarity index 91% rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java index 3d87fab7c1..9dc50f934f 100755 --- a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java +++ b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java @@ -26,13 +26,9 @@ import java.util.Map; import javax.net.ServerSocketFactory; import javax.net.SocketFactory; +import org.apache.activemq.TransportLoggerSupport; import org.apache.activemq.openwire.OpenWireFormat; -import org.apache.activemq.transport.InactivityMonitor; -import org.apache.activemq.transport.Transport; -import org.apache.activemq.transport.TransportFactory; -import org.apache.activemq.transport.TransportLoggerFactory; -import org.apache.activemq.transport.TransportServer; -import org.apache.activemq.transport.WireFormatNegotiator; +import org.apache.activemq.transport.*; import org.apache.activemq.util.IOExceptionSupport; import org.apache.activemq.util.IntrospectionSupport; import org.apache.activemq.util.URISupport; @@ -90,8 +86,7 @@ public class TcpTransportFactory extends TransportFactory { if (tcpTransport.isTrace()) { try { - transport = TransportLoggerFactory.getInstance().createTransportLogger(transport, tcpTransport.getLogWriterName(), - tcpTransport.isDynamicManagement(), tcpTransport.isStartLogging(), tcpTransport.getJmxPort()); + transport = TransportLoggerSupport.createTransportLogger(transport, tcpTransport.getLogWriterName(), tcpTransport.isDynamicManagement(), tcpTransport.isStartLogging(), tcpTransport.getJmxPort()); } catch (Throwable e) { LOG.error("Could not create TransportLogger object for: " + tcpTransport.getLogWriterName() + ", reason: " + e, e); } @@ -111,6 +106,7 @@ public class TcpTransportFactory extends TransportFactory { return super.compositeConfigure(transport, format, options); } + /** * Returns true if the inactivity monitor should be used on the transport */ diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java similarity index 99% rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java index 99bca8361f..490252af90 100755 --- a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java +++ b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java @@ -35,10 +35,10 @@ import javax.net.ServerSocketFactory; import org.apache.activemq.Service; import org.apache.activemq.ThreadPriorities; +import org.apache.activemq.TransportLoggerSupport; import org.apache.activemq.command.BrokerInfo; import org.apache.activemq.openwire.OpenWireFormatFactory; import org.apache.activemq.transport.Transport; -import org.apache.activemq.transport.TransportLoggerFactory; import org.apache.activemq.transport.TransportServer; import org.apache.activemq.transport.TransportServerThreadSupport; import org.apache.activemq.util.IOExceptionSupport; @@ -90,7 +90,7 @@ public class TcpTransportServer extends TransportServerThreadSupport implements * Names are mapped to classes in the resources/META-INF/services/org/apache/activemq/transport/logwriters directory. * This parameter is most probably set in Connection or TransportConnector URIs. */ - protected String logWriterName = TransportLoggerFactory.defaultLogWriterName; + protected String logWriterName = TransportLoggerSupport.defaultLogWriterName; /** * Specifies if the TransportLogger will be manageable by JMX or not. * Also, as long as there is at least 1 TransportLogger which is manageable, diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TimeStampStream.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TimeStampStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/TimeStampStream.java rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/TimeStampStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/tcp/package.html rename to activemq-client/src/main/java/org/apache/activemq/transport/tcp/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/ByteBufferPool.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/ByteBufferPool.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/ByteBufferPool.java rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/ByteBufferPool.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandChannel.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandChannel.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandChannel.java rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandChannel.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandChannelSupport.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandChannelSupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandChannelSupport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandChannelSupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/DatagramEndpoint.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/DatagramEndpoint.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/DatagramEndpoint.java rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/DatagramEndpoint.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/DatagramHeaderMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/DatagramHeaderMarshaller.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/DatagramHeaderMarshaller.java rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/DatagramHeaderMarshaller.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/DefaultBufferPool.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/DefaultBufferPool.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/DefaultBufferPool.java rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/DefaultBufferPool.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/ResponseRedirectInterceptor.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/ResponseRedirectInterceptor.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/ResponseRedirectInterceptor.java rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/ResponseRedirectInterceptor.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/SimpleBufferPool.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/SimpleBufferPool.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/SimpleBufferPool.java rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/SimpleBufferPool.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java similarity index 86% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java index 115b3a5496..5c6edbd55f 100755 --- a/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java +++ b/activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java @@ -16,6 +16,18 @@ */ package org.apache.activemq.transport.udp; +import org.apache.activemq.TransportLoggerSupport; +import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.transport.*; +import org.apache.activemq.transport.reliable.*; +import org.apache.activemq.transport.tcp.TcpTransportFactory; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.URISupport; +import org.apache.activemq.wireformat.WireFormat; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -23,27 +35,6 @@ import java.net.UnknownHostException; import java.util.HashMap; import java.util.Map; -import org.apache.activemq.openwire.OpenWireFormat; -import org.apache.activemq.transport.CommandJoiner; -import org.apache.activemq.transport.InactivityMonitor; -import org.apache.activemq.transport.Transport; -import org.apache.activemq.transport.TransportFactory; -import org.apache.activemq.transport.TransportLoggerFactory; -import org.apache.activemq.transport.TransportServer; -import org.apache.activemq.transport.reliable.DefaultReplayStrategy; -import org.apache.activemq.transport.reliable.ExceptionIfDroppedReplayStrategy; -import org.apache.activemq.transport.reliable.ReliableTransport; -import org.apache.activemq.transport.reliable.ReplayStrategy; -import org.apache.activemq.transport.reliable.Replayer; -import org.apache.activemq.transport.tcp.TcpTransportFactory; -import org.apache.activemq.util.IOExceptionSupport; -import org.apache.activemq.util.IntSequenceGenerator; -import org.apache.activemq.util.IntrospectionSupport; -import org.apache.activemq.util.URISupport; -import org.apache.activemq.wireformat.WireFormat; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * @author David Martin Clavo david(dot)martin(dot)clavo(at)gmail.com (logging improvement modifications) * @@ -86,9 +77,9 @@ public class UdpTransportFactory extends TransportFactory { if (udpTransport.isTrace()) { try { - transport = TransportLoggerFactory.getInstance().createTransportLogger(transport); + transport = TransportLoggerSupport.createTransportLogger(transport); } catch (Throwable e) { - log.error("Could not create TransportLogger object for: " + TransportLoggerFactory.defaultLogWriterName + ", reason: " + e, e); + log.error("Could not create TransportLogger, reason: " + e, e); } } @@ -126,7 +117,7 @@ public class UdpTransportFactory extends TransportFactory { OpenWireFormat openWireFormat = asOpenWireFormat(format); if (udpTransport.isTrace()) { - transport = TransportLoggerFactory.getInstance().createTransportLogger(transport); + transport = TransportLoggerSupport.createTransportLogger(transport); } transport = new InactivityMonitor(transport, format); @@ -157,6 +148,7 @@ public class UdpTransportFactory extends TransportFactory { } } + protected ReplayStrategy createReplayStrategy(Replayer replayer) { if (replayer != null) { return new DefaultReplayStrategy(5); diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java b/activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/package.html b/activemq-client/src/main/java/org/apache/activemq/transport/udp/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/transport/udp/package.html rename to activemq-client/src/main/java/org/apache/activemq/transport/udp/package.html diff --git a/activemq-core/src/main/java/org/apache/activemq/usage/DefaultUsageCapacity.java b/activemq-client/src/main/java/org/apache/activemq/usage/DefaultUsageCapacity.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/usage/DefaultUsageCapacity.java rename to activemq-client/src/main/java/org/apache/activemq/usage/DefaultUsageCapacity.java diff --git a/activemq-core/src/main/java/org/apache/activemq/usage/MemoryUsage.java b/activemq-client/src/main/java/org/apache/activemq/usage/MemoryUsage.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/usage/MemoryUsage.java rename to activemq-client/src/main/java/org/apache/activemq/usage/MemoryUsage.java diff --git a/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java b/activemq-client/src/main/java/org/apache/activemq/usage/Usage.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/usage/Usage.java rename to activemq-client/src/main/java/org/apache/activemq/usage/Usage.java diff --git a/activemq-core/src/main/java/org/apache/activemq/usage/UsageCapacity.java b/activemq-client/src/main/java/org/apache/activemq/usage/UsageCapacity.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/usage/UsageCapacity.java rename to activemq-client/src/main/java/org/apache/activemq/usage/UsageCapacity.java diff --git a/activemq-core/src/main/java/org/apache/activemq/usage/UsageListener.java b/activemq-client/src/main/java/org/apache/activemq/usage/UsageListener.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/usage/UsageListener.java rename to activemq-client/src/main/java/org/apache/activemq/usage/UsageListener.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/BitArray.java b/activemq-client/src/main/java/org/apache/activemq/util/BitArray.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/BitArray.java rename to activemq-client/src/main/java/org/apache/activemq/util/BitArray.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/BitArrayBin.java b/activemq-client/src/main/java/org/apache/activemq/util/BitArrayBin.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/BitArrayBin.java rename to activemq-client/src/main/java/org/apache/activemq/util/BitArrayBin.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ByteArrayInputStream.java b/activemq-client/src/main/java/org/apache/activemq/util/ByteArrayInputStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/ByteArrayInputStream.java rename to activemq-client/src/main/java/org/apache/activemq/util/ByteArrayInputStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ByteArrayOutputStream.java b/activemq-client/src/main/java/org/apache/activemq/util/ByteArrayOutputStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/ByteArrayOutputStream.java rename to activemq-client/src/main/java/org/apache/activemq/util/ByteArrayOutputStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ByteSequence.java b/activemq-client/src/main/java/org/apache/activemq/util/ByteSequence.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/ByteSequence.java rename to activemq-client/src/main/java/org/apache/activemq/util/ByteSequence.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ByteSequenceData.java b/activemq-client/src/main/java/org/apache/activemq/util/ByteSequenceData.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/ByteSequenceData.java rename to activemq-client/src/main/java/org/apache/activemq/util/ByteSequenceData.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/Callback.java b/activemq-client/src/main/java/org/apache/activemq/util/Callback.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/Callback.java rename to activemq-client/src/main/java/org/apache/activemq/util/Callback.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java b/activemq-client/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java rename to activemq-client/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayInputStream.java b/activemq-client/src/main/java/org/apache/activemq/util/DataByteArrayInputStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayInputStream.java rename to activemq-client/src/main/java/org/apache/activemq/util/DataByteArrayInputStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayOutputStream.java b/activemq-client/src/main/java/org/apache/activemq/util/DataByteArrayOutputStream.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayOutputStream.java rename to activemq-client/src/main/java/org/apache/activemq/util/DataByteArrayOutputStream.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/FactoryFinder.java b/activemq-client/src/main/java/org/apache/activemq/util/FactoryFinder.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/FactoryFinder.java rename to activemq-client/src/main/java/org/apache/activemq/util/FactoryFinder.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/IOExceptionSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/IOExceptionSupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/IOExceptionSupport.java rename to activemq-client/src/main/java/org/apache/activemq/util/IOExceptionSupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/IdGenerator.java b/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/IdGenerator.java rename to activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/IndentPrinter.java b/activemq-client/src/main/java/org/apache/activemq/util/IndentPrinter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/IndentPrinter.java rename to activemq-client/src/main/java/org/apache/activemq/util/IndentPrinter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/InetAddressUtil.java b/activemq-client/src/main/java/org/apache/activemq/util/InetAddressUtil.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/InetAddressUtil.java rename to activemq-client/src/main/java/org/apache/activemq/util/InetAddressUtil.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/IntSequenceGenerator.java b/activemq-client/src/main/java/org/apache/activemq/util/IntSequenceGenerator.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/IntSequenceGenerator.java rename to activemq-client/src/main/java/org/apache/activemq/util/IntSequenceGenerator.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/IntrospectionSupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java rename to activemq-client/src/main/java/org/apache/activemq/util/IntrospectionSupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java rename to activemq-client/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/LRUCache.java b/activemq-client/src/main/java/org/apache/activemq/util/LRUCache.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/LRUCache.java rename to activemq-client/src/main/java/org/apache/activemq/util/LRUCache.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/LongSequenceGenerator.java b/activemq-client/src/main/java/org/apache/activemq/util/LongSequenceGenerator.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/LongSequenceGenerator.java rename to activemq-client/src/main/java/org/apache/activemq/util/LongSequenceGenerator.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/MapHelper.java b/activemq-client/src/main/java/org/apache/activemq/util/MapHelper.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/MapHelper.java rename to activemq-client/src/main/java/org/apache/activemq/util/MapHelper.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java rename to activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ServiceListener.java b/activemq-client/src/main/java/org/apache/activemq/util/ServiceListener.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/ServiceListener.java rename to activemq-client/src/main/java/org/apache/activemq/util/ServiceListener.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ServiceStopper.java b/activemq-client/src/main/java/org/apache/activemq/util/ServiceStopper.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/ServiceStopper.java rename to activemq-client/src/main/java/org/apache/activemq/util/ServiceStopper.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ServiceSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/ServiceSupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/ServiceSupport.java rename to activemq-client/src/main/java/org/apache/activemq/util/ServiceSupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/StopWatch.java b/activemq-client/src/main/java/org/apache/activemq/util/StopWatch.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/StopWatch.java rename to activemq-client/src/main/java/org/apache/activemq/util/StopWatch.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/StringArrayConverter.java b/activemq-client/src/main/java/org/apache/activemq/util/StringArrayConverter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/StringArrayConverter.java rename to activemq-client/src/main/java/org/apache/activemq/util/StringArrayConverter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java b/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java rename to activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java b/activemq-client/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java rename to activemq-client/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/TimeUtils.java b/activemq-client/src/main/java/org/apache/activemq/util/TimeUtils.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/TimeUtils.java rename to activemq-client/src/main/java/org/apache/activemq/util/TimeUtils.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/TypeConversionSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/TypeConversionSupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/TypeConversionSupport.java rename to activemq-client/src/main/java/org/apache/activemq/util/TypeConversionSupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/util/URISupport.java b/activemq-client/src/main/java/org/apache/activemq/util/URISupport.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/util/URISupport.java rename to activemq-client/src/main/java/org/apache/activemq/util/URISupport.java diff --git a/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java b/activemq-client/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java rename to activemq-client/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java diff --git a/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java b/activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormat.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java rename to activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormat.java diff --git a/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java b/activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java rename to activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java diff --git a/activemq-core/src/main/java/org/apache/activemq/wireformat/package.html b/activemq-client/src/main/java/org/apache/activemq/wireformat/package.html similarity index 100% rename from activemq-core/src/main/java/org/apache/activemq/wireformat/package.html rename to activemq-client/src/main/java/org/apache/activemq/wireformat/package.html diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/failover b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/failover similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/failover rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/failover diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/mock b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/mock similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/mock rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/mock diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio+ssl b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio+ssl similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio+ssl rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio+ssl diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/udp b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/udp similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/udp rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/udp diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default b/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default rename to activemq-client/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java b/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java similarity index 100% rename from activemq-core/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java rename to activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java diff --git a/activemq-core/src/test/java/org/apache/activemq/util/BitArrayBinTest.java b/activemq-client/src/test/java/org/apache/activemq/util/BitArrayBinTest.java similarity index 100% rename from activemq-core/src/test/java/org/apache/activemq/util/BitArrayBinTest.java rename to activemq-client/src/test/java/org/apache/activemq/util/BitArrayBinTest.java diff --git a/activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java b/activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java similarity index 100% rename from activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java rename to activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java diff --git a/activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java b/activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java similarity index 100% rename from activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java rename to activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java diff --git a/activemq-core/src/test/java/org/apache/activemq/util/LRUCacheTest.java b/activemq-client/src/test/java/org/apache/activemq/util/LRUCacheTest.java similarity index 100% rename from activemq-core/src/test/java/org/apache/activemq/util/LRUCacheTest.java rename to activemq-client/src/test/java/org/apache/activemq/util/LRUCacheTest.java diff --git a/activemq-core/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java b/activemq-client/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java similarity index 100% rename from activemq-core/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java rename to activemq-client/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java b/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java index 150e469319..14e81970b3 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java @@ -17,7 +17,6 @@ package org.apache.activemq.console.command.store.amq.reader; import java.util.Iterator; -import javax.jms.InvalidSelectorException; import javax.jms.Message; import org.apache.activemq.broker.region.MessageReference; import org.apache.activemq.filter.BooleanExpression; diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml index 0a41ebbc13..ecc3de2a7d 100755 --- a/activemq-core/pom.xml +++ b/activemq-core/pom.xml @@ -95,6 +95,10 @@ org.fusesource.mqtt-client mqtt-client + + org.apache.activemq + activemq-client + @@ -551,57 +555,6 @@ - - org.codehaus.mojo - javacc-maven-plugin - - - generate-sources - - ${basedir}/src/main/grammar - ${basedir}/target/generated-javacc - org.apache.activemq.selector - - - javacc - - - - - - org.codehaus.mojo cobertura-maven-plugin diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java b/activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java index bda5e936cc..8a56e87d93 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java @@ -16,7 +16,6 @@ */ package org.apache.activemq.broker; -import org.apache.activemq.broker.Locker; import org.apache.activemq.util.ServiceSupport; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java index ea473fb4f6..bc0d4725f8 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java @@ -48,7 +48,7 @@ import org.apache.activemq.store.PersistenceAdapterFactory; import org.apache.activemq.store.memory.MemoryPersistenceAdapter; import org.apache.activemq.thread.Scheduler; import org.apache.activemq.thread.TaskRunnerFactory; -import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportFactorySupport; import org.apache.activemq.transport.TransportServer; import org.apache.activemq.transport.stomp.ProtocolConverter; import org.apache.activemq.transport.vm.VMTransportFactory; @@ -2203,7 +2203,7 @@ public class BrokerService implements Service { } protected TransportConnector createTransportConnector(URI brokerURI) throws Exception { - TransportServer transport = TransportFactory.bind(this, brokerURI); + TransportServer transport = TransportFactorySupport.bind(this, brokerURI); return new TransportConnector(transport); } diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java b/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java index 0e7b831111..834f663e14 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java @@ -26,6 +26,7 @@ import javax.net.ssl.KeyManager; import javax.net.ssl.TrustManager; import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportFactorySupport; import org.apache.activemq.transport.TransportServer; import org.apache.activemq.transport.tcp.SslTransportFactory; @@ -101,7 +102,7 @@ public class SslBrokerService extends BrokerService { } else { // Else, business as usual. - return TransportFactory.bind(this, brokerURI); + return TransportFactorySupport.bind(this, brokerURI); } } } diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java index 88f4579b62..2cfb7e0df9 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java @@ -33,10 +33,7 @@ import org.apache.activemq.command.BrokerInfo; import org.apache.activemq.command.ConnectionControl; import org.apache.activemq.security.MessageAuthorizationPolicy; import org.apache.activemq.thread.TaskRunnerFactory; -import org.apache.activemq.transport.Transport; -import org.apache.activemq.transport.TransportAcceptListener; -import org.apache.activemq.transport.TransportFactory; -import org.apache.activemq.transport.TransportServer; +import org.apache.activemq.transport.*; import org.apache.activemq.transport.discovery.DiscoveryAgent; import org.apache.activemq.transport.discovery.DiscoveryAgentFactory; import org.apache.activemq.util.ServiceStopper; @@ -307,7 +304,7 @@ public class TransportConnector implements Connector, BrokerServiceAware { throw new IllegalArgumentException( "You must specify the brokerService property. Maybe this connector should be added to a broker?"); } - return TransportFactory.bind(brokerService, uri); + return TransportFactorySupport.bind(brokerService, uri); } public DiscoveryAgent getDiscoveryAgent() throws IOException { diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java index 581784e8fc..e0b3c5c4c1 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java @@ -176,7 +176,8 @@ public abstract class AbstractSubscription implements Subscription { boolean result = false; MessageEvaluationContext msgContext = context.getMessageEvaluationContext(); try { - msgContext.setDestination(message.getRegionDestination().getActiveMQDestination()); + Destination regionDestination = (Destination) message.getRegionDestination(); + msgContext.setDestination(regionDestination.getActiveMQDestination()); msgContext.setMessageReference(message); result = matches(message, msgContext); if (result) { diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java index 55e2c6ef94..66f106c004 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java @@ -37,7 +37,7 @@ import org.apache.activemq.usage.Usage; /** * */ -public interface Destination extends Service, Task { +public interface Destination extends Service, Task, Message.MessageDestination { public static final DeadLetterStrategy DEFAULT_DEAD_LETTER_STRATEGY = new SharedDeadLetterStrategy(); public static final long DEFAULT_BLOCKED_PRODUCER_WARNING_INTERVAL = 30000; diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java index 9039525b79..0c042d924f 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java @@ -91,7 +91,8 @@ public class DurableTopicSubscription extends PrefetchSubscription implements Us MessageAck ack = new MessageAck(); ack.setAckType(MessageAck.UNMATCHED_ACK_TYPE); ack.setMessageID(node.getMessageId()); - node.getRegionDestination().acknowledge(this.getContext(), this, ack, node); + Destination regionDestination = (Destination) node.getRegionDestination(); + regionDestination.acknowledge(this.getContext(), this, ack, node); } @Override @@ -284,7 +285,8 @@ public class DurableTopicSubscription extends PrefetchSubscription implements Us } protected void acknowledge(ConnectionContext context, MessageAck ack, MessageReference node) throws IOException { - node.getRegionDestination().acknowledge(context, this, ack, node); + Destination regionDestination = (Destination) node.getRegionDestination(); + regionDestination.acknowledge(context, this, ack, node); redeliveredMessages.remove(node.getMessageId()); node.decrementReferenceCount(); } diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java index 131974c621..d698e35fa3 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java @@ -114,7 +114,7 @@ public class IndirectMessageReference implements QueueMessageReference { return message.getMessageId(); } - public Destination getRegionDestination() { + public Message.MessageDestination getRegionDestination() { return message.getRegionDestination(); } diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java index 530e0a833e..cd88a6a0af 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java @@ -220,7 +220,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription { // Don't remove the nodes until we are committed. if (!context.isInTransaction()) { dequeueCounter++; - node.getRegionDestination().getDestinationStatistics().getInflight().decrement(); + ((Destination)node.getRegionDestination()).getDestinationStatistics().getInflight().decrement(); removeList.add(node); } else { registerRemoveSync(context, node); @@ -248,7 +248,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription { } } } - destination = node.getRegionDestination(); + destination = (Destination) node.getRegionDestination(); callDispatchMatched = true; break; } @@ -272,7 +272,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription { // Don't remove the nodes until we are committed - immediateAck option if (!context.isInTransaction()) { dequeueCounter++; - node.getRegionDestination().getDestinationStatistics().getInflight().decrement(); + ((Destination)node.getRegionDestination()).getDestinationStatistics().getInflight().decrement(); dispatched.remove(node); } else { registerRemoveSync(context, node); @@ -287,7 +287,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription { } } acknowledge(context, ack, node); - destination = node.getRegionDestination(); + destination = (Destination) node.getRegionDestination(); callDispatchMatched = true; break; } @@ -298,12 +298,14 @@ public abstract class PrefetchSubscription extends AbstractSubscription { int index = 0; for (Iterator iter = dispatched.iterator(); iter.hasNext(); index++) { final MessageReference node = iter.next(); + Destination nodeDest = (Destination) node.getRegionDestination(); if (node.isExpired()) { if (broker.isExpired(node)) { - node.getRegionDestination().messageExpired(context, this, node); + Destination regionDestination = (Destination) nodeDest; + regionDestination.messageExpired(context, this, node); } iter.remove(); - node.getRegionDestination().getDestinationStatistics().getInflight().decrement(); + nodeDest.getDestinationStatistics().getInflight().decrement(); } if (ack.getLastMessageId().equals(node.getMessageId())) { if (usePrefetchExtension) { @@ -315,7 +317,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription { } } } - destination = node.getRegionDestination(); + destination = nodeDest; callDispatchMatched = true; break; } @@ -337,7 +339,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription { } if (inAckRange) { if (ack.getLastMessageId().equals(messageId)) { - destination = node.getRegionDestination(); + destination = (Destination) node.getRegionDestination(); callDispatchMatched = true; break; } @@ -371,7 +373,8 @@ public abstract class PrefetchSubscription extends AbstractSubscription { ack.getPoisonCause().toString()); } sendToDLQ(context, node); - node.getRegionDestination().getDestinationStatistics() + Destination nodeDest = (Destination) node.getRegionDestination(); + nodeDest.getDestinationStatistics() .getInflight().decrement(); removeList.add(node); dequeueCounter++; @@ -385,7 +388,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription { break; } } - destination = node.getRegionDestination(); + destination = nodeDest; callDispatchMatched = true; break; } @@ -426,12 +429,13 @@ public abstract class PrefetchSubscription extends AbstractSubscription { @Override public void afterCommit() throws Exception { + Destination nodeDest = (Destination) node.getRegionDestination(); synchronized(dispatchLock) { dequeueCounter++; dispatched.remove(node); - node.getRegionDestination().getDestinationStatistics().getInflight().decrement(); + nodeDest.getDestinationStatistics().getInflight().decrement(); } - node.getRegionDestination().wakeup(); + nodeDest.wakeup(); dispatchPending(); } @@ -439,7 +443,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription { public void afterRollback() throws Exception { synchronized(dispatchLock) { if (isSlave()) { - node.getRegionDestination().getDestinationStatistics().getInflight().decrement(); + ((Destination)node.getRegionDestination()).getDestinationStatistics().getInflight().decrement(); } else { // poisionAck will decrement - otherwise still inflight on client } @@ -637,7 +641,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription { //increment number to dispatch numberToDispatch++; if (broker.isExpired(node)) { - node.getRegionDestination().messageExpired(context, this, node); + ((Destination)node.getRegionDestination()).messageExpired(context, this, node); } continue; } @@ -712,10 +716,11 @@ public abstract class PrefetchSubscription extends AbstractSubscription { } protected void onDispatch(final MessageReference node, final Message message) { - if (node.getRegionDestination() != null) { + Destination nodeDest = (Destination) node.getRegionDestination(); + if (nodeDest != null) { if (node != QueueMessageReference.NULL_MESSAGE) { - node.getRegionDestination().getDestinationStatistics().getDispatched().increment(); - node.getRegionDestination().getDestinationStatistics().getInflight().increment(); + nodeDest.getDestinationStatistics().getDispatched().increment(); + nodeDest.getDestinationStatistics().getInflight().increment(); if (LOG.isTraceEnabled()) { LOG.trace(info.getConsumerId() + " dispatched: " + message.getMessageId() + " - " + message.getDestination() + ", dispatched: " + dispatchCounter + ", inflight: " + dispatched.size()); @@ -759,7 +764,8 @@ public abstract class PrefetchSubscription extends AbstractSubscription { md.setMessage(null); md.setDestination(null); } else { - md.setDestination(node.getRegionDestination().getActiveMQDestination()); + Destination regionDestination = (Destination) node.getRegionDestination(); + md.setDestination(regionDestination.getActiveMQDestination()); md.setMessage(message); md.setRedeliveryCounter(node.getRedeliveryCounter()); } diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java index 4b9d030a11..c73d9601e4 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java @@ -16,17 +16,8 @@ */ package org.apache.activemq.broker.region; -import java.io.IOException; -import java.util.List; - -import javax.jms.JMSException; - -import org.apache.activemq.broker.region.group.MessageGroupMap; import org.apache.activemq.broker.region.policy.SimpleDispatchSelector; import org.apache.activemq.command.ActiveMQDestination; -import org.apache.activemq.command.ActiveMQMessage; -import org.apache.activemq.command.ConsumerId; -import org.apache.activemq.command.Message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java index 40a4f70e1f..0bb9ade652 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java @@ -45,7 +45,7 @@ public class QueueSubscription extends PrefetchSubscription implements LockOwner * @throws IOException */ protected void acknowledge(final ConnectionContext context, final MessageAck ack, final MessageReference n) throws IOException { - final Destination q = n.getRegionDestination(); + final Destination q = (Destination) n.getRegionDestination(); final QueueMessageReference node = (QueueMessageReference)n; final Queue queue = (Queue)q; diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java index e521d4b11f..e89856f6f0 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java @@ -665,7 +665,7 @@ public class RegionBroker extends EmptyBroker { message.setBrokerOutTime(endTime); if (getBrokerService().isEnableStatistics()) { long totalTime = endTime - message.getBrokerInTime(); - message.getRegionDestination().getDestinationStatistics().getProcessTime().addTime(totalTime); + ((Destination)message.getRegionDestination()).getDestinationStatistics().getProcessTime().addTime(totalTime); } } } @@ -805,8 +805,8 @@ public class RegionBroker extends EmptyBroker { if(node!=null){ Message message=node.getMessage(); if(message!=null && node.getRegionDestination()!=null){ - DeadLetterStrategy deadLetterStrategy=node - .getRegionDestination().getDeadLetterStrategy(); + DeadLetterStrategy deadLetterStrategy=((Destination)node + .getRegionDestination()).getDeadLetterStrategy(); if(deadLetterStrategy!=null){ if(deadLetterStrategy.isSendToDeadLetterQueue(message)){ // message may be inflight to other subscriptions so do not modify diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java index 17e934ff21..413e1e0d52 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java @@ -223,7 +223,7 @@ public class TopicSubscription extends AbstractSubscription { matched.remove(); dispatchedCounter.incrementAndGet(); node.decrementReferenceCount(); - node.getRegionDestination().getDestinationStatistics().getExpired().increment(); + ((Destination)node.getRegionDestination()).getDestinationStatistics().getExpired().increment(); broker.messageExpired(getContext(), node, this); break; } @@ -549,12 +549,12 @@ public class TopicSubscription extends AbstractSubscription { md.setMessage(message); md.setConsumerId(info.getConsumerId()); if (node != null) { - md.setDestination(node.getRegionDestination().getActiveMQDestination()); + md.setDestination(((Destination)node.getRegionDestination()).getActiveMQDestination()); dispatchedCounter.incrementAndGet(); // Keep track if this subscription is receiving messages from a single destination. if (singleDestination) { if (destination == null) { - destination = node.getRegionDestination(); + destination = (Destination)node.getRegionDestination(); } else { if (destination != node.getRegionDestination()) { singleDestination = false; @@ -567,8 +567,9 @@ public class TopicSubscription extends AbstractSubscription { md.setTransmitCallback(new Runnable() { @Override public void run() { - node.getRegionDestination().getDestinationStatistics().getDispatched().increment(); - node.getRegionDestination().getDestinationStatistics().getInflight().increment(); + Destination regionDestination = (Destination) node.getRegionDestination(); + regionDestination.getDestinationStatistics().getDispatched().increment(); + regionDestination.getDestinationStatistics().getInflight().increment(); node.decrementReferenceCount(); } }); @@ -577,8 +578,9 @@ public class TopicSubscription extends AbstractSubscription { } else { context.getConnection().dispatchSync(md); if (node != null) { - node.getRegionDestination().getDestinationStatistics().getDispatched().increment(); - node.getRegionDestination().getDestinationStatistics().getInflight().increment(); + Destination regionDestination = (Destination) node.getRegionDestination(); + regionDestination.getDestinationStatistics().getDispatched().increment(); + regionDestination.getDestinationStatistics().getInflight().increment(); node.decrementReferenceCount(); } } @@ -594,7 +596,7 @@ public class TopicSubscription extends AbstractSubscription { if (LOG.isDebugEnabled()) { LOG.debug(this + ", discarding message " + message); } - Destination dest = message.getRegionDestination(); + Destination dest = (Destination) message.getRegionDestination(); if (dest != null) { dest.messageDiscarded(getContext(), this, message); } diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java index 6b1dc5a46c..927c230c2b 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java @@ -206,7 +206,7 @@ public class FilePendingMessageCursor extends AbstractPendingMessageCursor imple public synchronized boolean tryAddMessageLast(MessageReference node, long maxWaitTime) throws Exception { if (!node.isExpired()) { try { - regionDestination = node.getMessage().getRegionDestination(); + regionDestination = (Destination) node.getMessage().getRegionDestination(); if (isDiskListEmpty()) { if (hasSpace() || this.store == null) { memoryList.addMessageLast(node); @@ -254,7 +254,7 @@ public class FilePendingMessageCursor extends AbstractPendingMessageCursor imple public synchronized void addMessageFirst(MessageReference node) { if (!node.isExpired()) { try { - regionDestination = node.getMessage().getRegionDestination(); + regionDestination = (Destination) node.getMessage().getRegionDestination(); if (isDiskListEmpty()) { if (hasSpace()) { memoryList.addMessageFirst(node); @@ -473,7 +473,7 @@ public class FilePendingMessageCursor extends AbstractPendingMessageCursor imple if (broker.isExpired(reference)) { ConnectionContext context = new ConnectionContext(new NonCachedMessageEvaluationContext()); context.setBroker(broker); - reference.getRegionDestination().messageExpired(context, null, new IndirectMessageReference(reference.getMessage())); + ((Destination)reference.getRegionDestination()).messageExpired(context, null, new IndirectMessageReference(reference.getMessage())); } } diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java index 11d0d00cd3..608b88123b 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java @@ -192,7 +192,7 @@ public class StoreDurableSubscriberCursor extends AbstractPendingMessageCursor { } } if (msg.isPersistent()) { - Destination dest = msg.getRegionDestination(); + Destination dest = (Destination) msg.getRegionDestination(); TopicStorePrefetch tsp = topics.get(dest); if (tsp != null) { tsp.addMessageLast(node); @@ -225,7 +225,7 @@ public class StoreDurableSubscriberCursor extends AbstractPendingMessageCursor { if (!msg.isPersistent()) { nonPersistent.addMessageFirst(node); } else { - Destination dest = msg.getRegionDestination(); + Destination dest = (Destination) msg.getRegionDestination(); TopicStorePrefetch tsp = topics.get(dest); if (tsp != null) { tsp.addMessageFirst(node); diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java index f41b19932c..b2595a1bee 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java @@ -17,9 +17,6 @@ package org.apache.activemq.broker.region.policy; import org.apache.activemq.ActiveMQMessageAudit; -import org.apache.activemq.broker.region.MessageReference; -import org.apache.activemq.broker.region.Subscription; -import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.Message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java index 806aaae1ed..c624330707 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java @@ -16,7 +16,6 @@ */ package org.apache.activemq.broker.region.policy; -import org.apache.activemq.broker.region.MessageReference; import org.apache.activemq.broker.region.Subscription; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.Message; diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java index c3e1b79ddc..7b5dd77173 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java @@ -16,6 +16,7 @@ */ package org.apache.activemq.broker.region.policy; +import org.apache.activemq.broker.region.Destination; import org.apache.activemq.broker.region.DurableTopicSubscription; import org.apache.activemq.broker.region.Subscription; import org.apache.activemq.command.ActiveMQDestination; @@ -142,11 +143,12 @@ public class IndividualDeadLetterStrategy extends AbstractDeadLetterStrategy { Subscription subscription ) { String name = null; - if (message.getRegionDestination() != null - && message.getRegionDestination().getActiveMQDestination() != null - && message.getRegionDestination().getActiveMQDestination().getPhysicalName() != null - && !message.getRegionDestination().getActiveMQDestination().getPhysicalName().isEmpty()){ - name = prefix + message.getRegionDestination().getActiveMQDestination().getPhysicalName(); + Destination regionDestination = (Destination) message.getRegionDestination(); + if (regionDestination != null + && regionDestination.getActiveMQDestination() != null + && regionDestination.getActiveMQDestination().getPhysicalName() != null + && !regionDestination.getActiveMQDestination().getPhysicalName().isEmpty()){ + name = prefix + regionDestination.getActiveMQDestination().getPhysicalName(); } else { name = prefix + message.getDestination().getPhysicalName(); } diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java index dd41e0a9ea..cb044e5a26 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java @@ -21,7 +21,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java b/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java index 0da5990591..59b7857bf5 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java @@ -28,7 +28,6 @@ import javax.jms.Session; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.Service; import org.apache.activemq.advisory.AdvisorySupport; -import org.apache.activemq.util.ServiceStopper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java b/activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java index 04244b548b..0bcb9ff3ac 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java @@ -23,6 +23,7 @@ import org.apache.activemq.broker.Broker; import org.apache.activemq.broker.BrokerPluginSupport; import org.apache.activemq.broker.ConnectionContext; import org.apache.activemq.broker.ProducerBrokerExchange; +import org.apache.activemq.broker.region.Destination; import org.apache.activemq.broker.region.MessageReference; import org.apache.activemq.broker.region.Subscription; import org.apache.activemq.broker.region.policy.RedeliveryPolicyMap; @@ -33,7 +34,6 @@ import org.apache.activemq.command.Message; import org.apache.activemq.command.ProducerInfo; import org.apache.activemq.filter.AnyDestination; import org.apache.activemq.state.ProducerState; -import org.apache.activemq.util.BrokerSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -132,7 +132,8 @@ public class RedeliveryPlugin extends BrokerPluginSupport { super.sendToDeadLetterQueue(context, messageReference, subscription); } else { try { - final RedeliveryPolicy redeliveryPolicy = redeliveryPolicyMap.getEntryFor(messageReference.getRegionDestination().getActiveMQDestination()); + Destination regionDestination = (Destination) messageReference.getRegionDestination(); + final RedeliveryPolicy redeliveryPolicy = redeliveryPolicyMap.getEntryFor(regionDestination.getActiveMQDestination()); if (redeliveryPolicy != null) { int redeliveryCount = messageReference.getRedeliveryCounter(); if (redeliveryCount < redeliveryPolicy.getMaximumRedeliveries()) { @@ -150,7 +151,7 @@ public class RedeliveryPlugin extends BrokerPluginSupport { } else if (isFallbackToDeadLetter()) { super.sendToDeadLetterQueue(context, messageReference, subscription); } else { - LOG.debug("Ignoring dlq request for:" + messageReference.getMessageId() + ", RedeliveryPolicy not found (and no fallback) for: " + messageReference.getRegionDestination().getActiveMQDestination()); + LOG.debug("Ignoring dlq request for:" + messageReference.getMessageId() + ", RedeliveryPolicy not found (and no fallback) for: " + regionDestination.getActiveMQDestination()); } } catch (Exception exception) { // abort the ack, will be effective if client use transactions or individual ack with sync send @@ -163,8 +164,9 @@ public class RedeliveryPlugin extends BrokerPluginSupport { private void scheduleRedelivery(ConnectionContext context, MessageReference messageReference, long delay, int redeliveryCount) throws Exception { if (LOG.isTraceEnabled()) { + Destination regionDestination = (Destination) messageReference.getRegionDestination(); LOG.trace("redelivery #" + redeliveryCount + " of: " + messageReference.getMessageId() + " with delay: " - + delay + ", dest: " + messageReference.getRegionDestination().getActiveMQDestination()); + + delay + ", dest: " + regionDestination.getActiveMQDestination()); } final Message old = messageReference.getMessage(); Message message = old.copy(); diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java b/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java index abba376bef..372b8fde5f 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java @@ -18,6 +18,7 @@ package org.apache.activemq.broker.util; import org.apache.activemq.broker.BrokerPluginSupport; import org.apache.activemq.broker.ProducerBrokerExchange; +import org.apache.activemq.broker.region.Destination; import org.apache.activemq.broker.region.policy.DeadLetterStrategy; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQMessage; @@ -136,13 +137,14 @@ public class TimeStampingBrokerPlugin extends BrokerPluginSupport { DeadLetterStrategy deadLetterStrategy; Message tmp; - if (message != null && message.getRegionDestination() != null) { - deadLetterStrategy = message.getRegionDestination().getDeadLetterStrategy(); + Destination regionDestination = (Destination) message.getRegionDestination(); + if (message != null && regionDestination != null) { + deadLetterStrategy = regionDestination.getDeadLetterStrategy(); if (deadLetterStrategy != null) { // Cheap copy, since we only need two fields tmp = new ActiveMQMessage(); tmp.setDestination(message.getOriginalDestination()); - tmp.setRegionDestination(message.getRegionDestination()); + tmp.setRegionDestination(regionDestination); // Determine if we are headed for a DLQ ActiveMQDestination deadLetterDestination = deadLetterStrategy.getDeadLetterQueueFor(tmp, null); diff --git a/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java b/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java index cbc167499c..0c67a7ce06 100644 --- a/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java +++ b/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java @@ -23,8 +23,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.activemq.thread.Scheduler; -import org.apache.activemq.util.ByteSequence; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java b/activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java index fbeaea8e96..c0db3e329f 100644 --- a/activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java @@ -18,6 +18,7 @@ package org.apache.activemq.network; import java.util.List; +import org.apache.activemq.broker.region.Destination; import org.apache.activemq.broker.region.Subscription; import org.apache.activemq.command.BrokerId; import org.apache.activemq.command.ConsumerInfo; @@ -131,7 +132,8 @@ public class ConditionalNetworkBridgeFilterFactory implements NetworkBridgeFilte } private boolean hasNoLocalConsumers(final Message message, final MessageEvaluationContext mec) { - List consumers = mec.getMessageReference().getRegionDestination().getConsumers(); + Destination regionDestination = (Destination) mec.getMessageReference().getRegionDestination(); + List consumers = regionDestination.getConsumers(); for (Subscription sub : consumers) { if (!sub.getConsumerInfo().isNetworkSubscription() && !sub.getConsumerInfo().isBrowser()) { if (LOG.isTraceEnabled()) { diff --git a/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java index 21402df81d..2e41ad1e6f 100644 --- a/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.io.RandomAccessFile; import java.nio.channels.FileLock; import java.util.Date; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; diff --git a/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java index d4e7f42042..08276d3789 100755 --- a/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java @@ -40,7 +40,6 @@ import org.apache.activemq.store.PersistenceAdapter; import org.apache.activemq.store.AbstractMessageStore; import org.apache.activemq.transaction.Synchronization; import org.apache.activemq.usage.MemoryUsage; -import org.apache.activemq.usage.SystemUsage; import org.apache.activemq.util.Callback; import org.apache.activemq.util.TransactionTemplate; import org.slf4j.Logger; diff --git a/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java index a239721a7d..7fc10bd174 100755 --- a/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java @@ -25,10 +25,7 @@ import org.apache.activemq.command.MessageId; import org.apache.activemq.kaha.MapContainer; import org.apache.activemq.kaha.StoreEntry; import org.apache.activemq.store.MessageRecoveryListener; -import org.apache.activemq.store.MessageStore; import org.apache.activemq.store.AbstractMessageStore; -import org.apache.activemq.usage.MemoryUsage; -import org.apache.activemq.usage.SystemUsage; /** * An implementation of {@link org.apache.activemq.store.MessageStore} which diff --git a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/scheduler/JobImpl.java b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/scheduler/JobImpl.java index 46c9929190..ae291a32cb 100644 --- a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/scheduler/JobImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/scheduler/JobImpl.java @@ -16,10 +16,6 @@ */ package org.apache.activemq.store.kahadb.scheduler; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; - import org.apache.activemq.broker.scheduler.Job; import org.apache.activemq.broker.scheduler.JobSupport; import org.apache.activemq.util.ByteSequence; diff --git a/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java index db6d0dc696..5ad6a32007 100755 --- a/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java @@ -29,10 +29,7 @@ import org.apache.activemq.command.Message; import org.apache.activemq.command.MessageAck; import org.apache.activemq.command.MessageId; import org.apache.activemq.store.MessageRecoveryListener; -import org.apache.activemq.store.MessageStore; import org.apache.activemq.store.AbstractMessageStore; -import org.apache.activemq.usage.MemoryUsage; -import org.apache.activemq.usage.SystemUsage; /** * An implementation of {@link org.apache.activemq.store.MessageStore} which diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java new file mode 100644 index 0000000000..f88b670225 --- /dev/null +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java @@ -0,0 +1,30 @@ +package org.apache.activemq.transport; + +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.BrokerServiceAware; +import org.apache.activemq.broker.SslContext; + +import java.io.IOException; +import java.net.URI; + +/** + * @author Hiram Chirino + */ +public class TransportFactorySupport { + + public static TransportServer bind(BrokerService brokerService, URI location) throws IOException { + TransportFactory tf = TransportFactory.findTransportFactory(location); + if( brokerService!=null && tf instanceof BrokerServiceAware) { + ((BrokerServiceAware)tf).setBrokerService(brokerService); + } + try { + if( brokerService!=null ) { + SslContext.setCurrentSslContext(brokerService.getSslContext()); + } + return tf.doBind(location); + } finally { + SslContext.setCurrentSslContext(null); + } + } + +} diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java new file mode 100644 index 0000000000..0c40262c3d --- /dev/null +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java @@ -0,0 +1,20 @@ +package org.apache.activemq.transport; + +import org.apache.activemq.TransportLoggerSupport; + +import java.io.IOException; + +/** + * @author Hiram Chirino + */ +public class TransportLoggerFactorySPI implements TransportLoggerSupport.SPI { + @Override + public Transport createTransportLogger(Transport transport) throws IOException { + return TransportLoggerFactory.getInstance().createTransportLogger(transport); + } + + @Override + public Transport createTransportLogger(Transport transport, String logWriterName, boolean dynamicManagement, boolean startLogging, int jmxPort) throws IOException { + return TransportLoggerFactory.getInstance().createTransportLogger(transport, logWriterName, dynamicManagement, startLogging, jmxPort); + } +} diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java index b034e085df..9abee5de74 100644 --- a/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * * @author David Martin Clavo david(dot)martin(dot)clavo(at)gmail.com * - * @see TransportLoggerViewMBean. + * @see TransportLoggerViewMBean */ public class TransportLoggerView implements TransportLoggerViewMBean { diff --git a/activemq-core/src/test/java/org/apache/activemq/RemoveDestinationTest.java b/activemq-core/src/test/java/org/apache/activemq/RemoveDestinationTest.java index 292470feaf..2c0f688890 100644 --- a/activemq-core/src/test/java/org/apache/activemq/RemoveDestinationTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/RemoveDestinationTest.java @@ -28,7 +28,6 @@ import javax.jms.Topic; import javax.jms.TextMessage; import javax.management.ObjectName; -import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.advisory.DestinationSource; import org.apache.activemq.broker.BrokerFactory; import org.apache.activemq.broker.BrokerService; diff --git a/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java b/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java index 4d6875ec9b..72da777c85 100644 --- a/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java @@ -28,7 +28,6 @@ import javax.jms.MessageListener; import javax.jms.Session; import org.apache.activemq.EmbeddedBrokerTestSupport; -import org.apache.activemq.ReconnectWithSameClientIDTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/Main.java b/activemq-core/src/test/java/org/apache/activemq/broker/Main.java index d73b85000d..9e1fa5e878 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/Main.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/Main.java @@ -17,7 +17,6 @@ package org.apache.activemq.broker; import javax.jms.Connection; -import javax.jms.MessageConsumer; import javax.jms.Session; import org.apache.activemq.ActiveMQConnectionFactory; diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java index 4bb6a7c624..c65dc53931 100755 --- a/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java @@ -30,10 +30,6 @@ import org.apache.activemq.command.ProducerInfo; import org.apache.activemq.command.RemoveInfo; import org.apache.activemq.command.SessionInfo; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; - public class AdvisoryBrokerTest extends BrokerTestSupport { public void testConnectionAdvisories() throws Exception { diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java index 90d7283566..1cf318dce5 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java @@ -16,12 +16,10 @@ */ package org.apache.activemq.broker.advisory; -import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.EmbeddedBrokerTestSupport; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.jmx.BrokerViewMBean; import org.apache.activemq.broker.jmx.ManagementContext; -import org.apache.activemq.broker.jmx.QueueViewMBean; import org.apache.activemq.command.ActiveMQMessage; import org.apache.activemq.command.DestinationInfo; diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java index bbc87a5bd6..7c5373099f 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java @@ -32,7 +32,6 @@ import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.region.policy.PolicyEntry; import org.apache.activemq.broker.region.policy.PolicyMap; import org.apache.activemq.command.ActiveMQDestination; -import org.apache.activemq.command.ActiveMQQueue; /** * diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java index 22609f6627..4ac6bcdd7b 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java @@ -47,7 +47,6 @@ import org.apache.activemq.filter.MessageEvaluationContext; import org.apache.activemq.state.ProducerState; import org.apache.activemq.store.MessageStore; import org.apache.activemq.store.PersistenceAdapter; -import org.apache.activemq.thread.TaskRunnerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueOptimizedDispatchExceptionTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueOptimizedDispatchExceptionTest.java index bf9d8ef2e5..0db12d98fc 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueOptimizedDispatchExceptionTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueOptimizedDispatchExceptionTest.java @@ -25,8 +25,6 @@ import org.apache.activemq.broker.Connection; import org.apache.activemq.broker.ConnectionContext; import org.apache.activemq.broker.Connector; import org.apache.activemq.broker.ProducerBrokerExchange; -import org.apache.activemq.broker.region.DestinationStatistics; -import org.apache.activemq.broker.region.Queue; import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQTextMessage; import org.apache.activemq.command.Command; diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTestSupport.java index 5a82b533c8..7c8951bb2c 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTestSupport.java @@ -17,18 +17,9 @@ package org.apache.activemq.broker.region.cursors; import org.apache.activemq.broker.BrokerService; -import org.apache.activemq.broker.region.Destination; -import org.apache.activemq.broker.region.DestinationStatistics; -import org.apache.activemq.broker.region.IndirectMessageReference; -import org.apache.activemq.broker.region.MessageReference; -import org.apache.activemq.broker.region.Queue; import org.apache.activemq.broker.region.QueueMessageReference; -import org.apache.activemq.command.ActiveMQMessage; -import org.apache.activemq.command.ActiveMQQueue; -import org.apache.activemq.command.MessageId; import org.apache.activemq.store.PList; import org.apache.activemq.usage.SystemUsage; -import org.apache.activemq.store.kahadb.disk.page.PageFile; import org.apache.activemq.util.ByteSequence; import org.junit.After; import org.junit.Test; diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/NegativeQueueTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/NegativeQueueTest.java index 05be4d8093..23b9e80356 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/NegativeQueueTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/NegativeQueueTest.java @@ -38,8 +38,6 @@ import javax.jms.TextMessage; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import junit.framework.TestCase; - import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.AutoFailTestSupport; import org.apache.activemq.broker.BrokerService; diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java index 4f9c641fe4..6b961cd759 100644 --- a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java +++ b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java @@ -33,8 +33,6 @@ import javax.jms.Session; import javax.jms.Topic; import javax.jms.TransactionRolledBackException; -import junit.framework.TestCase; - import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.AutoFailTestSupport; import org.apache.activemq.broker.BrokerService; diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3014Test.java b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3014Test.java index 42aed75e8f..dcd5064c6c 100644 --- a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3014Test.java +++ b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3014Test.java @@ -30,10 +30,7 @@ import org.apache.activemq.network.DiscoveryNetworkConnector; import org.apache.activemq.thread.Task; import org.apache.activemq.thread.TaskRunner; import org.apache.activemq.thread.TaskRunnerFactory; -import org.apache.activemq.transport.Transport; -import org.apache.activemq.transport.TransportFactory; -import org.apache.activemq.transport.TransportListener; -import org.apache.activemq.transport.TransportServer; +import org.apache.activemq.transport.*; import org.apache.activemq.transport.discovery.simple.SimpleDiscoveryAgent; import org.junit.After; import org.junit.Assert; @@ -61,7 +58,7 @@ public class AMQ3014Test { @Override protected TransportConnector createTransportConnector(URI brokerURI) throws Exception { - TransportServer transport = TransportFactory.bind(this, brokerURI); + TransportServer transport = TransportFactorySupport.bind(this, brokerURI); return new TransportConnector(transport) { @Override protected Connection createConnection(Transport transport) diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3903Test.java b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3903Test.java index 746897022d..90ec0a3f79 100644 --- a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3903Test.java +++ b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3903Test.java @@ -29,12 +29,9 @@ import javax.jms.Topic; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.advisory.AdvisorySupport; import org.apache.activemq.broker.BrokerService; -import org.apache.activemq.broker.region.DestinationInterceptor; import org.apache.activemq.broker.region.policy.PolicyEntry; import org.apache.activemq.broker.region.policy.PolicyMap; -import org.apache.activemq.broker.region.virtual.MirroredQueue; import org.apache.activemq.command.ActiveMQDestination; -import org.apache.activemq.util.Wait; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java b/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java index bab93090d9..ec81800d0a 100755 --- a/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java @@ -20,7 +20,6 @@ import java.io.IOException; import junit.framework.Test; -import org.apache.activemq.JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest; import org.apache.activemq.util.ByteSequence; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalImplTest.java b/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalImplTest.java index c12a5e62d7..a1bde8d127 100644 --- a/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalImplTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalImplTest.java @@ -27,7 +27,6 @@ import org.apache.activeio.journal.RecordLocation; import org.apache.activeio.packet.ByteArrayPacket; import org.apache.activeio.packet.Packet; import org.apache.activemq.kaha.impl.async.JournalFacade.RecordLocationFacade; -import org.apache.activemq.kaha.impl.async.ReadOnlyAsyncDataManager; import org.apache.activemq.util.ByteSequence; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java index 60b31a06bf..1ed11fc0bc 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java @@ -36,7 +36,6 @@ import java.util.HashSet; import java.util.Set; import org.apache.activemq.command.ActiveMQDestination; -import org.apache.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQTextMessage; import org.apache.activemq.command.BrokerId; diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java index 5761a101b5..037375cbb4 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java @@ -17,7 +17,6 @@ package org.apache.activemq.openwire.v1; import java.io.DataOutputStream; -import java.io.OutputStream; import java.util.HashMap; import java.util.Map; diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v4/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v4/MessageTestSupport.java index 07ef2ce2a5..f45b80c7d4 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/v4/MessageTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v4/MessageTestSupport.java @@ -17,11 +17,6 @@ */ package org.apache.activemq.openwire.v4; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v5/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v5/MessageTestSupport.java index 811e555f43..e5bfe05728 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/v5/MessageTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v5/MessageTestSupport.java @@ -17,11 +17,6 @@ */ package org.apache.activemq.openwire.v5; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v6/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v6/MessageTestSupport.java index fd2f608e59..863ee595c3 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/v6/MessageTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v6/MessageTestSupport.java @@ -17,11 +17,6 @@ */ package org.apache.activemq.openwire.v6; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessageTestSupport.java index e4cb89451a..a5d4f3b52c 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessageTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessageTestSupport.java @@ -1 +1 @@ -/** * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.activemq.openwire.v7; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; /** * Test case for the OpenWire marshalling for Message * * * NOTE!: This file is auto generated - do not modify! * if you need to make a change, please see the modify the groovy scripts in the * under src/gram/script and then use maven openwire:generate to regenerate * this file. * * */ public abstract class MessageTestSupport extends BaseCommandTestSupport { protected void populateObject(Object object) throws Exception { super.populateObject(object); Message info = (Message) object; info.setProducerId(createProducerId("ProducerId:1")); info.setDestination(createActiveMQDestination("Destination:2")); info.setTransactionId(createTransactionId("TransactionId:3")); info.setOriginalDestination(createActiveMQDestination("OriginalDestination:4")); info.setMessageId(createMessageId("MessageId:5")); info.setOriginalTransactionId(createTransactionId("OriginalTransactionId:6")); info.setGroupID("GroupID:7"); info.setGroupSequence(1); info.setCorrelationId("CorrelationId:8"); info.setPersistent(true); info.setExpiration(1); info.setPriority((byte) 1); info.setReplyTo(createActiveMQDestination("ReplyTo:9")); info.setTimestamp(2); info.setType("Type:10"); { byte data[] = "Content:11".getBytes(); info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length)); } { byte data[] = "MarshalledProperties:12".getBytes(); info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length)); } info.setDataStructure(createDataStructure("DataStructure:13")); info.setTargetConsumerId(createConsumerId("TargetConsumerId:14")); info.setCompressed(false); info.setRedeliveryCounter(2); { BrokerId value[] = new BrokerId[2]; for( int i=0; i < 2; i++ ) { value[i] = createBrokerId("BrokerPath:15"); } info.setBrokerPath(value); } info.setArrival(3); info.setUserID("UserID:16"); info.setRecievedByDFBridge(true); info.setDroppable(false); { BrokerId value[] = new BrokerId[2]; for( int i=0; i < 2; i++ ) { value[i] = createBrokerId("Cluster:17"); } info.setCluster(value); } info.setBrokerInTime(4); info.setBrokerOutTime(5); } } \ No newline at end of file +/** * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.activemq.openwire.v7; import org.apache.activemq.command.*; /** * Test case for the OpenWire marshalling for Message * * * NOTE!: This file is auto generated - do not modify! * if you need to make a change, please see the modify the groovy scripts in the * under src/gram/script and then use maven openwire:generate to regenerate * this file. * * */ public abstract class MessageTestSupport extends BaseCommandTestSupport { protected void populateObject(Object object) throws Exception { super.populateObject(object); Message info = (Message) object; info.setProducerId(createProducerId("ProducerId:1")); info.setDestination(createActiveMQDestination("Destination:2")); info.setTransactionId(createTransactionId("TransactionId:3")); info.setOriginalDestination(createActiveMQDestination("OriginalDestination:4")); info.setMessageId(createMessageId("MessageId:5")); info.setOriginalTransactionId(createTransactionId("OriginalTransactionId:6")); info.setGroupID("GroupID:7"); info.setGroupSequence(1); info.setCorrelationId("CorrelationId:8"); info.setPersistent(true); info.setExpiration(1); info.setPriority((byte) 1); info.setReplyTo(createActiveMQDestination("ReplyTo:9")); info.setTimestamp(2); info.setType("Type:10"); { byte data[] = "Content:11".getBytes(); info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length)); } { byte data[] = "MarshalledProperties:12".getBytes(); info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length)); } info.setDataStructure(createDataStructure("DataStructure:13")); info.setTargetConsumerId(createConsumerId("TargetConsumerId:14")); info.setCompressed(false); info.setRedeliveryCounter(2); { BrokerId value[] = new BrokerId[2]; for( int i=0; i < 2; i++ ) { value[i] = createBrokerId("BrokerPath:15"); } info.setBrokerPath(value); } info.setArrival(3); info.setUserID("UserID:16"); info.setRecievedByDFBridge(true); info.setDroppable(false); { BrokerId value[] = new BrokerId[2]; for( int i=0; i < 2; i++ ) { value[i] = createBrokerId("Cluster:17"); } info.setCluster(value); } info.setBrokerInTime(4); info.setBrokerOutTime(5); } } \ No newline at end of file diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v8/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v8/MessageTestSupport.java index 7a52a48fc7..0e3b269b50 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/v8/MessageTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v8/MessageTestSupport.java @@ -1 +1 @@ -/** * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.activemq.openwire.v8; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; /** * Test case for the OpenWire marshalling for Message * * * NOTE!: This file is auto generated - do not modify! * if you need to make a change, please see the modify the groovy scripts in the * under src/gram/script and then use maven openwire:generate to regenerate * this file. * * */ public abstract class MessageTestSupport extends BaseCommandTestSupport { protected void populateObject(Object object) throws Exception { super.populateObject(object); Message info = (Message) object; info.setProducerId(createProducerId("ProducerId:1")); info.setDestination(createActiveMQDestination("Destination:2")); info.setTransactionId(createTransactionId("TransactionId:3")); info.setOriginalDestination(createActiveMQDestination("OriginalDestination:4")); info.setMessageId(createMessageId("MessageId:5")); info.setOriginalTransactionId(createTransactionId("OriginalTransactionId:6")); info.setGroupID("GroupID:7"); info.setGroupSequence(1); info.setCorrelationId("CorrelationId:8"); info.setPersistent(true); info.setExpiration(1); info.setPriority((byte) 1); info.setReplyTo(createActiveMQDestination("ReplyTo:9")); info.setTimestamp(2); info.setType("Type:10"); { byte data[] = "Content:11".getBytes(); info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length)); } { byte data[] = "MarshalledProperties:12".getBytes(); info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length)); } info.setDataStructure(createDataStructure("DataStructure:13")); info.setTargetConsumerId(createConsumerId("TargetConsumerId:14")); info.setCompressed(false); info.setRedeliveryCounter(2); { BrokerId value[] = new BrokerId[2]; for( int i=0; i < 2; i++ ) { value[i] = createBrokerId("BrokerPath:15"); } info.setBrokerPath(value); } info.setArrival(3); info.setUserID("UserID:16"); info.setRecievedByDFBridge(true); info.setDroppable(false); { BrokerId value[] = new BrokerId[2]; for( int i=0; i < 2; i++ ) { value[i] = createBrokerId("Cluster:17"); } info.setCluster(value); } info.setBrokerInTime(4); info.setBrokerOutTime(5); } } \ No newline at end of file +/** * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.activemq.openwire.v8; import org.apache.activemq.command.*; /** * Test case for the OpenWire marshalling for Message * * * NOTE!: This file is auto generated - do not modify! * if you need to make a change, please see the modify the groovy scripts in the * under src/gram/script and then use maven openwire:generate to regenerate * this file. * * */ public abstract class MessageTestSupport extends BaseCommandTestSupport { protected void populateObject(Object object) throws Exception { super.populateObject(object); Message info = (Message) object; info.setProducerId(createProducerId("ProducerId:1")); info.setDestination(createActiveMQDestination("Destination:2")); info.setTransactionId(createTransactionId("TransactionId:3")); info.setOriginalDestination(createActiveMQDestination("OriginalDestination:4")); info.setMessageId(createMessageId("MessageId:5")); info.setOriginalTransactionId(createTransactionId("OriginalTransactionId:6")); info.setGroupID("GroupID:7"); info.setGroupSequence(1); info.setCorrelationId("CorrelationId:8"); info.setPersistent(true); info.setExpiration(1); info.setPriority((byte) 1); info.setReplyTo(createActiveMQDestination("ReplyTo:9")); info.setTimestamp(2); info.setType("Type:10"); { byte data[] = "Content:11".getBytes(); info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length)); } { byte data[] = "MarshalledProperties:12".getBytes(); info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length)); } info.setDataStructure(createDataStructure("DataStructure:13")); info.setTargetConsumerId(createConsumerId("TargetConsumerId:14")); info.setCompressed(false); info.setRedeliveryCounter(2); { BrokerId value[] = new BrokerId[2]; for( int i=0; i < 2; i++ ) { value[i] = createBrokerId("BrokerPath:15"); } info.setBrokerPath(value); } info.setArrival(3); info.setUserID("UserID:16"); info.setRecievedByDFBridge(true); info.setDroppable(false); { BrokerId value[] = new BrokerId[2]; for( int i=0; i < 2; i++ ) { value[i] = createBrokerId("Cluster:17"); } info.setCluster(value); } info.setBrokerInTime(4); info.setBrokerOutTime(5); } } \ No newline at end of file diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v9/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v9/MessageTestSupport.java index 9b41eb0da3..3557528dee 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/v9/MessageTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v9/MessageTestSupport.java @@ -1 +1 @@ -/** * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.activemq.openwire.v9; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; /** * Test case for the OpenWire marshalling for Message * * * NOTE!: This file is auto generated - do not modify! * if you need to make a change, please see the modify the groovy scripts in the * under src/gram/script and then use maven openwire:generate to regenerate * this file. * * */ public abstract class MessageTestSupport extends BaseCommandTestSupport { protected void populateObject(Object object) throws Exception { super.populateObject(object); Message info = (Message) object; info.setProducerId(createProducerId("ProducerId:1")); info.setDestination(createActiveMQDestination("Destination:2")); info.setTransactionId(createTransactionId("TransactionId:3")); info.setOriginalDestination(createActiveMQDestination("OriginalDestination:4")); info.setMessageId(createMessageId("MessageId:5")); info.setOriginalTransactionId(createTransactionId("OriginalTransactionId:6")); info.setGroupID("GroupID:7"); info.setGroupSequence(1); info.setCorrelationId("CorrelationId:8"); info.setPersistent(true); info.setExpiration(1); info.setPriority((byte) 1); info.setReplyTo(createActiveMQDestination("ReplyTo:9")); info.setTimestamp(2); info.setType("Type:10"); { byte data[] = "Content:11".getBytes(); info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length)); } { byte data[] = "MarshalledProperties:12".getBytes(); info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length)); } info.setDataStructure(createDataStructure("DataStructure:13")); info.setTargetConsumerId(createConsumerId("TargetConsumerId:14")); info.setCompressed(false); info.setRedeliveryCounter(2); { BrokerId value[] = new BrokerId[2]; for( int i=0; i < 2; i++ ) { value[i] = createBrokerId("BrokerPath:15"); } info.setBrokerPath(value); } info.setArrival(3); info.setUserID("UserID:16"); info.setRecievedByDFBridge(true); info.setDroppable(false); { BrokerId value[] = new BrokerId[2]; for( int i=0; i < 2; i++ ) { value[i] = createBrokerId("Cluster:17"); } info.setCluster(value); } info.setBrokerInTime(4); info.setBrokerOutTime(5); } } \ No newline at end of file +/** * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.activemq.openwire.v9; import org.apache.activemq.command.*; /** * Test case for the OpenWire marshalling for Message * * * NOTE!: This file is auto generated - do not modify! * if you need to make a change, please see the modify the groovy scripts in the * under src/gram/script and then use maven openwire:generate to regenerate * this file. * * */ public abstract class MessageTestSupport extends BaseCommandTestSupport { protected void populateObject(Object object) throws Exception { super.populateObject(object); Message info = (Message) object; info.setProducerId(createProducerId("ProducerId:1")); info.setDestination(createActiveMQDestination("Destination:2")); info.setTransactionId(createTransactionId("TransactionId:3")); info.setOriginalDestination(createActiveMQDestination("OriginalDestination:4")); info.setMessageId(createMessageId("MessageId:5")); info.setOriginalTransactionId(createTransactionId("OriginalTransactionId:6")); info.setGroupID("GroupID:7"); info.setGroupSequence(1); info.setCorrelationId("CorrelationId:8"); info.setPersistent(true); info.setExpiration(1); info.setPriority((byte) 1); info.setReplyTo(createActiveMQDestination("ReplyTo:9")); info.setTimestamp(2); info.setType("Type:10"); { byte data[] = "Content:11".getBytes(); info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length)); } { byte data[] = "MarshalledProperties:12".getBytes(); info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length)); } info.setDataStructure(createDataStructure("DataStructure:13")); info.setTargetConsumerId(createConsumerId("TargetConsumerId:14")); info.setCompressed(false); info.setRedeliveryCounter(2); { BrokerId value[] = new BrokerId[2]; for( int i=0; i < 2; i++ ) { value[i] = createBrokerId("BrokerPath:15"); } info.setBrokerPath(value); } info.setArrival(3); info.setUserID("UserID:16"); info.setRecievedByDFBridge(true); info.setDroppable(false); { BrokerId value[] = new BrokerId[2]; for( int i=0; i < 2; i++ ) { value[i] = createBrokerId("Cluster:17"); } info.setCluster(value); } info.setBrokerInTime(4); info.setBrokerOutTime(5); } } \ No newline at end of file diff --git a/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java b/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java index ddbe9a19ab..97e4057f3b 100755 --- a/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java @@ -16,14 +16,11 @@ */ package org.apache.activemq.security; -import junit.framework.TestCase; import org.apache.activemq.advisory.AdvisorySupport; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQQueue; -import org.apache.activemq.command.ActiveMQTempQueue; import org.apache.activemq.command.ActiveMQTopic; import org.apache.activemq.jaas.GroupPrincipal; -import org.apache.activemq.spring.ActiveMQConnectionFactory; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.annotations.ApplyLdifFiles; diff --git a/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCCommitExceptionTest.java b/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCCommitExceptionTest.java index 4c562091c4..c252cbaa93 100644 --- a/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCCommitExceptionTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCCommitExceptionTest.java @@ -17,14 +17,11 @@ package org.apache.activemq.store.jdbc; -import java.io.IOException; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.util.Properties; import javax.jms.DeliveryMode; import javax.jms.Destination; -import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; @@ -32,9 +29,7 @@ import javax.jms.Session; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; -import org.apache.activemq.broker.ConnectionContext; import org.apache.activemq.openwire.OpenWireFormat; -import org.apache.activemq.store.jdbc.adapter.DefaultJDBCAdapter; import org.apache.activemq.util.ByteSequence; import org.apache.activemq.wireformat.WireFormat; import org.slf4j.Logger; diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java index 262ba6d39a..1188188814 100755 --- a/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java @@ -26,7 +26,6 @@ import javax.management.ObjectInstance; import javax.management.ObjectName; import org.apache.activemq.broker.BrokerService; -import org.apache.activemq.broker.jmx.AnnotatedMBean; import org.apache.activemq.broker.jmx.ManagementContext; import org.apache.activemq.transport.discovery.multicast.MulticastDiscoveryAgentFactory; import org.apache.activemq.util.SocketProxy; diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransport.java b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransport.java index b3783b51d9..176934fae5 100755 --- a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransport.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransport.java @@ -17,19 +17,11 @@ package org.apache.activemq.transport.tcp; import java.io.IOException; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.SocketException; -import java.net.SocketTimeoutException; import java.net.URI; -import java.net.URISyntaxException; import java.net.UnknownHostException; import org.apache.activemq.Service; import org.apache.activemq.transport.Transport; -import org.apache.activemq.transport.tcp.TcpTransport; import org.apache.activemq.wireformat.WireFormat; diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java index 9044b70427..592f2fb6f5 100755 --- a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java @@ -26,13 +26,8 @@ import java.util.Map; import javax.net.ServerSocketFactory; import javax.net.SocketFactory; -import org.apache.activemq.openwire.OpenWireFormat; -import org.apache.activemq.transport.InactivityMonitor; import org.apache.activemq.transport.Transport; -import org.apache.activemq.transport.TransportFactory; -import org.apache.activemq.transport.TransportLoggerFactory; import org.apache.activemq.transport.TransportServer; -import org.apache.activemq.transport.WireFormatNegotiator; import org.apache.activemq.util.IOExceptionSupport; import org.apache.activemq.util.IntrospectionSupport; import org.apache.activemq.util.URISupport; @@ -40,12 +35,6 @@ import org.apache.activemq.wireformat.WireFormat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.Socket; -import java.net.ServerSocket; -import java.net.InetAddress; - -import org.apache.activemq.transport.tcp.ServerSocketTstFactory; - /** * Automatically generated socket.close() calls to simulate network faults */ diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportServer.java b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportServer.java index 50494ca5d2..36c0fd54d2 100755 --- a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportServer.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportServer.java @@ -17,18 +17,10 @@ package org.apache.activemq.transport.tcp; import java.io.IOException; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.SocketException; -import java.net.SocketTimeoutException; import java.net.URI; import java.net.URISyntaxException; -import java.net.UnknownHostException; import org.apache.activemq.util.ServiceListener; -import org.apache.activemq.transport.tcp.TcpTransportServer; import javax.net.ServerSocketFactory; diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportServerTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportServerTest.java index 67e659f187..46db53f15f 100644 --- a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportServerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportServerTest.java @@ -19,7 +19,6 @@ package org.apache.activemq.transport.tcp; import junit.framework.TestCase; import org.apache.activemq.transport.*; -import javax.net.ServerSocketFactory; import java.net.Socket; import java.net.URI; import java.util.HashMap; diff --git a/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion1/db-1.log b/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion1/db-1.log index 37d28a6f225ac7d75870741de056454e372b393d..0318aa97967c14c8ce1fa91091b0be78e1d23031 100644 GIT binary patch literal 751723 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 UQpm;j|93TiZ8`45GsKzy0;;)MMgRZ+ literal 729155 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 iH2cl#3%R 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 LCY3)6tj+%d0)ARL diff --git a/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion3/db-1.log b/activemq-core/src/test/resources/org/apache/activemq/store/kahadb/KahaDBVersion3/db-1.log index 75ab195243f2f34ce0bd9031d0f6a64487aefcd8..dbfd3f475d9dabb451ed957d518f3f2b7e82a78e 100644 GIT binary patch literal 744361 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 literal 719147 zcmd4a2bdIf*7pDTRgEI32#AW901-t2C-fvtBvB9(Voo3;q97LHtg1y>X~#@y$I`ME zd+gn(MOjH{S@sLo{62^9H_6@}66)>Wpy4{9NrTz}!)rU#4jneAf0O!k|G8t`|7lj# zs_r{;8l_|9OhSN&m%n%YV}>O8(Ew`O-7@*Vh?fB3QdV5!Hb=aK zKWRc-E{N;9BaX>p9lA{tzYK`$&KPNba>Ot5Uoj!h2;v6rh>OXh?z~XsO@rK#IzQMosU8x#)AJg|MvOz8r$W7cK^VBtl$e$u)HSs>R zMJ^Y}8@fa0v8%fhQTHc#B!7XB)yVrI|Luy5j^vC$Zt4!1=dSK_Q1>T^{1rl0Gw-YX zx3fa75Xc+3L*~6}N+?O>?-8;Zdf(e3R|@2f-68YfZ3K~jN62dG{b7q-C6G69hs=Yw zF+~0gA*-?Xw=HtDKyKy^nFntZgj^dTWG(lyUqydx?!wgwquJb29^aua}DrWIc;pN5Q(W$|t9 z4w(mUGl;wqLe`3}mjC4$A+#&PeF-r1CZiSGw;;U_Ci!6(;g*#;avEB+E$!!p_ zR(!Q>Y>{R0wRDHfgVzEgZ;z0*;;Y@>7FiZwD|g5|cr77v2ZXE^Uk6)cS$tc&L*~Kb zb7=CMT!xU<;w!A8NmiH3;%n^=nFnuccqCULWVQGThq(>1EWT~rA@kt1hRD4Ea=BW3 zy-iOS<+AwNxI=D17~4SPgAlS>dQwhmc_S&J7gX_F0|x1`9y@Q7T;i7WLbRe+#&Pe?EsJDVF_3l@pW*A%!Ah+B9BJM zYVnP>MV7_4qdR0CJieflJSU$9kTYuWoo0(Hi?75TG7sL4@JK!#A*;oAx-GISzEXF{ zJa~LqCXeKE5VBf)=h!04;wy89%!9{=WfJ*9gsc|dg|^7D_{!ZO^WgDenM9t1kk#Uw zWQ#0|FXIlG2agZSB=Qu5tQOyuw#c&hD%>IS;PGLZM7|m!tHpPXEwU`WN_WUSczjqU zk!K)ewfJV(BFo~da)-==$A@JS`6h&{7T-;#$Q82qs@);;;PGLZM7|3ltHpPhEwU`W z8h6M%czjqUk>>#93O>^?C*RgRS+aHxe`Ip)qCys5M|a3PczjqUkzYs1e5PSezRe-O z&L7zz%i`O~9WoDIM?y&==bya3VfL^8`!iB2_)No`e49glhd;7Gmc_TTJ7gZbod_j~ z{2n@z`Aox{e49glk3X_Omc_S=J7gZbogwmv2$|0`%*nSo!P^BQ zqvuvv@R^1=`8J3ADSu>xEQ@b9cgQ?=yFz62-0BKG(=aFB=8$clTU{ZGuai4u9=zQk z@;B&o!DkxA<=Y(cH~f*!kt~a^vpZxSyiSCY9KPQWGM{OflW%j#zw<{X$d$7Ay0}B; z!Rri>|3=7sreRLL%^}-9?YB}EUsrd?Ja}CY@`$woa-~*$*{`BMHb=57zHaW2dGNYI z?E4~r7Py4Nu#kadVWFEY35E(t~w^A#<5w=hJt(3*r-5qi#!rdJrZ-|a$t@uXN zWq9t7&FMlGU-q?^oxNHz4_jja~Gg7P6;w#*VHo13EC5vw#cgQ?=dqd<(a3oi$#aCEG8)R90`?^Es!P^HS zcSOjAgO$FNZ|W`(jo?eDMyCr|eEYdW=E2(+BJYNf)#Bq^H$s-hx4%1N9=!b^a#w_` z79ZdLHbR!g*V`R358nO|c~69_79XGMjgV#W9pDa`2d_6o?uC#G+eTl?H@R~%|I0H% zmc`e{9WoEz0T6kAgsc`H|6~{;%i=rG9WoDIABcP~LRO3KU_P!*?!r~e;ycJ4G7sK? z5cvdztQOx1w#c&h4t9skKh_69Wc0+GYPI-mpO{lEi|-J3$UJ!bz+ z%i=rA9WoEzkr4Shgj~grYux6t`a1rkO^nFmJK7yG4<5h7Sn`}a9U-g5H{BGuMiyUR zcgQ?=M-xgCc_um11cdR>P9=!hWNWKRh$!hW4V|yga;v3)& znFsG!h&&r1tHn3l7FibGaqf`&62<_C`~X5$i|+wjWLbOz-68Yf9S4ygLda_IJ!Fe4 zi|=@M$UJxhA@W>=tQOx~TVz>$gWMtW;2jT<=OJXZ_~!iwWPVUh_HPT>2NW+%zBzb@ zfAj|IGWkw$r_75t2rAD<%4+h>{}0OisG2(E>?4X7{kO`ct^TOH`}s@VL;O#4r_7Vb zzxqtxQ(l-;ZkqjH-)N2ZU{|AWVfG7hf50`O|21=&U>@v_nMdzLLP;_|37OUGdy>8( zdho^nnz>vs4{^uLvo{zrKLeT7@O#FXIU|@)a>vZWHv}>-hRkaEEjDJZ5X?i}G4t}B z1eupWW;Onn7&BK2=3(xbdHRMz=B1EX&A+9_%vFN_<=zlE4f)e3yem|0ffNO#OUeIp?AD#)x>;3{KgS%IV6G4u3| zgv{?kX0-y}HD;C-INBXEPv0oW{61t>EAV||W?6w_+%fa?jfTu0L1wiAKQd;P6*$%% zGf&?b$ovUpRx9umV`f=_Xx^o@ngpF?J~0zWrqmKAuaJ7%7~agg~-$gEc2m&VMp z0#9?t%+q%&Wd0g5s}=Z-EpwTy!13;wdHPO+%-=(1wF194W|kE=!5uSC-+0LUBVsO7 zEAU5SW?6v~-7)j@O@Pe5KxVZ9e=%m36?nQkW}d!@kU9Tq%PCjr%G3({&6rtM;2G|i zdHPO=%zwh8S*^f7jhSTyp6QO6r|%5N{5ND)EAVe)W?6w}xnt((I}eo!E|(Q}o;zlqzH=e-`tWGhDsbfb#>}z;&v(bn({~}z;FLuYw({~YMZVs8X3LM$om|0ffCGMDc`Ywjd`FD9pxkFd3 zR$$$8KyrUnKQBiC%a?j>AMUvw}H%R1#WB1EGzJGcg#F}lOgl= zh&iKH;P%GMvI4Jg$IR1rIb^PY%xVP|_R;2^Mn+cP6nD%#eOEx{{43?B+@Z^;6}Y?c z(JU+QN_WgWeN!NF4|p`I71+a=Sytdwcg#F}S3>6etL3L1%^8+l>Hp3cT7K zGf&?%CSslX+5eFH>F*Dj)e7WSLos>;C1epdHSw}%%>pc3bg`HF+Q4Q1zzutnWyhM$UGV{ zs}(rfm|0ffba%`=eb+B8)k#BE;0$-nJblw4^90DORv<|ixt-$Av znPmk&5Z;wE|x@W|kHB zm^)^kzDFT5d>5Z;wE~wLGs_B`=Z=}D?=i^y8aioIs}=Z~F|(||$K5gW^v#3J@XeB{ z)e3ywm|0ffe0R(|eUC%t74T?QD{zG|v#h`c?wEP{__}5Co(6nRs%o_YR~j?R3VgyH zGf&?Fcr?TJq^edc@GWCzS%C}PG4u320h!;1Ck?d%-!^8J6}ZS9Gfy91g-@O|-hs?& z1-@g;Tq7&+Nq5XVeT(4Hyb3a_6}ZZnSytdv?wEP{o`lTs9oA~p3Vhd?SytfF?wA*l z##4|PzQbCLT7mByGs_Bm#vLEqv!CMOWSkzI{i zfgc$&%L;tX9Wzhgv+!vC7#_`P1%7PIEGuxaJ7%6f{zY{1X#Ny3s}=aEF|(||=iM>$ z^zkpElgyt%X0-x8GiH_*_<}oTo<9CXbdnjqEn|&Zfu9>Q%L;ta9Wzhg3#5`{{sJD& zY6X62%3M|=D{zTBW}ZI&eSebqE6A)?;8(`XvI1Xn$IR2mzwb{nqj$f|9zZO)#%=Do zC*SZVO&+aZRw65KsXJz#KK^}wlKES3G?$gA75J?&v#h{n?wEP{mXb=6`8&w0R^WHW z%(4PscE`-qw+u4>0GZVa{K1%6R^Th{n0fkMhRo=_T+2$-3jE2KSyte3cg#F}uR!LX z;nA#C;Lpa)vI1Xq$IR2W95SP~%q=TXEASU%W?6x+xnt((dlfSO3Xf*B0)I7TmKFHA zJ7%7~*C6xnkXfz3-))&oWd*Kq$IR3BI%NI>GOHE%hcUCPz&G46^YpDi%%cKgF4Zb9 z`(^aUrUFZ41+H|*%+vPEp*@6%NAsS*E&+6Qj^O6PJ~0 z6`1`p`eSr7%L;tU9Wzhgn}m{NUJD-0S_O_;%a~bK;M?w)dHVPvZ%JnK2GC`tS_O`( zXUr@s@Ev!|JbnC-wp^C%0!OWH%UmWa@I80TJbmv%=7x}2 ztH4nWjhSTyzVD8ir|&(;+!!&JsTJ7Rm|0ff2kw}8`uG8y$&<#0kXfz34UL&)1%Bv` znWv8*z?o!j3YpakY--FbEAS(C%&SS`L%K~eZv>gu3f#z;Sytf3?wEP{_;IpH=1m~8 zT7jDwGs_D6#2qtFA3shu$=nPws}ElOzCz)G9X0-xa8Z*lZ{MsEe zPai+(JIUM%GOHEX%9vSJ;5Y7=dHTL4l_Ya($gEaiYhz|vf#14g=IQ$eGH(N!)e79k zm|0ffckY;Z`o4wCZ6LE+fo+VLWd(lkj+v+LJIK5pWL7J1J7Z>9fj_uo=IQ$$GPi}y zY6Z46W|kHBqdR7vz8@g-_K;bv!0m0BGqM7Ia>vZm_akI(2bt9hY-h|YEAVG`%shQR zLFNvKIipr!2V-Vgfxoz8=IQ$xGVchP)e79vm|0ffukM(6`hJ1TC6HOIz`~(!^N7%l ztia#gG4u5O3YkkGvs!_LL*0m3R^adMn0fksgUscSS*^grzXKy?S%H7JW9I4OXXGTW zX=EU?T7iXs2S&`Y0{?W!%+tru$VoC+KxVZ93;zy`m}Le2<&K%B?@xHrsDjLD1s49I z5wonozuhtO^!){yt0A*mfrYCvs@z}g|l4C^p>X#akL+gD_& z%FEi9mX}pkm6T+v$}*Li_L+`6)%;@|!hlfJpmxCU+77ithYjkVeFn}+|HXGBR-V4U zA#)96Rx7Y0eM6h~axJS66&SLAoH5h%@xRL)X%49HOsbs_b4B5JA5cE?Q97a~$gGVcnR)e79z zm|0X{D0at8(--(jsY&MDAakKWSd{-&)txkU<4+nL&7uOsTJD%>`T{>GHObrwG8YPj zMJ015{-hDJsKBtcH)d81{G?R=#J|qXT_AIzKv+~Vci~SOF^dWe_1rNNYgn6!Sf?<7 zT_LktfnE6<88M3r4C}aKrs)g(+~4HU+zm1pLXSoHUsc_?xf_4dh*?x%sPB%MrZ4bw zf0NAJA#)-0SX451=TF)&SIP=(;EtK5FVvkQ>i#5|_khf51@4jmenmzVSSc%TU3bhh zeSx21on-ETm@Cx^>|x9-D{wt`%rt$0pJJV4?g^RI3hZgjEGuw*cg!?>VLehwGVcYM z)e79pm|0d}LwC$HeSx3Jo@Cw|GOHE1w=uJM?z+`0*^FimKE5{ z9WzZ|*aR{k1)0?fJj$3^R^X=Ym}&Y#Gst{2WL7KiXk%tsfz919)AWT+A#-2ItX5!O zV`f=_o4I4A=?nZ~F3D>e{UEbif&Gk`Wd&~Tj+v$}@Qb-5nfpU#wF0w`@yq|Q`6X4A ztiUbYG1K&g%?TyRJODDQ6*$0_xms4>mhPBo`U1aZPLlaJ$gEc2amLKD0=II}z; zTe)MV=?g6(^I*uVR^VV`W?6w-yJM#53;fbV$q5_+nbis$V$3Wnu(dm8n!d0#Jep5} z%xVP=HD;C-xQ#nzn!doV0F^wNhe2kw0*4th%L;7cj=4o%Bk(IgC7Dl#%xVRmY|Jbx za9elGG<~5BsU(?)LuR!ChubpO$O_!f9WzZ|*cLL^LT0rBYmJ#@1-5m^Ow$+mg|?DM z^GL*8qgLQZV`f=_+q+|?=?iV)(L4$=s}(rPm|0ff4(^y~`oi{*c?@J$D{zc4v#h{& z?wD!%!VZvmEM!(IaI7)2tibl}m}&X~zn)q0+&m64s}(rTm|0d}2Y1XgeW5)(noonw zY6YHV%q%N#M|aFLeSu##E_pPMhsmzT&2EOW<9(--(YaFY29$gEc28OF@A0?XYo)AR+t51eE^ z6EJ5FAeLO?Huth6XYwaa9zalDA}cWCj+v$}@O|JU^VyJ@e*zekZ*$CN^G8O^vH~mI zG1K$~z7L#aJ_j=MPXL4RZI1aI{>X?~R$!$&X8OSod>=T;d@f|>p8y8s+Z^+`{E-o} ztiURF%=CjF_&#uw`FzOCKLHHNw>jqX`6DA{S%KB=nCS;U@O|JU^97KZe*zekZ*$BS z@JB|>vI1+|G1Cuz;QPQy<_jS+{{%27-{zPvS ze4Aswm_IUNmKC^@J7)U95Byq_N#;u-GyeoIDBtFoFXfMHm`h~^?(B}4e((do)?|`- z5@hC|00!mT9P=dp$cR~1;4bc%=?6dXYfUDZFGI|wY6V_q%q%N#S9i?xgCBMwl_c|I z$gEc2WMgJofxEe5rXT#UD`dU`GOHDMg)y_Nz)tR%Y5Kx$ka-GZRx5CdF|(||&hD6L z`a&njd?jR7EAUEVW?6w<+%ePih0c(9Dr8nGaH=u0tiZ1Bm}&Y#7sz}SWL7KiDr06@ zf!*9O)AWU|ka-$pRx5CtF|(||-Q6+M^aXz9)Z`tyt0A*mfmhoym&pq3?vA-rUL)*I zDoN&RA+uV6*BUd+3f#jTGfiLU4wp(kX%0Wzx< zc!M#stiWFGm}&aLUXb}l$gEc2jmFHf0{3>uOw$*7LFQSIS*^fX#>}z;_i@Ke(--!J z%r`@3wE}N8W|kGWuRCU%zQ8ZHoXnG3AhTM5x7ae5%L?4j9WzZ|*cTqnw?byM0&g{D zmKC_aJ7$``upeZ;9Wj@y6?nTbv#h}0?wD!%!v2u?4#=!l;2p-yvH}lq$4t`~dPC-W zAhTM5_ZTzF3hd*KnWirs0GaQF%xVSRYs@Sw@IZIWG<~5DWWEnFs}(rgm|0ffLGGAo z`oe*b`F_Z(R^a`{%(4OxcE?Q97Y>5Vb0D)?fpd(RWd$DMj+v$}91NKsgv@FMK4{D= zEAUWv%rt%B5Xk%xWL7KiAzS8*tiZ$EG1K&gLm~6SkXfz3M~snWirs2ASs~ z=8Rf_bB&p01s>s!nWirs4w)Z=%xVQbX3Q)r@JM&eG=1R+$UF}+s}(rUm|0ffQSO*& z`ofWr`EkgsR^a2t%(4QHcE?Q97mk9=^C7cZfeVb8Wd-(i$4t`~j)u%nKxVZ9pD<>Y z71+-mGfiLU3z-)}X0-wr8Z*lZJjNX}O<(8-nHNE3wE`CzGs_C>?~a+KFB}7zpM=b6 z1wLiVTp=s)Sa-}ceW5>Oei|~X75KC^o0{3^HRvH zR^U=&W?6xQ-7(Yjg%ct3GRUk};4))oS%E{`G1K&g!I1eC$gEc2E4Iv)vI0+X$4t`~ zhCt@!kXfz3<;Kji0*AU|rs)eOLFQKxbER5=uNpJU3LNH+nWirch0L!(X0-xeH)fU< zc(OZYn!Yd$GOvKlY6Y$^W|kFriaTbSzHl;RUJ04i3S4Q-EGuxhJ7$``a0+C86Edq6 z_@*(ltiW1#%rt#rIAnesGOHE%wlTA;z!C14Y5GDfWPS%Ss}=Z;F|(||k?xpj`oajv zyb3a_6}ZZnSytdEcg!?>VI*XJ7c#3A_^vH;m8`(g?wD!%!YIi69%NQ4@I7N@S%G8R zG1K&g(UAFl#9XCT;QPkRvI57tW2Wf~V<7W~kXfz34~>~+1&(vaOw$*}LgtSkvs!^4 z88gcYJk=dDOWAhTM5Ul=pX3Y_SUnWisHfXrV)X0-ypG-j3+c)B}g zn!Yd*GJge`)e8K|mbqG1;2G|iY5KzHkojxKtXAMR#>}z;&veI3(-+Qw%-F){4-=$EAVGyW?6yfxnrj33+F=SUm&wufxj3t%L+W- z9WzZ|I1e)a2AS0g{LPqIR^SEhm}&aL`H=Z{$gEc2@5aos0xxvOOw$)GfXshDX0-zU zuw|~16?l<5W}3cmA!PmwGOHE%moc-fz>D26)AWUl5cB8=G1q7nnEf*PWAnC*HL?OP zamP&47cPd(F=W;%aCB_UEGzI*cg!?>;S$JP44JhG9KDt?v#h{L?wD!%!ljUTZOE)u z;OMoDnPmlD=8l=BFHC~W^&qoWfurjgGs_B`?2ehHFI)zh>qBO(0!P<3W|kFrxjSZ> zzAzawH-OAq1&(fD%q%PL3U|yjec^J*ye?$cDsc3A#>}z;r?_LL=?hmt=Jg@7R)M3} zH)YP0$O^pD9WzZ|m;#v_LT0T3M>jNPmK8YF9WzZ|xDqlq0?gS1h$Yv!4HYf77~P0J zX;Oii5?O&)xnrj33sWI;W5}#lU}IxuS%K5sG1K&gs~~d|$gEc2hQ`dY0}z;uW`pr(-*FW%o{;wwE{OXW|kFrtvhC#zHkj>-WW2g6}Yi6v#h}D z+%ePig=-=6CXiXJz-GqGvI4Jn$4t`~u7k{*LT0rBH#KIK6*%1;GfiK(9x^wF%xVQT zw`DGs6*$8kGfiKZ4w*NH%xVR0Zp%(4P!xnrj33pYaMmXKMkz?R0$vI1{% z$4t`~WsV-0&jN5JR`3WZi39MA+uV6t&N#w1>WM0nWit?44Joq%xVR0 zW6Ufo@K$%sG=1R~$h<9NRx5B@V`f=_x4C1c=?k|)=ItP}T7lcyGMC8;yxko$O<%YT zGPi}yY6Z46W|kFrhdXAPzHmEa-X1ZRsTH`rF|(||JKZtU^o2Vhb34eaR$x10W?6xE zxnrj33wJ{1_K;bv!1l(>vI6gR$4t`~?t;u6AhTM59gLY}1>WP1nWit?4VgD&Uvs!_LGl~(jtib!-G1K&g*^s#cGOHC>IHTAwm&*#A;bA6Xox;()D`YO*XXCHo?@`CRD}U06Sytd& zcg!?>;SnZcodWZ2khyT5jlYJ!M;-HS{7EBbS%HtbW2Wf~bD4;B3e24$vs!_j`5PHA z%L;tV9WzZ|coZ^sfy{-w#w^O;qwZ+#!k;u^mK8Y99WzZ|c#Mfyr*JfPh0KM!#{4z> zJ?fad@+WPWGqM67cgIZA7v?b$>lB!Ghs*u$7vR^UQ+%rt%B3CP?N zGOHEX)0kOS;39X-G<{(qWbOr-)e7uo%q%PLNq5XNePIz~-WxKj6}Y!Cv#h|U+%ePi zg(o5NzK~h1z;c3XcKV()baDQ9o z3R!{Ax?`s43(r9210b_nfd?2f%L;tX9WzZ|cos7ELCh6u1@POw$*ZLgs#uS*^f+w#=2X0$+B=Ow$*ZLFWFD zS*^hS#>}z;UvbAw(-&Tb%mWZ}rCNaljG1KxE_cUF(-&TW%*R1ywE~YbW|kHBsyk+y zzOWoJ4}{EW1r9W3mKFG#J7$``@G4|J9x|&Hc)T&QtiadZG1K&g*C6vC$gEc2AY*1( zfh*iG)AWVcA@hllS*^emjhSTyzTu9UrZ233%!47bT7iR&nPmm8bjM877v6x(Lm;zS zfkTX$Wd*+Jj+v$}tc1)%A+uV6Lv5L>WCgzEj+v$}ya}0yL1wiAhZ!@=3VhogGfiK3 z3o@UKn5)zZJlU98R^U7Cm}&aL+mLxUWL7J1xG}S=z*X*;Y5KxDkhvBzs})#l%q%N# zwL4~-zOV{1kATc-1&%OgmKFG}J7$``uo^Otg3M|KjxuJJ75JVzW}3e6E@U1Jnbis$ zZOkky@O^j8G=1Sc$UGJ@s}(rbm|0ff2kw|@`ojB=c^qU`D{!1Kv#h`m-7(Yjg%2R} zsgPN%z*B9Rt7Qd#Zv6?nQav#h{R-7(Yjg-;;!8IW16z%z`QWd(lbj+v$}du8|e^ zjXP$VzVJ0NA9#fZ5^t-y;XBAY2{Nk{ILVkm_JOwhV6*$G1SytdL z?wD!%!q1R-Dr8nGaH=u0tiWI0G1K&gUm)`|$gEc2G*jk^5?O)2xnrj33%^3A}jC@cg!?>;djV<9b{H3 z@H%5=S%H7LW2Wf~e?aEzA+uV6*Bdj-3jE6*GfiLk6EaVS%xVQrH)fU<__sS|n!fNC zWS$9`)e4+x%q%J}Dssn6(-;1R%r`)0wE}N2W)>9~1$WFeeG#Js{txxD{~>pmVHRXo zD{vNnBcpp7q5`9=^SDsdrboAq18avIGpxhlq5b;}ZeNk9DlcnaT3%LFRZ^0vD$7)6 z+GjfQj`Kfw2m?Y zSyW&YyJM#5i}-M6?xF(oEs$BQz*}sYOGO1n#qOAC`l6UrlFYY4X0-xuHD(qS7_H@w znWir)hRnAk=2Eo+Z#QNZ6&S7UjhW9C(OQuC4#>>w!JvGbTh2T9Bb#$`si?rHo;zkb zNknTy=DQ)YT7h>PGm8q0)^W#7hjUa9GT#fC)e5}Vm|0X{RNoylO<%MQWS$L~)e4+# z%q%OgfjefJzNqg0Tiu`JJ&pSzvs!`o=f7W3k(YlcNLCCCD;Dg4@vI5t4$4t`~tp}MOg3M|KK4i;WCM&R^J7$``Xnn~1 zFl1IM@L^+SS%Dk4W2Whg8bao|h`CIyz`4fEvH}~qW2WhgHh|2JL1wiAA2Vi_71-Dv zGfiLA2r|!u%xVSBGiH_**u)((O<&X)GCvNP)e3yvm|0ffhVGbY`l2R~c|K%TD{#Is zv#h|T?wD!%q75PQ0?4dZ-~wZ2S%Dk5W2WhgnnLD(H4;T zCCIE+;7i8LvI4hq$4t`~Z3&r|LT0rBml`w63T)wynWit=3NkN)%xVQLGiH_**wP&{ zO<&XkGQR?u)e3yYmN_FUu$4Pzn!czdWL^%L)e2m0%q%N#Yj?~veNijO{2F4;s1^8{ zF|(||*6x^T`l78N^XrgVt-#lfnPmlTQ5(qo7Gzc{@GWCzS%KTRW2WhgwuQ`ZLuR!C-!^8J71-7t zGfiK#9b|q7GOHE%jxn>W!0p{J)AU7cA@eH8tXAMEV`f=_JGf(}>5I09%GwF2L@ zWv-AF*v=g@O<%MFWPT4as}=a3F|(||_U@Qz`l5D_`2)mUp;q7r#>}z;JGf(}>5JM! z<_{sWT7e%LGs_Cx(H%2QU(^9Ie*~G;3jD~JSyo_)J7$``Xh+EW31n6)@DpQZS%IbQ zm}&YVKF=nfN%bjYRx9vRV`f=_W$u`1`XWBhCYe8j%xVRGX3Q)ru-qLpO<%<4*(CE9 zkXfz3FN~RG1!mka)AU7ro=q};37ORj{L+|NR$zrYW}3c;&$CJ9uOPEpfnV7&SIP>k zbjM877x8&E$@~puRx9uuV`f=_RqmK+`XWBhCYirQ%$0oaghBZ>_p&A5@<%pLjjxmy zSnZCPrZ3|2Y?Apq$jtXn7?f{w%-``xM$EDTYuqu@^hJE0O)`HEnfcxcgYs>T`FsAz zh*?%(M|aFLeG#8$lgvLtX1;gApnRKS{*ga2VwM%SlRIXbzNjOqB$JLHRbv z{1bm<#4IatXLrmrebG*k`De(?_f8m;Z*$DQ@JB|>vI2K;$4t`~?F^ZJh0J{KghBZ> z$NVdQWW+2ha94NCG=0%7koh;r%=b5F!Q%zr{=zIVdBe4AtblRvUKnyX|5c6P^1(-(CjmE=8* zzYuekT7iEXGs_C>;*Oc7FY1h#$K+p|u4(qKH>!K_=oUi;3?JTa;DC-5Raym(DK=)7 z71-4sGfiLA1v0MqBs$~W4>yDYGFWQGt5?AQPYz&#z3f!2!q0w6yRLct7&mA*OU$ie|-UKqM6}X8p zv#h}V-7(YjMf*YKO(C;dftwmL%L?r6j+v$}+8;8vfXr$IwlHRv6?lL5KY6=GKV0MyE!Syte|?wD!%qJtpwwvbt^KzjPD8MCawL)5C45%-cg|wF2pRon}X~tiZ$EG1K%#heGBZAhTM5^t?_p zW?6xUyJM#5iw=X#?I5#Sf$fY>8nOb9aK}v37ab0nJ3wZ&0y`Kp%L+Ww9WzZ|bOdBB zfy`+zUU~(Tn3o42N0hZ z*0`;E;O&^gooXXyS%H1sG1K%#M?>av$XqyJ)0hkQ_KcWi1@?2tOw$+jh0GO@xp2Uy zF&FOb88OQWJjNX}O<&XxGFL)owE_$G_KcWi1@?ExOw$(~1DUHKbK$&@b~G36h8Qu+ z3Ov>wGfiLAA2QcK=E8X)jk$0)#E4l|-~e~bG=0&rkhvpdE}R$AnCZDgMzLL4A}jDX zcg%hBM9~1qybEMjE0CUTVa6;gaG*P8n!e~b$h<3LE}VYpYxyR3znPzCX!AIY%2HW@ z$Gc;u>5B$J=G`E3;q=SC{5|UOgr03-bu^dC3LNB)nWir~o{5;O?nw=~!?H7CE>$bA zGk+tS2`rTrc!E1-n!acdWbOi))e5Ai0hk@lvI0+Z$4t`~odB7;LT0rB`5ACl=Vn=f zgWWOH^hGB^=5CN#tw4GjfZ5S3D{zQAW}3ceFl6oynbiv9r)F6l&9VYda>q>57Y%{T zdq8Hj0_pMTW=FHEz@hG#Y5Jm*AoHG(S*<{RYL?Z}EGuxBJ7$``Xeeav37ORjqz6u$ z9nG==Pj<&l(-#ec%zHs*wF2pZ(^kx7vI0+W$4t`~oeY`xfy`+^hIMJ^TCi=t-yngnPmlz zbH_~67mbC?heBqx0uQxiE|(Q}syk+yzGxg|J`6Ie708cEH@e?kE-Uafcg!?>(W#L6 zaKv1$RvA7oZ5kRM`d#VjlEba%`&ebGe7+#fQl708c$v|^SOc!oP>n!f0C z$b2khRx6Mn`)I{1EAUKr%rt$`8IXAZWL7JXANy#(V38WAY@i6kROz1 z#VjlEYkRL5(#VjlETzAYg zebG6P`9#E=Q7e!iEoQ|mEATvb%rt$`xsZ7(Rq;hB*?5* zAU}-Bidk0R1@4$>`l9n8^DxM)Rv`V7(dywa8CiiBx?`s4i!Ol7r$A=40_nG3X3Vkz zFLK9B(-&O`nTJDWwF2q4UuMj*0xx#QOw$)#1er%bX0-z8*D_|zvH~x0$4t`~T@0B= zLT0rB>DMx5%(4P6b;nH87hM9GM?+?{0_pb!R?HQ$0w=j+rs<0=h0J3hvs!`l`vNm& zS%H_iW2WhgCPC(Lh`Bi)B(f#HMS%H(?G1K%#mqF%JA+uV6{5xDLW?6xkyJM#5 zizY+n(;%~2f&4pMD`r`NSGZ%Q>5DFh%;O=mT7mpKTq|Z-fm7Tu)AU7GK<0^%S*^f{ z^bM_;Wd&a8j+v$}ngW?mhsI$iI%UVwM$n zojYclzUW%Wd?933E0BLrV8tve@OpR5G=0%^kojWBtX3djz_wzR6*%1;GfiJ~J!HNF zGOHEH7qG3EWd+V~$4t`~O^3{vLT0rB`2w~Tv#h|G?wD!%q8X5R5@c2@kS}0cG0O_P z!5uSAUo;akPln8D1@e_uD`r`NH@ah{>5FcF%$GxEwF3Fdsu6RQtiW0Bm}&Z=8zJ)* zkXfxjzOrh?EGzIPcg!?>(JaV31u<8t708$Tte9m5-t3NfMxHmi2{KQG%xVSlB|j@> zS%J5>W2WhgZidWPL1wiA`I4U%v#h{d-7(YjMYllaX^>g1K)&Q>#VjlEHh0W4ebKFu z`D)0lRv=&UvtpJNc)L4hn!e~Z$b2niRx6ONMOiV+3cSM|GfiJ~J7m5dGOHEH7fGy` zWd+{pj+v$}x&ty#hs5J}x%(Eb~T7g{e zR?M;j?{mjY(-++fnQw;7Y6WsuS~1HCob8U8rZ2h=GT#E3)e7XSv|^SOc)vSln!ac@ zWWE(Ls};yuX~irnaE?1>n!f0M$b1`QRx6Nu$BJ22-~;ZMY5Jl$kogYCtX3fRjuo@4 zzz5wi)AU6TK;}Ckvs!`NJ66oH0v~e6Ow$)V2$}DO%xVSl9dRS(8d-r4yJM#5iynf^ z_dsT~0{M=(6|=0sN8B;f^hFOt=KBzHjaq?x57CNQR^VKB%rt$`BanGEWL7JX?;%<- z%L;td9WzZ|G#4^I0GZVakWcnj%(4RKxnm}c=rPFr zFl1IMkWcnj%(4O>cgIW`(LBif2xL|(kWcnj%(4RKyJIGe=yAyWC}dVEkk3L^%(4O( zxMQa2i{?Y-#~`y>fqWLSVwM&7gga(B=%NLXc^+g|E0BLYY?!M`WCbpC$4m!Z^aNy{ z51G{pGR-faq)1yve=U`~v>0$-Bl^mB;qmqKQ>0+$*y%L;tS9WzZ|#6ROn=4Fsst-xi*%(4QPx?`s4i}+_e z$@~grRx9uoV`f=_%iJ;3^hNwLo@8DQnbithZp+n8Ba;2Z9kY5F2wtR(X)$gEc2Dr06@fh*lH)AU8W zSV`v9kXfz3)yB-S0^fAUOw$*wB$XudyO3F}z;}(AWd*+Fj+v$};yVUO=Jz49T7mBy zGs_Bm+Z{7aU&MC|lFT1KX0-x8FlLq&_>Mbfn!bqd7$liLgv@FMerU`rD{z%NW}3d} z9a2d$e+-$`3jElXxm;G@YIn>ueG%XPN-}>6nbivX)R*o!5x?Zf=tKTga?d z;J3!ivI0ML$4t`~eMBlr=IfuFf!rs<0~+LA}}Pmo!yz@LnnWd(ljj+v$};%G}U|ALq^ zY6bpc%q%PL3wO*keGx}nlKEH2tXAM}#>}z;zjVh;(-(a~DoN(wA+uV6zZ)~l3jE3) zGfiK_ZJcEO12U@>_=hpGtiZ3`G1K%#+{Q`fKOwVPfqxn^%L@F)9WzZ|#BH2p{u?r@ z75KL?v#h{x-7(YjMce`)-?P78`TaNUfW{GfZ@aY4II$1Dx+0k_RHvx z%_|UOWCecbj+v$};!6-o<_I!t6*x9BW|kHBy*p-_zKAbDB$;E#tX1IH*p|6MR^Sir zm}&YVz66nEE{4on1&%E?W|kHBqdR7rzKAbDB$?Mn%oSP%j$PZBSytdr?wD!%q8~{m z$y^UIYZW-QfibhJz@ObQ)AU7rr6+)_`5r1 zn!bpyTPBa@#*kU9z{bYRvI75b$4t`~@pa22^M;UFt-uY9nPmn3>5iGEFXHQ#N#>@I zS*^gjiy*l_HrF&NWd;7_j+v$};_H@4=8Yk2KQ zLHU-xj6O6vX^0ApgF9xLzQXmiBy)4ftX5!iMmJ&>6&OeEm}&ZA=H=Ue9nG6TX0-x0 zGiDYQ7-tV>XD1DszL>AVCz&^g%xVR0Zp*MZEf5p$JVf!i1} z%L;7Zj+v$}u8Y39Kgp9u8_29yV4M8+D>8a*{VG|3>$+p6>5KU{q)Fy&A+uV6+Zr>= z3S7?}GfiK-E~zA$w}Z@T1#V}|EGuw*cg!?>G5;bu$-F&eRx5COV`f=_4c#%*^u_#( z=p^$FkXfz39gLY}1#aMunWisp2u~XAAhTM5?Twjb1vYZWOw$+h@B5QSa|g(*R$vEX zW?6xa-7(Yj#r*sJB=e4tS*^ewZJDcO1vYWVOw$+h@B5R?C6HOIz(Tv&T-L9a6}X{0 zW}3dZ2|PEKBj)OYBp)G=vI3jCW2WhgH)SH$DKPI0 znbiv1nZJ<{v#h|)+%ePi#rz=?%JZbC+ znbiv1)0kOSU~6~GG<`8Y*u$7vR^T@7m}&ar*6^g!6Edq6*wd7`x*e~WZoMvXAdBjT;n$Pgtfi-lP0lU zT_P)RJ9o@9eK9|>Fv+|xWL7J1Ut?xjfo8;wE_niGs_Cx(H%2Q zU(An_O)?(`nbitB&X&1UR$z%cW}3d3A19k+J{~fw6?nWcv#h{Ucg!?>F&ABu`2@sV z%3s5ve4DGl6Zj*W3M`csSmutIrZ48AOERAbnfYrNly7s)C-O%|%(4Q@-7(Yj#awhr z=93^Ze+`53ZI1aQ{>X?~R$#^*GfiL2MVDkA2ATP57?f{w%)|I2BW78F74Dd6`eH7+ zB=gCTnZJfX`8LOVGJj;mEGw|m9W%{X%te=EJ_R!K*DxsG=9o|6kBpdQ1y;FZrWuR5 z=#tFCAv1psgYs>Tc{qP$#4IbY+8r~^Sjjoo{>X?~R$z@gW}2~> zi!RAL5;F7GFeu;Vm`CzQHq2$R0z0~6rWuR5=#tE%ATxgrgYs>Tc@%$S#4IatCwI&= zV{u1PNivT{%w=i?jy7hN6}YoIW}2~>pTm%39s`-x3LIn1EGuvqcg!?nF+YbP$$Tng zRx9vSV`f=_ySihh8H;y;CynutS*^hF#>}z;cXP)~GZynxMUqGJ1jwvb-~?l4S%ID0 zG1K(L{8W)7^F+w3R^UWqW?6xq-7(Yj#hpkc$$SQ6Rx9ufV`f=_UEDF#^u?Va^O=xY zt-v#lnPmlbb;nH87k7coXF+DQ0?)E#E|(S9%^fpMU(CJ3n8;wffpJx%L?q_j+v$}-V-uk1ew(eyvUeYR$xze z%rt#5Kk+Gf(zpaNs}*>OF|(||z1%U=^u;~l(R?XnRx9vQV`f=_z1%U=^u>EY=1GuQ zt-wjf%(4RacE?Q97xVMWk|&MHkXfz3$+pZHS%LewW2Whg`T1o@=F1_oT7j1vGs_Cx z*BvuWU%U@IX~7$gEc2G-GC2fqmRD z)AYp$K;~;8vs!`I7&FTXJkT98O<&vxGG7as)e5}Um|0ffLGGAo`r-p2^L3C}t-$My znPmkY?2ehHFFpt|Uk{np3Y>1sTp=s)5O>TpeeuDNc?M)wD{zJ}v#h{F-7(Yj#fL!V znTWYUt-zVa%(4OxbH_~67at0lZ-C5d1>RuHEGzJEcg!?>@nMj87Gzc{aF#K%tiU7O zG1K(LhePI@AhTM5HyJa_3Ov#sGfiK71Z2JiGOHDMi!rmTz@ywT)AYqhLgrf`vs!_- z8Z*lZJlY*IO<#NzWWEhDs}*>gF|(||zV4W5`r@M@^X-sXt-w2snPmm`bH_~67x#tC zcS2^h0`IhCu9Ovcj5}tUzPKM`z6&y|6?m61v#h}W?wD!%;$tB5-H5qTt-!mDnPmkY z>yDYGFYXVS?}f~21>S4SEGuw;J7$``_*lq%A7oZ5@IGT^S%Js7WA2;Ri1}sXlE2xW z4Vl#noNdf3D{!DYW}3d3Up6kuJO?tX6*$M3Sytfj?wD!%;(?@+WPSiLs}=ZwF|(|| zLGGAo`r_ju^MjCCt-uG3nPml@;EtK5FCGM$ABN0o1wL%dEGzItcg!?>F~106@}%(y zWL7Ki5nJXeS%HJyG1K(LC&Ht7E@W0KaIP`4tiU1em}&ar!I1ee#9XCT;A6(jvI0+X z$4t`~4}r|{AhTM5^Ng8g1rBw`Ow$*i1eqU)%xVQbZp#+X@F;0SljG<|U`WPT1Zs}=a1EpxT3z>)5l zY5L+3ka;m=Rx5C^F|(||QSO*&`r?t0`31yWtybU*#>}z;N4sOD>5E4}<`*HeT7fSb zGs_AbK zvI0+c$4t`~PlU`X5p#`Nfh&!fWd)w$j+v$}J{>Z@37ORjeAAd&R^XZLm}&arGa&O@ zkXfz3w~U!(1)k-OnWis36EeRInbit>$Cz1G;Mwk&Y5L-`AoD87tXAMEV`f=_=eT2@ znAeEUhRmxWvs!_x=^GZ=yeCzStiW^KG1K(L=RoH7AhTM5?-?`83OvspGfiK7E@b`y zGOHE%fibhJ!1LWP)AYsXLFNx3vs!^4nljgv$O^o`9WzZ|d_H9U2r{b`_>nQQtiTK1 zG1K(L7eMBZ0dw{MV#zgbb8pM|F@Mrz0&7ZS1zzNinWitk5Hf!PnbivX#F$xD;KlBk zY5L-eAoFLCS*^g&jG1KxUgD0KrZ2u2GJg)4)e8K=m|0ffrS6z%`r=C<^OulWt-vph znPmk|a>q>57hejQzk@g&InHDp#R@M~jcS%H(?G1K(LmqF%l zA+uV6-x@Q^3cTDMGfiJS88ZI_nbivX$(FfPR^S!xm}&ar%OUfxkXfz3-;9}M1x|6t zOw$)%ftbgwg_ujV3LLk#F|(||E8Q{E^u<#kb3MqcRp7XK#>}z;r@CXN>5H#~%=IC& zR)OQ{8#BuayviLjO@wJe-5oFdXa9kr><}z7<*Slk;>5H#}%#9(lR)OOh8#BuaobHa9 zrZ2u8GB-iYWoiXBF=mz(IKv$?Ogu3f#z; zSytc;?wD!%;+c?nW5}#l;Ks(xvI1{($4t`~-vF7LL1wiAn;A393Y_JRnWitk5i)NI znbiv1)RkhwWzRx7Z%F|(||o82+b$ZNzmLFUaMvs!_h88gcYyu}?e zO<#O7WZnWYs};C~Epxf7z+2rh)AYr+K;|tWvs!^$8Z*lZyv-dmO<#N~WZnufm#Y=H zl`*rdz}ww1)AYr+LFSf_S*^g9#>}z;?{LRV(-+?knOj33Ti4l=71xScVxtiXHR zG1K(LcSGj3kXfz3w#Lk|0`GOlOw$+N1DUsn%xVShV9YEl@IH6UG=1^Cka-8ltX5z< zTjq?cz}fDYY5L;(Aai@jtX5!qV`f=__q$`J>5FGW<_?HCqgG%CV`f=_bKEi0^u_l> z<{crkT7f$nGs_Bmz#TJ9UpxmgmqKQ>0t^2RY@X$skrnu$J7$``_yNdV2AS0gEc`n# zVwM&7kUM6YzW71NTn?Gl3M~9PFk+S!_^>->n!flU$ee-9Y6TYl9T+jo3Vg&JGfiLo zFl4TT%xVP|{-P1HtiZYMm}&arM<8<*WL7J%@E47kWd%O!j+v$}o(q|)A+uV6g}-RS zTp=s)F?Y-~eet7^xg%s&E3hMdLz`Fbs;Q6_IL{q3O<(*NWZnreSEv=ZlQFZbz{lM& z)AYsjAoI?UxlkZ1%HN}+AzPcAJ8n-KCE))oV z4S$dPm(fQ?%(4O(xMQa2i{~>DlNFeEgUp2j;jiKEQOCR+f6|CqR^Suvm}&ar1x&;` z1?EnWxlkbdHT*s5m^<+&jhJNxE_BCC(-%L%M66R_?gE+B3hct)$cR~1;39X-G=1?x z$lMh&7ebFk`FqqI&0YDEM$EDTpLEAe(-$vdBGxG!&D|h#A@ulb_b={7D<;N?CzVyJKFE*NC5DBGxG|?+KaJ3fz;w zkrA`3z-Qbs)AYqpL*^ccxl*mb9>&bF0-trqOw$)X1DSh5X0-x)8Z*lZe9j#+O<(*h zWbOr-)e7uo%q%N#u{&m(zW6!FyfGG2xSuhztiTuDG1K(LFF@w~A+uV6`x`UM3S8ojnWis(5i<9N%xVSp zHfEL;_>wzjn!b1mWIg~gs}*>FEpwHuz@_e(Y5L-qAoGEcS*^eWjhSTyE_26B(-$v= z%m*RnDzyR+GG>+)__8}@n!b1$WIh-&s}*>NF|(||SKKkv^u;ej=0hQ~T7iceGs_BG z?v9zJFMb6w9|oD#3Ovl1Sytey?wD!%;^mO}2*|8f;1R~mvI1Xo$4t`~zY3X;gv@FM z9%;-hEAVx9%rt%RYmoV9$gEc2(Z)e1b;m|0ffo9>ut`r?(4c>rRrRx5CTF|(|| zx7;z)^u=#N=Hno@duFkWW-#fR^Z9T%(4PMa>u+nuMvL;nNNYt zY6YHR%q%PLV|UCneep+-c_d_3D{!PSv#h{R+%ePi#UDfF(U4iKz|qFcvI0MK$4t`~ ze*&4uLT0rB#~L%s3jE9+GfiLoDP$f8nbis$XUr@s@N;*}G=1@Bkoi=|tXANu#>}z; zzi`J)(-(gZnNNevY6YHV%q%PLOLxpPeeoBNc|2rRD{%aOVD80#J^Mljy+U|0YSM6> z(4;}_fZ??rYKIOR)W7+TJ-T%qSUcpHVI2k!?cZ;3`-)6ed0G3?^0KO`l9EhSS*9}6 zKGU%@|Nlx#WCnia&Y89^{t`N$4xQBuJe?iE69f0)zn*p8BZT>N&PC*W@`wQ=1~hN? ze|9eGSla5hko|@~ZC+FqfAjx<9PvMXI5rgJ|7GX?M`ZuUofO7}qBj4x|1I=g3g3;t zYyLL==HEXqDk{!?BKL9{XXcQbWIt?Jccir#GGO@degg+|R1LVigSP8=F!2u zd-U18MVHQfy6#!W%76WTLR=<@zja4U6 zIL=$d-;qg@cq$-P({HLNaYhh-?~b_cV9oxCzt7+1ICKB8a1>t!h}G=7ioTuAiK0Rf z|KN^zt-MA210l5-H5cvj#tVZ4qw#XTQ{HHtQhJ^el zM7|LrtC@GBEpmlG{>vTm288?-t=$TuNmHT7dnx;B)(KgBqOi$XUeWHt6~=I>*37p__$2Y1L#2$^yD_FtFiZ$Zdv?%iUG zTqBSpcgS`3f3tsz*Zlp+zmRW3$ZGK2mjAv*HusauN(6H34!LO_qnIw&r<^WsN62dN z-ENC4im$lX9r8wm%qQjK>EaH6T&5P^9k$4#_=?wZhrBT%(eR_A0pg8VQ-R*UapTVz>$4csAbM#yySJ_UI$ zLRO1!t}U`GzIELpXMdGY_otXH-lrfxijdXfdo=%jt%gq)-+Jzlx5#4@)5ZG~mV`_f?^BTHA!N1q=Gh|4;%n#*c`HJui}xwWj|1d#wfG*lMV7_4 zfji_DgiIIjQ;_E)WVQI_+ak;2Yvc~OB_Y$r`xN8_2w5$@1-8ht_!_%IZbis+@jeB4 zAwpJ*Z=o%+EWRf0khdmex_F<0ya*wy#ka^7Sr*@h?vPs(GF`k+L4Fb;tHt-EEwU`W zrtXlpA!NFEpMv}pLRO3KDO+S&d>gq#ZbQg)@jeClX@sm6-_y3pviLT3hrBHz)5ZG~ zqDvMj#M-66LpWV(2tg1i(VtHrm}_H-eOZwq(G9SE5&-lrfh zL&$3JEwe?I#kZw94r=g?kkttHt-KDRPA@zLxHg>3&!-UA#{@l3zo}YVo~hi!6(;l{;j* zA685k?^BRp2gns_@x5+~EQ@bzcgS=$U71PE0B=Tvc2w5w>>{rnrljreO$l`13 z4!L9AqL?n;Cy~eJU)H|vx7q*xQVbPZ@nyft6j>JE_U@2(B4oOFpMpFb9m!hpjUR4` zTq%oh2Y1Lj6Ea=APeC4mkhS6)Kf)GS7GFDe$h#0SUA#|0&cC32@^n$D72o)gw#c&h z+Pg#Em5}M;eG2jza3oh2wv9dMw(dn!$B*Gpnham1EWQrzkar_wx_F<0oPYW6lp|Ry zzVWBpBFp02(H(LpLZ*xNDaiR(rA|REXU8>eb4T)c{-n*3EQ_zi9dc(v<`Znwc#k$y)J^Kiw8t7GIe=oO(I{8kogV?bMkEt`Evfq z23ZzgjXUI?gv=+{B=Qu5%y&qblW%j#Q}`nrWLbP2-68Kq$aL{O2b%j-arXb_xbkn_ zl8limzC*&Cd`n+NAKDCygwm#B9!D^xam3gByzP{eA8`_W$|@(huoWxJ40mj z78uoP@y)PBmc`e_9r6K$Oc(D{P8aAcFsjw!n`w(Ii?6FYO<5ue&?sg9(`~-lrg=Hx8&)i|-a&WLbRKw`2Z)f6L?lU*16Z5JIMl_bJHeHSMd_ z;=A1zSr%XRjpv*pA4$`@2IvhLGvveF`#qP5Ty)$ku;{;4E^YNk z-T(AoHqX9kN*{O11M(WhbooBzSYD9(T+{5|*JzFRU{|AWLH--V*WdeJGnWbG1Klwn zN6d5qKZW@T$gF1H6UNNtg83kK%may;F5#yz=U>@A?PylRZ;>%`Mlc`jj`?_Eri=I~ z%=y>0Ph(co?@43k3c-AcJLW;eOqcOfnDei0pT?YF$u(|szf*mRKM8)P`oBImR|@7s z-7%j)%yc0?g*pHF_G!#&{ylBXTqT$fbH{ulG1H~|6y|4gpG#v_1MnGR=4!!wxI5;- z#7r0SQ<$HH%xVHYYs_3Dn2&JBJcO9(a()VP{{0%#j%GCi7uzzImI&q}-7%j;%ydCN zh531SG^-W(yfL$^z@ywT4<%;0q@Ti^e`Ac4qq$VAz!!{}Wd$DXj(Hd{(?$Ih=KQ-h zq%o@%xWt%QR$yOu%qJ6bUs6e4Im*AKKpL}JfiD>|%L?r0j`8w;c{ zs}=aNF|(||W8E>2AZEI{pThh~?sI9(Y6ZSx%q%N#fIH@q#7vj>Q<(Gb;E=|wR^W1D zW?6y9xnmwh%yfA_g*pEo4r$D41-@#_TqY}UpgZQ##7vj>Q<(E_Fp$QqR^aQ#%(4QH zcgH-2nCbF<3UmG~22z;I)Cyc-%q%N#kUQqF#7vj>Q<(E_GLXisR^S`P%(4PcaK}83 znCbF<3UmH#2GW?-3S4Q-EGzItcg&{}GhNVuiJ30%r!c<_nbit>+n8Ba;7RV7ClE7T-cMnE z2QsS__>M8NtiYk}m?si5UEWV&&c8oN+PPV+z*WY~vI2*>V?Ldj>GFOG^J;iBs};D~ zmbqM3;K}Zo&md;Hyr07SE@W0K@LgkOS%IgxV?L9Z>GFOG^LvQ7T&=+OjG1Kx4tK|V z7BSQ1{S@X8AhTM59~d*s3aoXa?Wd)9K$9xVk)8+k?qxnO4 zG^-V8%`7W$q&wzwiJ30%r!ap6nbivX$oOcM6*$Tr^LfNfm-kbcKZVR{1%7JGEGuxd zJLdC=nJ(|AFn7&66?ld_=F5qhF7Kx>{{)%U3jE2KSyteg?wGG2X1cte!u&I2Rx9vlV`f=_XSrjZ zLdY=BtRAF7Kx>{{@-V3jE8MSyteA?wF?$GhNQN6cCUnlsA^ywDxuEgJ zIAJYgW?6xkxMQA9%yfA_g?VkrtX1HIwQZRzWd&a9j(G+#)8+jX=6aA>tH25MjG1Kx zPIAXQlbGr9ehTwCh`Ca$zzORZGs_CR%pLO$#7vj>Q<&>RW~~Az)Hi096*$=)^Nqwz zm-kbc8$f2Q0w**uW|kFrxjW`r#7vj>Q<&F<%xVR$Ys@Sw@CtX#HxV;k-cMm(4>GG2 zxSlbytiUPmm~SR#y1bvlygp=BD{y^dW?6w(x?{eDnCbF<3UfoqtX5z{V`f=_Q{6G& zO3ZY5KZSV%$gEc22FA>?0b*-<^2@qMvz&pz(%&rRk8x7xnsVanCbF<3Ugz~ ztX5!SV`f=_SG!}rgP7^^ehPCF#9XCTU=w3zS%KHMW4@D^>GFOG^M;UFt-uY9nPmlD z>yG&@Vy4UcDa=hFvs!^ojhSTyUgwVaZepg(`zg#DLuR!CH#TOL6?nZn=6i^lF7Kx> zZvvUs3f#n)Syte5cg*(^GhN5h4JUZa>U@24Ei%^|Z|fz6GXWd+{gj`@CKrpx;&%$q@G zwE{P@Wv-SLc%wV!ImAqt_x};IT7lNgvI1whV}5{`>GFOG^XBMiu2w5>bK|2~R^UzU zm>(o&y1bvlyd`8-D{xC=W?6wZyJLQcnCbF<3iDQwS*^gWjG1Kx-r|n=VPdAs`zg#V zAhTM5EsU9E1>Wk8`4M8K%lj$JEg`d7fh~=hWd+{mj(ILI)8+jX=2nndt-w~s%(4P+ zcgOrFG1KM!6y~iVvs!^$8#Buayu%&yW5i6C_fwc#LuR!CTN^XW3cS-D^E_gv%lj$J z+dyWu0=Kbcu8|dZmpkUiiJ30%r!cpH%xVR;F=mz(c(*&|`NT|@_fwd+Ma(s71#WB1 zEGzIHcgzcjnJ(|AFmDH$)e79sm|0ffz3!NwAZEI}pTgW0GOHEX)|gpV;C=3x7ZNjF z-cMoP0WzxywGp$dz=z#2KS#`Tc|V1@ z3@~R8AU-dwahrR1N8wJj5wonoN8B+lCT6<4pTb-YnF|MO8gt=JwGp$dz`5?2pC@Lz zyr06Hfy{*iHjTM(r`m{FR^X%Vm|q}fy1bvlTmhL22W%R1;ZC&?v#h|!+%dmM%yfDG zA2AmWSP#sy0_VA7UP8=tc|V1@3Ledc12&DhaHrbnXqFZDxI5;Th?y?$r!ZGTX0-wf zcdCt;Wd+W6$Gnu7>GFOGa}8uJ9I$CebKy?45wono1@4%a5%U6~N|UZa>U@24EiJ3;2c0n4Ivo6D1(_>)G=vH};nV}6C0>GFOG^UjF5 zRIR|BjhSTyE^^1boS5nIehTw0kXfz3U5uG!1wQGH`Bh@3%lj$JyFzBQ0(UiLmKFGv zJLcDjnJ(|AFn5B?Y6W&OW|kHBv^(b4iJ30%|08C#041wP}Bc?B`k<^2@q&hThf zE3mWi(JU+QS$E8D5HnrgPhsu?nbivHV$3Wn@HuzPD~Xvd@24<#h0JONb~R>}6}Z?P z^P9v>m-kbcyFq5P0=wBVm&poz-W~H>#7vj>QQN6cykS~JTET;h&-6*1H0{S@Xs;nA#C;GV`uv#h|E z+%c~vX1cte!rTKgs}D z1)0?f+{>6*R^ZF-nBOO6y1bvl{QtFgAHY@C-M+_nfFuftioIjQ3ZxfofLKsaq}nAw zDAJSAtN{zy6>Qi5dqG7M6e|e!E+B{vEB4;&Np^l~zw7#}weDfg%sOl4Uf&tF$xEVs z_~+Tr_s0%)Rhi8S?CQ+SD{xsj=8wRPd0$}erZSrq*v*-lSK#t+%pZdp^S;1*q{?ho z;E}$}g}ee+gk$~$%$WBD=I$!9S%KZ1nRx}i5srB+m@)4Q%sn*bLbC#UI5YDKTp5n} zQ!r!R7npmh%w`4lbY|uixGEg;XJE#>FEIB~nav99<;=`0@Xc_{pMx3mzQEjDWi~6Y zw=*-Zz}4ZHzW_7leSx`;%4}9(A7^G>fp3Ll{u0cX_XXy@DzjOEeVv(k1->1Q`71DE z-WQmUR+-HTJldI=SKvG0n7;-y=6!+r7?s(qz+;@5c?G^3j`2dGc&Kiwc(h51vBP-fq8(+Y*yd^XJ%f3pN3=p4a}JL1?GV&vsr-yeVL1S z1%4Ke`FAj5-WQlFRc5mSE1j8n1%4im`42E--WQk$Y0SlD1rBm%<`wuwIOadWjCo&R z9;`B(6*$2;J4wJ;oJoCzQ8=6!*AtjcUw;8CVi&0{;oeyb+i&?+eUlsLW;sp5e^Q zDlj`0j(Ot-4NMy;f%#08*{r}botaq$W@m+CZV6`kWfXc$)lYZn--x+ZWi~6Y)|r`A zV0NQ$%$tB2^S*GJC#lS41x|8iW)+y-I2`k)V8*;JFrTF|n-zGLGc&8e>?YxuHv==~ zeS!IGmD#Movz?h)1!mV>oKMY4weHfn{otAr{YSSQK59V4@HWLorG*7;@(T+}OY`!I zN(+igirN&lr|0p^mvh#@tW?vQ%Icc7W5!mFt$U4H*2w?CXKPT%+8oUE9GJW|pQAFH z6?l#_GpoStoN&xrfEn|?aGK9mnav73*O$4BRbX~*IOZ+EjCo&Ro}x0F6*$G2nN?u+ zdf}M20yE})fqAONTxM3_RA**Zf!XVaW8NCfnD+(d^HgSf_8?GtOy6#wM{oK3cTdWA z1vU-GybYK!?+eW5tITEvp6|@eE3jEO=54`@d0$|@P-QkN@Iq&1UV+WSF>eQE%=-fK zMJlsdffqS5^9tM`9P{>I#=I{uU#v2l6?m~TGq1oF;h1*-Gv>CWm@)4Q%$KRmW(8j6%*-orqj1bSf*JF^z&uT5HY;$NFLODsz>UK(?*wMd`vUWH zmD#Mo>CVi&0$YY--Wkl8_XXz5HRf`&0xx%F<`uX}IObizjCo&RzCvX-EAR?uW?q4t zhGX6p%$WBD<||cZvjVSlX66;RSvcm_V8*;JFkhuIn-zGKGc&Ki&BHP824>9r0`m-& z*{r}B&dj_5w+P3)JD4%=3(VK3%w`2%;PtM|g?YRJw+Y9*H<&T+3(PmD z%w`4N;LOY`aNBUqZNQ9qUtpf8FxMR*lKj_W`WLBY(mP##k*Y9{SKxNxnA?IG^S;15 zOJz1IaF#POufXlYF}DLV=6!*Aw#sZ);B04RUV%G=W5ySLHs*bS`9_u5tiT(cnRx}a z3df8u{OndxNxr!2CY9N&z?+h6?UV*!WW5ySLHs*bS`8Ji=tUzbx zd|rXOhGWJTem3TPf%y)V*{r}jd{1*eufW#fnDK?5jd@>SzEfk)H!JW?XJ%f3yM<%M z7k)P8eS!HdmD#MoyPTPM1@0b>8DIF>nD+(dIV!VRfpeUhc?Iqfj=6ne7rlLzSFI1W7V+fQU z)65I$EhlDPfyLpN4+b+8U6T1>m6<+6tz_M`6UBFC5mt=lSWu}iI zPm6`vUV4mD#MoCC<#e0uKns+#SrA z_XXyqDzjOEOP!f{1$GF>d=!{FKqYxY_q57vR^Zdl%)A0ShGXsl=8h`!Gb*!LfzLQI z^9t+~j=3k8G4Bf(jb~M6vjU&>WiH|scwji@USP(&FEBr+GMg3noHH}8z|P^AdxIJC zzQFvv#$04p;PcMRyaEpj$J__ZnD+(d7gT1m0$*@u<`sBwIOe`!#=I{uzo;^s75Jhv zGq1oy!Z9BWX3YBn^UEr;S%EJ*GxG{OG#v9WV8*;JFu$TQn-%zqGc&KiF5#Gu1vBP- zf%#RH*{r}6|W8N2-m#fTX1ul1H<`sBEIOdbUjCo&R zUZF7;n-#dinVDDMk>Qy8ff@6@!2E{FY*ye(XJ%f3-NP|gfEn|?z`ROjHY;$IGc&Ki zqrx%w2Q%h~xW8N2-*J#Wo zW(BTsX66-mOgQF~!HjudV18d^HY@ObXJ%f3$A)7b24>9r0`mtdvsr;3I5YDKJT4sb za4=)u7nna%nav9P$eEc};PK&@M}QggzQFvk%4}BP$Ii^W0#69XJQB>9_XXxpRA#dR zKXGQ}6?kGe=22kAye}}XRhi8STF^>Ur zKd2;M-~5@%Y*yfBzRab(0xQBXSAiMxzHpj9SDDQU{M?zDS785e%++AVye}|+p)r@5 z75IfSGq1n_;h1Z{jCo&R{!(Q&EAUHaW?q2NgtiZ3GnRx|PhGQNF zX3YBn^EWE9S%Kd;GxG`@6pnd3m@)4Q%-^caW(9uh%*-ora5&}(V8*;JFn^~qn-%z- zGc&KiA>o)Of*JF^!2G?+Y*yg+&dj_5hlXQ51vmW4;W`wNS~- z#P!op{eLN{6?k?y z<}1LAd0$}OLS;59a0_Q-+*V8*;JFz=``n-#dDGc&Kii^DO` z1T*G+fq5sD*{r~woSAtAUJ{OZ7ML;b3(PyK%w`4d?99w7@X~P1v%!pcUtr!vWi~5t z7iVT(ftQ72z7for_XXx%Rc5mScXejw6*w&%^G#sJye}}fR+-HTZ0*Zjz$eK_WOz>Ilc zU@lNkvsrOdW8N1|bE(Rl zxh~+Rh#t}xjm&L`6Em;C8^bZ*4`$5!0&|(loVhNLFCNp(ncEO2W?q3eg=2mI%$WBD z=5m!eb6t>_Gq)j5%)A0`4#zwn%$WBD=JqPHS%K}z-ieu4;4R^p7l0Y_zQDYX%AC3U zk|-Y27ma=BoleZW0&fk+{2-Vy?+eWPs?3?oFNt#I{pg)O%tgEcZwtr#5STIV3(NW(9V1 zX66-mXE^3Zz>Il+otVuE?BvYMEAXyx%#VT@^S;1*pn96k3heC6%qwtCIOfN|jCo&R z?yNGK73j^(EAZ}c%#VW^^S;1*kjiXU;K9zPnOERF;h3KQGv@Z_Fk{{qn0uIlcVD62VGc&Kihr=IlcVD6_fn-$p4nVDDMl5ot+ z!Hju-otVuEtZ-)L6}U7U^9nFy-WQlF)YEKMpfhtRufV6mF~0$3%=-d!f0fy+!2Z6c zxs+Gn)8Uv`f*JF^z&t=>E;TD~fHO0%z-PiSuL3jXeSx`BWi~6Y(wUi8;IrYF-vl$} zeSvw9%4}BPAZKP?fzO3wUJYi<`vUV|mD#Mo!OqOQ0-q1Z{1%uo?+eUBRA#dRhd49y z3Vb0P^V?v?ye}}HtTLMwc(OAyufP|>F~0+5%=-fKFqPS?z+ukJyaHbe$NVmsG4Bh^ z!&PRp0*5;@^9p=99P@i%#=I{uk5HM-3LN3fT*fQ#m2k{!z>IlcU>>P5n-w_HnVDDM ztKpd62Q%h4R`9m;c-WQn1 zsLW;sj&Ww@6}T)M^G9IDye}|Usmx{tRyi~C3S1tJ`C~9+-WQmwRc5mStDTv71+ECk z{0W#b?+eT|DzjOEHO|bu0^bP7ycW!u_XXy0DzjOEdee5@a=HSUx69(zQBB%%4}BP zY0k{N0^bS8{56;{?+eUlsLW;sp5e^QEAZWL%-?_+^S;1bt1_DvSnJHpEAYK=%-@0; z^S;15S!FgWaI!NqufR3on7;$_8mMHEPLsO7NdGRBXQ|9)1)fEp$mh5FE9VvXemLgu z8#J;p?+d5-Y?axpz_Xp1c?EtDj`;^LW8N2-&sCYt3Ov`9xj2tk;D_Oue*`n;eSvw3 z%4}BP6lZ2$fggoq{t3*O_XXyu3Ul27BFTR}rZ4GJ>76du=HfhFfggus{u#`e_XXzj zRA#dR&vRzx75GUw=3l^!d0${YUu8Bc@O)=xUV&@FG5-o?%=-fK1uC;yffqP4^9uYl z9P@8r#=I{uU#K#h6?maDGq1qU!ZH62X3YBn^F=DNS%DWhGxG}kJRI{MV8*;JFkhlF zn-zG8Gc&KiFTyeZ31-au0`sLRvsr3ONvjV3(GxG}kCK_`iU}R(77nrY5 znav8k!kL*@;J4wJu`g$1-WQm!RGG~RywaJOSKxQym~ou5G4Bh^SE!y-WQm! zRZp{7f!8*C;#A6KZ_eix_)|FM957?v7nrY8nav8k&Y784;LqWhbHR*xUtqpoWi~7D zdSB)OUV*=aV_px;nD+(dnJTkcfis<%c?JF&j(L4BW8N2-XKBm@W(Cf2X66<6TR7&X zVEzp%$(O^-R+-HTobAlaEAaPl%+0`zd0#lqIWk+%q#HkaLgNm z8S}ote4EN_R^V;U%)A2s3CFwelL%=-fKJu0(Vf%iBwvkJ_qdk#D`E7iJ7=k|kZM)V)ucKE0P6~o&U7nK$k zw8<|lC@sy)D=IB0Dk*AH)SkX1Ggr;5fmx}hHI>yhZO4qQ99vm;S1|H_@Yxy^8f^h) zy46Tto9|Vb%?iBNnVD5!PHs5nEy0X=UpUQkRc5mS=Q=a93d~tA9P?IS#=I{u-={L0 z6?mUBGpoRy^}{i54Q9;y0`okT*{r~M&dj_5n}%cF2F#fE1?KxzX0rnC_hl~P71%5s z^R{5dye}|6pfZ~k_<%DrufXQvn70En=6!*AzQ$Z+R^WVRW?q3Cgk#NGaVK23TzRMc?U3K-WQl3RGG~Re9)PhSKx->m|KAv^S;2mP-QkN zaG^6ZufUDMG4BXw%=-fK!z!~`fe$+~^9tNJ9P>_K-WV#$*nUK1HY@NEXJ%f3EyFSI z3}(#x!fAd~Wi~7DQDRhi8S zTD=;q{b4M`K zT|;tjen(|CEASm>W?q5$;g~ytneG~r%rA+!@St*N|jhqcWQnxW<{8S71>%=7YdYcMVDA_ci7+x}Fm#J*K~5?R|R7 z=Ns0_cm)=RV?G$nbk~q%{y=4>>p6kaW19H`ddrEKS71pv=0m_tcMVDA4^?Kmo)aiN zrkOvYx15-H1(t?mJ`~J!*N|lXSY@W`If2q+n)zdT%ZZs+U|BfkE?}m+hIL`4>p6ka ze&>3UAQ^q6M;g5L5u&E>oT_YcQ>B$zSp z3(Q|?%;jbUe(B82EAW7D%-z9^d0$}uN@X@H@GEC#UV$CLF&_oy4p2$n(0!van-%zt zGc&Kij^UVlfVrc}{H@AtR^YeJ%)A0Sg=6jsX3YD-MdLe_*{s0toSAtA9vF_f7nm{c z3(ViE%w`3C@660AuyZ)(-eAVOFEIb0GMg3ngEKR)z=Ogu_W?8JeS!H$mD#MopPZR_ z1s)uZxi6S8?+eU7smx{t`ZAZ~@d`X79P`m&#=I{u|DrOR75IzmX)ej*6?kYk=3~H& zd0$}uRbj3>KqUFE$8>D}O7C=u?UFoRfnCBe9}8y8`vUWCDzjOEzd1AW3Opey_`5SRufW5@F&__R%=-fKA1bq1fqytN^9t-5j`;*IW8N2-|5TaH3jEWV znO9)9aLgxy8S}ot{FlmXR^VUG%)A1R2*-R9m@)4Q%zvxQW(EH3%*-qB$Z*X4z>Ilc zVE#vCHY@NSXJ%f3-NP|gfEn|Cl6g|Ye?xH7x*xYu{eMEJ)riXK>WaaY?Mw2k3atAu z{NZ!ooX;!psBp~v8!&P(?+eUX>S?wra8i~tGq1oN;g|=28S}ot+(={2w<>T_BWGq_ zfjz@94+JyjeSx{L%4}8Oq{hz7yaIcLW3B`<=6!)VTV=K?a8kB2Gq1qj;g|=38S}ot zT=(Dkt@|;;Q((STfs=BanRx~F3CBDb%$WBD=Jix&s{$vj=giD2ux~i#Az;S5FEFpK zGFufmX?lg3}>>rM~y1^m`^S*G=*i2#b}3LF@Yc`TSQ?+eUZs?25uZt2Th$Sbfi9P>CZW8N2-w^EtS3f#(>nOEST zaLnVujCo&R-dbZWG%IjxXJ%f3gTpaT05j%&fq5I1*{r~AoSAtA4hhFR5zLtP1?Fv4 zX0rmfb!O%jI5ZsdDPYFDFEDSXGMg2+oij79z>~u^}7o(yKp`vP-omD#L7Z)RSBRpFS=0yE})fq6HT*{s0b zoli5b!0K?!XM-8@zQDYP%4}BP9?s0X0&BuCp95yh`vUV`DzjOEdpR@n3LG1b`CKq# z-WQnnR+-HT+}oL%SKzpC%u~ROd0${|qcWQn*v6TeSK#<0@mT-6!%WJwixV@iz*EC9UkGN*`vP-;%AApum^1C-#LO%3v~bK9 zff@6@z+9v7R$%6)+KHK0;2GhVF99>=eSx_| zWzHN}=`?3`BE@r-WQllRp!irm6$U()lSU30&BxDUk2t{P$ggAT&6N- z4y?qSxv6$y<`p<89P>0VW8N1|bGgc#Ij|CQ=BC<-nOETCaLm)ejCo&R-bZE599W5Y zA9|+`a|y4&v%)c74ra{z0`tBqbLPO3C?3;!vM;^UiJ4d6+2NS405j%&fq6fTxx}o% z{hXP31)dX*`ARTj-WQnnSDDQU+~1j*SKztfn6Cme=6!+r0F~LSzyq9_c?C`h$9y%I zG4Bh^9aLts0y{V}^9r0Aj(G-{G4Bh^9aUzt0y{c0^9npK9P>3`#=I{ucT$C5$-vDOJ`vUW!DzjOEhdML!3cNTR^Gq;f-WQm=Xw0Q%1$J>} z<`sBJIObVk#=O5y%w`21=FH41@X~P1v%!pcUtm65JHm~R3z=6!*=o62lfU^i!GUV+oYG2aYk%=-fKkt(xUfk!$s^9sB? z9P=$;#=I{ucUPIs3heI8%q#GUaLl)Y8S}ote3Z&;R^U<2%)A1x499#Mm@)4Q%so|R zvjThiGMDiRyeb^??O?{dFEIB~nav99<;=`0@ak~PcYqo5zQEjDV=gl*u(vZaufQ4M znC}EL=6!*=kIHOTU>|2@UV+zyW4;T_nD+(dqg7_J0*`iP<`sBtIOaKE#=I{uSES3#=I{u*Qm^91=ct-^9sBn9P_Ks-1T*G+f%$Zm*{ncsW?q4}g=2mQ%$WBD<}+1hvjS@yK5@$H zH1i6)Jsk5wFk{{qm?x>sW(7`iX66-mM>yt(!HjudV4kcpn-xgk0q1p^c?I4Xj`;GA&GkAWHUzQBBr z!d!QN8a_7h=k&K<(s#glG4l$%I~?=lV8*;JFrTY3n-xgk0q4ccEAXCh%uj$B^S;15 zMP)WCkiG-Xig9T4mdAnUV#sWV}2IQnD+(dOI2pG0xxa=v2 zX+E#Ohr%&G2WHIs>%?qU;APItyaE@7V}2gYnD+(d%hc0sR-iXCufT`HF~0z2%=-fK zG?m$`z-i8>nOEQ=;h0|pGvF4!FJ@kWPlsb(31-au0`n}D z*{r}>4WHO+2rb|h_)IwFRba-vFEGzmnav8E?aa(8@Y!(8Z-N=~zQBB=%4}93eQTD} zMWc{c;B(=aSA!YzzQBBw%4}93eQTB%Gq1qs!!f@FX3YBn^UWG_p;>|Styx~oyaHbc z$NV;!G4Bh^x2Vi!1=6=>c`@?}d@&sJJ7C7VFEHP#GMg1h--PkQXzrz?Z`@zXxW_`vUVFDzjOE^gTmf%)A0$3CFw!%$WBD<~vnpvjXXR zhP;@01-=@N`F${B-WQnXsLW;s&T06>UKLo#EAX{&%pZUm^S;1*x5{i*Abm57*JqCW8N2-A5fXi3VgtsnOESdaLk{98S}otJYQutD{#IuGq1om!!dsj zX3YBn^8%IGtiT1%%)A0uhhzQ%%$WBD=7&^fvjQJ-X66<6RygJ_!HjudU|y&)n-#dw znVDDM+u@kM0yE})f%##T*{nc%`M*=16!QvvCmi$FV8*;JFh8O)n-xee|Mz0%75HvA z=5N4^d0$|DRAVkSE0A9P@5Rh3@V#)%-+~$QzQFvL%4}93z5L&cnOESNaLnIHk z!2Gz%Y*rw>{NIb2SK#~Mn7;=z=6!+r36eS!HomD#L7 zdcm|8Gq1qU!!iE>X3YBn^9w4oS%LIQUN2@|fnS7U{u9iY_XXw`Rc5mS>6N@*%)A1> z49ENzm@)4Q%rB|TW(CqKdA*o<1%4Hd`EM{|-WQl(R+-HTq*wBKG4l%iIvn#qV8*;J zFu$TQn-xf}+p`%$WBD<`pWlS%E8@nRx~N6plFu%$WBD=9Mb5 zS%E8^nRx~N9F92`%$WDriP@|`Z)RSBzl39656qbN1?E-iX*MfxmGf!l75Hm7=Jmmh zd0$|DQ)M0==1e1^yY1c>^$G-WQnP(N1%jS%LIQUa!;4EAX#y z%q_r-d0$|DPh~bMkX~Zy#mp=4?{Lf;f*JF^z`RCfHY;#V!zcFoF4r<%f&YYK-U!T? z_XXznRc5mS=_RIKr--9V8*;JFn^>nn-xeeG4*0*6`0#N9P_4Nre74KQ=O_GqSOB+ z=Z{rpvjXWQre4gf0&|;$W8MtRnD>R#{E5nJRv^8^)QP#ARbXy*IOfg4jCo&RUaK;j z6-X~J^^Q*m1yZWxZa6__#a3(ViE z%w`3C@660AaHDX{JAxVWzQFvW!d!QNNb+Bg={)(7-nn~|^pD%NQQsb2dL7iNQ^#Hh z9$J@HhtvOG|JPYrOB%Iov0kbr%df55{`V@beSZ6b_GNjz0yhrFyi>!!Z7$}0f%zwu z*{r~yh|!6eS76I<%sYb_^S;3Rv&w8%;Lpy?yaG1~$Gi)eG4Bh^zpBh;1^(*H%qwuy zaLl`c8S}ot{F};bR^V^W%)A0O3&-3V%$WBD=HFFjvjXYWVm^6Nmd7h_^Ki_&ff@6@ z!2E~GY*rw>TFi@?SKt=mn0E&==6!+rPnFrMKzg;97c;NGEyFSI0cOnm0`p%gvsr=k zYB49~d|rWDg=5|m%$WBD=D$^DvjXYWVqVO=0=Evwycd`;?C*{J?k z$Xbo4tgfyYT-m-X->SgLnP2Vl$&-9uf!l;*-W$xA_XXxgDzjCAlj)Z*y-qW)z-_}Z zw*fQeeSx{L%4}8OWO{v#7c;NG?ZPp)1vBP-fw_swY*pZ7dVP%-Gq1qy!!fr5Gv(S)bf;le;ADDzjTbYoz#YRe<7q4x^S;2mzRGM>;ADE?hZi%iz@5S|<7q4x^S;2` zRAsg*a5BB{!-=_oSK!X!nDI20i+NvQZl*F@6*!q*_~FIOD{z-^%y=5h#k?;tH`ka8 z%nGCzet0qS3fwguGoHqBG4Bh^EmUT+0_hbAUd+4#TZd!D(^xL%eSvvnmD#MojdAPZ z#mp;kw{XmO8q3AJFEDSTGMg1h_3p*YD{%L4%y=5h#k?;tZ>KVw6-f2&#mp;kk8sTG z8@{%4G4Bh^JE+WN1yWXeG4l%CGaU0iV8*;JFt<{f%?fPgd~N0xxK}vleZh=*Utr!* zWi~62veN4`^9tNM9P@r)#=I{u@1!!D6-Zg>#9YWLuuVAT{lScRUtr!@Wi~62veJv0 zS76(4%m;uO^S;2mi^g1NRv=}i7c;NGcHx*ifEn|?z}#A8HY<>N$BUU)U|u-pj$o#f zS-&l(|ET{(rur8uPu^W+HY<>B#J!k#1?Goi?$m&qOD8kQyr;@+Rv_IWdNK0~EC|PZ zAeiZ7CYkqAnav8MJ47#LUV(+-m^*`+PG*vMZBNy|3@yJ%ynTlE0AtoyqI|fmW5;P0%kgyN#+9WG#6zKY{Tcs{5gHQO}8#y z%)A22!!aKQW;&Tk=0cS@b6_*T4S$hlrdt;;W?q5q!!aKYX3YC(()7DB6q$AOttk`;Kk%4}93hHNk95?+CIze{7V-&_B9Fq2A>xvR=-Rv?CKH)dXeUBfY- z0A^BI2j&v90x@K}G4l%S7LNHuFq2A>`3UVamzWiZA={0aSKtxhm`?&TsU(??RGG~R z#E|XA%q#H7aLoO{Oe#s{?kclcff%ygn0WQHqAEh#z6^J3*jhR>AQQ?^T zgPBy4%so_QvjQ<>yD{?$>=BN60GLT7$=pk2HY*Sds~a<~z@Fil2Z9;%ewsA>uFT6} zdaKN41!7@!W9AjuD;#qrnCb8(PjerY*{nb;tX|BeyaIcNV;%%%I($jyzACd>fmm4G zn0W>E3CBDb%yjsY%tvd?rDg?UVRd8X71%c%^AIr8;Y%_fqcWQnh=tXSnOES^;h2Yl znGRo)`B;_NtUxTRZp^#_j|swxiRw!JU$%r2ry&bPm`wKmC2KnRA#dRG5xtQ z^9np69P>yp)7N1#a6T%j_X6l`T}qS8C#%e61!9wOW9Ah&I2`i?Fw>;h0YWGhIrP%p=s(Y*rvPDX-I9&MWZbaLlKInJ%SC=8+n6xmkhOq}-T! z1r7_xd>WYPYdpz3N@X@H5Sx@6Gq1qm;h0YcGv@s?Y5HB6`{pq!vsr-{OWc@w1&#>E zdOG?a8x+vS}@b4G|60} zGMg2MvBZs;SK#Py%#*;3c|T2>eplw&JXU2kD-dIe8#AxKG2xgegPESOlBao`%4}93 z#u7JXUV&BNn9l+;J!2)A$E(a{1!635VlL0)6<8gP`D`%LGggv$g34@GAjT3mW?q3c z;h4_>Gd*J^nI|gDbqA>7V-tT)|IS?)OWc@w1&$5Jd@h*j87s+ripp$OAjT3mW?q5g z!ZA+)Gd*J^nNL-j%?iX=;>OG?aC|uCsbHpOtR(YkDzjOE7)#ukc?C`g$9x``=@~1@ ze1^(wRv;?gjhR>A#Bj{#gPESOlFVnS%w`3m;@y~e1)dU)`2sN0GggwhR%JFTu(sh7 zyD{?$JT)BigA!Av&>N#?04vsr^}5f^f{& zfthX$lFZXoX0rm3mu}3w0xt~5d_9=y#vsW&U1c^a5P9jw%q#GsaLhM=8S{RcH2tp3 z-h8>rY*rxh(v6u{;KkvXXM&mTzmli<3YFQcK;)$xGq1o)!ZFVRGu?kBnXgir%?d>K zxH0nzyfhs1Y%tUPSCaW^mD#L7bdMKvA+Ny8!ZF_nX1f1MGS5(%%?d>KxH0nzoEDDx zCNR_eSCaV}jk(aQKy;5AGq1qu;h1j*Gu?kBnXgru%?d>KxH0nzygVH9EnuemuO#zz zDzjOE=pHv_UV&GHW4;y4bpMrPzFuWED-hk|#>^}5%5coLff@6Dnl$~cOrFeCnav8s z4Y?aLufVIqG2aemy3I|V=2pC5^9sB!9P`~^rrX>k^DP>4ky(MbA$Mcu6?lC(=6k?Qx4B8?TUBPW z0&zp`#>^}5hH%XHf*JFEnl$~c%zg9iDzjOExKngv<`p^{lb~xsFV4kfq-=#8}6^J`UH)dXeH-=-r zAIww}$&1F_DzjOExP@_J<`sBTIOYeyOf`{YzDH#?D-gFZZp^#_Zw|*iAIww}N#=W1 zX0rlu3**IH%q#GgaLfz9Of`{Yo~tsO6^L6HH)dXew}xYW5X@8)N#^@B=3=t~aSP+d z%q#G=aLf;Z8S{RcH2tnjp3GC3%?iXVj2knrz}v$yF9b71Tk^{lPB`Yrz>Il6O`3jJ<|*(&mD#L7+`_mq^9sB>9P{H~rZ!HV=7lP= zS%G+Nbz|lgcuzRyC%{Z?oMe7jWi~4i&#hj}CAc-3~ zaBeu}#bBm3PBK5LF_)MXi04)}W?q5!g=2ma%+$t7=EqcKvjXwl>c-3~a9%j(C19pD zPBK5PGMg2M=TAf^f{wfSKAj$-G2mHY*SpeK%%afe(gb zeiqEs#!2R-DzjOExahkv^9p<@9P@Kv#=M^J0FM*jRh$Qp#DzjOExEi@J^9p<{9P`UyrU@d+{DR7CRv@lMZp^#_ z9}ma;3YckvNHV{uGMg2MtC1TsufQk5F~16Cnjn(QFR9FC1>$Pt#>^{lQ8?z;z`Us8 zF-@BO%glZA%PO;3fw&sEG4l#s9FF;QFfUe_Us0LO3dGgOjhR>Ali`?`fti+`Yl< zG4l$1Djf40V8*xxWL~W@n-z$kKR0GxfiHw(ejCg*s3n=-Qkl&P#Lu4_ zGq1oG!!f@DW*XFz%u3VbOX^SfZCK`qJruF7myAU?4hGq1px!!f@H zW*XFz%D+#B&4~V^+YTQ!pkjEN;-b>Rf;Rbu1*N5Vc}1lKMI}XT zirVMb{jZ>XeqJ8Wz?I>g!I4YDWzzXG)!EFz&&YB2Ch3mZwo%_6U3wkVs#C{a2OgSA zW%s84zy7bY)_bXG)90Jc`6`uNU6pD(s%miCiqRDVhE%q#7*I2GT;+%{Z9As_qT5m3 zDyyq223K|*J8)>t5uDoXDz(MQ72_(}HvIUZBZpNEJhY;ENVkg7MT?F&exu=w{;2z)V^hs41`MeCcRjLd zU}aU^$87wckHL@5&RxBD$>#lDYn*CyaH{F>Q56FZuKQ;nRn;Z6e$9}o%IYDbh7X)D z`hX5;pT^_s|KaOz(;L;K_WW<3;QYFO*Y6Si2UbovEY)IoMg3o=|2^tHpi64wIt}_6Nq=~C*Hn|?L#u0QQk!?J|F?vE zTBd8=`_uNR)Ia#6?r*hY-9Of*{{iWm`Jv7C=y}3n{ig2JIF*_(dVKxAZv79{f4b=3 zfd298EDuXH=|8llx=Si&c;(2!HACt?&-xwkxBh!V^_bKdsSW<~o`3!ye9sactivemq-all activemq-camel activemq-console + activemq-client activemq-core activemq-fileserver activemq-jaas @@ -231,6 +232,11 @@ + + org.apache.activemq + activemq-client + ${project.version} + org.apache.activemq activemq-all