From d29ca2a71b7fd281c15f7d05e135c196d2b2488c Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 28 Dec 2005 17:24:02 +0000 Subject: [PATCH] Refactor org.activemq -> org.apache.activemq git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359567 13f79535-47bb-0310-9956-ffa450edef68 --- activemq-core/maven.xml | 12 +- activemq-core/pom.xml | 2 +- activemq-core/project.xml | 26 +- .../openwire/tool/OpenWireScript.java | 4 +- .../gram/script/GenerateCMarshalling.groovy | 2 +- .../gram/script/GenerateCSharpClasses.groovy | 8 +- .../script/GenerateCSharpMarshalling.groovy | 8 +- .../script/GenerateJavaMarshalling.groovy | 18 +- .../src/main/grammar/SelectorParser.jj | 4 +- .../activemq/ActiveMQConnection.java | 74 +- .../activemq/ActiveMQConnectionConsumer.java | 6 +- .../activemq/ActiveMQConnectionFactory.java | 20 +- .../activemq/ActiveMQConnectionMetaData.java | 4 +- .../activemq/ActiveMQDispatcher.java | 4 +- .../activemq/ActiveMQInputStream.java | 30 +- .../activemq/ActiveMQMessageConsumer.java | 34 +- .../activemq/ActiveMQMessageProducer.java | 14 +- .../ActiveMQMessageTransformation.java | 24 +- .../activemq/ActiveMQOutputStream.java | 18 +- .../activemq/ActiveMQPrefetchPolicy.java | 2 +- .../activemq/ActiveMQQueueBrowser.java | 8 +- .../activemq/ActiveMQQueueReceiver.java | 6 +- .../activemq/ActiveMQQueueSender.java | 4 +- .../activemq/ActiveMQQueueSession.java | 2 +- .../activemq/ActiveMQSession.java | 58 +- .../activemq/ActiveMQSessionExecutor.java | 12 +- .../activemq/ActiveMQTopicPublisher.java | 4 +- .../activemq/ActiveMQTopicSession.java | 2 +- .../activemq/ActiveMQTopicSubscriber.java | 6 +- .../activemq/ActiveMQXAConnection.java | 6 +- .../activemq/ActiveMQXASession.java | 4 +- .../activemq/AdvisoryConsumer.java | 18 +- .../activemq/AlreadyClosedException.java | 2 +- .../org/{ => apache}/activemq/Closeable.java | 2 +- .../activemq/ConfigurationException.java | 2 +- .../activemq/ConnectionClosedException.java | 2 +- .../activemq/ConnectionFailedException.java | 2 +- .../LocalTransactionEventListener.java | 2 +- .../activemq/MessageAvailableConsumer.java | 2 +- .../activemq/MessageAvailableListener.java | 2 +- .../activemq/MessageDispatchChannel.java | 4 +- .../activemq/NotStartedException.java | 2 +- .../org/{ => apache}/activemq/Service.java | 2 +- .../activemq/StreamConnection.java | 2 +- .../activemq/ThreadPriorities.java | 2 +- .../activemq/TransactionContext.java | 22 +- .../activemq/advisory/AdvisoryBroker.java | 36 +- .../activemq/advisory/AdvisorySupport.java | 6 +- .../activemq/advisory/ConsumerEvent.java | 4 +- .../advisory/ConsumerEventSource.java | 16 +- .../activemq/advisory/ConsumerListener.java | 2 +- .../advisory/ConsumerStartedEvent.java | 6 +- .../advisory/ConsumerStoppedEvent.java | 6 +- .../activemq/advisory/package.html | 0 .../activemq/broker/AbstractConnection.java | 74 +- .../{ => apache}/activemq/broker/Broker.java | 18 +- .../activemq/broker/BrokerFactory.java | 6 +- .../activemq/broker/BrokerFilter.java | 24 +- .../activemq/broker/BrokerRegistry.java | 2 +- .../activemq/broker/BrokerService.java | 68 +- .../broker/CompositeDestinationBroker.java | 8 +- .../activemq/broker/Connection.java | 10 +- .../activemq/broker/ConnectionContext.java | 12 +- .../activemq/broker/Connector.java | 8 +- .../activemq/broker/DefaultBrokerFactory.java | 10 +- .../activemq/broker/ErrorBroker.java | 24 +- .../{ => apache}/activemq/broker/Main.java | 10 +- .../activemq/broker/MutableBrokerFilter.java | 24 +- .../activemq/broker/TransactionBroker.java | 28 +- .../activemq/broker/TransportConnection.java | 12 +- .../activemq/broker/TransportConnector.java | 26 +- .../broker/TransportStatusDetector.java | 6 +- .../activemq/broker/UserIDBroker.java | 4 +- .../activemq/broker/jmx/BrokerView.java | 8 +- .../activemq/broker/jmx/BrokerViewMBean.java | 4 +- .../activemq/broker/jmx/ConnectionView.java | 4 +- .../broker/jmx/ConnectionViewMBean.java | 4 +- .../activemq/broker/jmx/ConnectorView.java | 8 +- .../broker/jmx/ConnectorViewMBean.java | 4 +- .../activemq/broker/jmx/DestinationView.java | 4 +- .../broker/jmx/DestinationViewMBean.java | 2 +- .../broker/jmx/ManagedQueueRegion.java | 20 +- .../broker/jmx/ManagedRegionBroker.java | 20 +- .../broker/jmx/ManagedTempQueueRegion.java | 16 +- .../broker/jmx/ManagedTempTopicRegion.java | 16 +- .../broker/jmx/ManagedTopicRegion.java | 20 +- .../jmx/ManagedTransportConnection.java | 20 +- .../broker/jmx/ManagedTransportConnector.java | 12 +- .../broker/jmx/ManagementContext.java | 6 +- .../broker/jmx/NetworkConnectorView.java | 4 +- .../broker/jmx/NetworkConnectorViewMBean.java | 4 +- .../broker/jmx/ProxyConnectorView.java | 4 +- .../broker/jmx/ProxyConnectorViewMBean.java | 4 +- .../activemq/broker/jmx/package.html | 0 .../{ => apache}/activemq/broker/package.html | 0 .../broker/region/AbstractRegion.java | 22 +- .../broker/region/AbstractSubscription.java | 22 +- .../broker/region/ConnectionStatistics.java | 10 +- .../broker/region/ConnectorStatistics.java | 8 +- .../activemq/broker/region/Destination.java | 18 +- .../broker/region/DestinationStatistics.java | 10 +- .../region/DurableTopicSubscription.java | 12 +- .../region/IndirectMessageReference.java | 10 +- .../broker/region/MessageReference.java | 8 +- .../broker/region/PrefetchSubscription.java | 20 +- .../activemq/broker/region/Queue.java | 32 +- .../region/QueueBrowserSubscription.java | 12 +- .../activemq/broker/region/QueueRegion.java | 22 +- .../broker/region/QueueSubscription.java | 12 +- .../activemq/broker/region/Region.java | 14 +- .../activemq/broker/region/RegionBroker.java | 42 +- .../activemq/broker/region/Subscription.java | 12 +- .../broker/region/TempQueueRegion.java | 14 +- .../broker/region/TempTopicRegion.java | 14 +- .../activemq/broker/region/Topic.java | 40 +- .../activemq/broker/region/TopicRegion.java | 26 +- .../broker/region/TopicSubscription.java | 20 +- .../activemq/broker/region/package.html | 0 .../broker/region/policy/DispatchPolicy.java | 8 +- .../FixedSizedSubscriptionRecoveryPolicy.java | 18 +- .../LastImageSubscriptionRecoveryPolicy.java | 12 +- .../broker/region/policy/MessageQuery.java | 6 +- .../policy/NoSubscriptionRecoveryPolicy.java | 10 +- .../broker/region/policy/PolicyEntry.java | 10 +- .../broker/region/policy/PolicyMap.java | 8 +- .../QueryBasedSubscriptionRecoveryPolicy.java | 30 +- .../policy/RoundRobinDispatchPolicy.java | 10 +- .../region/policy/SimpleDispatchPolicy.java | 10 +- .../policy/StrictOrderDispatchPolicy.java | 10 +- .../policy/SubscriptionRecoveryPolicy.java | 12 +- .../TimedSubscriptionRecoveryPolicy.java | 14 +- .../broker/region/policy/package.html | 0 .../command/ActiveMQBytesMessage.java | 6 +- .../activemq/command/ActiveMQDestination.java | 4 +- .../activemq/command/ActiveMQMapMessage.java | 8 +- .../activemq/command/ActiveMQMessage.java | 12 +- .../command/ActiveMQObjectMessage.java | 8 +- .../activemq/command/ActiveMQQueue.java | 2 +- .../command/ActiveMQStreamMessage.java | 6 +- .../command/ActiveMQTempDestination.java | 4 +- .../activemq/command/ActiveMQTempQueue.java | 2 +- .../activemq/command/ActiveMQTempTopic.java | 2 +- .../activemq/command/ActiveMQTextMessage.java | 8 +- .../activemq/command/ActiveMQTopic.java | 2 +- .../activemq/command/BaseCommand.java | 2 +- .../activemq/command/BrokerId.java | 2 +- .../activemq/command/BrokerInfo.java | 4 +- .../activemq/command/Command.java | 4 +- .../activemq/command/CommandTypes.java | 2 +- .../activemq/command/ConnectionId.java | 2 +- .../activemq/command/ConnectionInfo.java | 4 +- .../activemq/command/ConsumerId.java | 2 +- .../activemq/command/ConsumerInfo.java | 6 +- .../activemq/command/ControlCommand.java | 4 +- .../activemq/command/DataArrayResponse.java | 2 +- .../activemq/command/DataResponse.java | 2 +- .../activemq/command/DataStructure.java | 2 +- .../activemq/command/DestinationInfo.java | 4 +- .../activemq/command/DiscoveryEvent.java | 2 +- .../activemq/command/ExceptionResponse.java | 2 +- .../activemq/command/FlushCommand.java | 4 +- .../activemq/command/IntegerResponse.java | 2 +- .../activemq/command/JournalQueueAck.java | 2 +- .../activemq/command/JournalTopicAck.java | 2 +- .../activemq/command/JournalTrace.java | 2 +- .../activemq/command/JournalTransaction.java | 2 +- .../activemq/command/KeepAliveInfo.java | 4 +- .../activemq/command/LocalTransactionId.java | 2 +- .../activemq/command/MarshallAware.java | 2 +- .../activemq/command/Message.java | 16 +- .../activemq/command/MessageAck.java | 4 +- .../activemq/command/MessageDispatch.java | 4 +- .../activemq/command/MessageId.java | 2 +- .../activemq/command/ProducerId.java | 2 +- .../activemq/command/ProducerInfo.java | 4 +- .../activemq/command/RedeliveryPolicy.java | 2 +- .../activemq/command/RemoveInfo.java | 4 +- .../command/RemoveSubscriptionInfo.java | 4 +- .../activemq/command/Response.java | 4 +- .../activemq/command/SessionId.java | 2 +- .../activemq/command/SessionInfo.java | 4 +- .../activemq/command/ShutdownInfo.java | 4 +- .../activemq/command/SubscriptionInfo.java | 2 +- .../activemq/command/TransactionId.java | 2 +- .../activemq/command/TransactionInfo.java | 4 +- .../activemq/command/WireFormatInfo.java | 4 +- .../activemq/command/XATransactionId.java | 4 +- .../activemq/command/package.html | 0 .../activemq/filter/ArithmeticExpression.java | 2 +- .../activemq/filter/BinaryExpression.java | 2 +- .../activemq/filter/BooleanExpression.java | 2 +- .../activemq/filter/ComparisonExpression.java | 6 +- .../filter/CompositeDestinationFilter.java | 4 +- .../activemq/filter/ConstantExpression.java | 2 +- .../activemq/filter/DestinationFilter.java | 6 +- .../activemq/filter/DestinationMap.java | 4 +- .../activemq/filter/DestinationMapEntry.java | 8 +- .../activemq/filter/DestinationMapNode.java | 2 +- .../activemq/filter/DestinationPath.java | 6 +- .../activemq/filter/Expression.java | 2 +- .../activemq/filter/JAXPXPathEvaluator.java | 4 +- .../activemq/filter/LogicExpression.java | 2 +- .../filter/MessageEvaluationContext.java | 8 +- .../filter/MultiExpressionEvaluator.java | 4 +- .../activemq/filter/NoLocalExpression.java | 4 +- .../filter/PrefixDestinationFilter.java | 4 +- .../activemq/filter/PropertyExpression.java | 10 +- .../filter/SimpleDestinationFilter.java | 4 +- .../activemq/filter/UnaryExpression.java | 2 +- .../filter/WildcardDestinationFilter.java | 4 +- .../filter/XMLBeansXPathEvaluator.java | 4 +- .../activemq/filter/XPathExpression.java | 8 +- .../activemq/filter/XQueryExpression.java | 2 +- .../activemq/filter/XalanXPathEvaluator.java | 4 +- .../{ => apache}/activemq/filter/package.html | 0 .../jndi/ActiveMQInitialContextFactory.java | 10 +- .../ActiveMQWASInitialContextFactory.java | 2 +- .../activemq/jndi/LazyCreateContext.java | 2 +- .../activemq/jndi/NameParserImpl.java | 2 +- .../activemq/jndi/ReadOnlyContext.java | 2 +- .../{ => apache}/activemq/jndi/package.html | 0 .../management/BoundaryStatisticImpl.java | 2 +- .../management/BoundedRangeStatisticImpl.java | 2 +- .../management/CountStatisticImpl.java | 2 +- .../JCAConnectionPoolStatsImpl.java | 2 +- .../management/JCAConnectionStatsImpl.java | 2 +- .../activemq/management/JCAStatsImpl.java | 2 +- .../management/JMSConnectionStatsImpl.java | 6 +- .../management/JMSConsumerStatsImpl.java | 4 +- .../management/JMSEndpointStatsImpl.java | 4 +- .../management/JMSProducerStatsImpl.java | 4 +- .../management/JMSSessionStatsImpl.java | 9 +- .../activemq/management/JMSStatsImpl.java | 6 +- .../management/PollCountStatisticImpl.java | 2 +- .../management/RangeStatisticImpl.java | 2 +- .../activemq/management/Resettable.java | 2 +- .../activemq/management/StatisticImpl.java | 2 +- .../activemq/management/StatsCapable.java | 2 +- .../activemq/management/StatsImpl.java | 2 +- .../management/TimeStatisticImpl.java | 2 +- .../activemq/management/package.html | 0 .../{ => apache}/activemq/memory/Cache.java | 2 +- .../activemq/memory/CacheEntry.java | 2 +- .../activemq/memory/CacheEntryList.java | 2 +- .../memory/CacheEvictionUsageListener.java | 8 +- .../activemq/memory/CacheEvictor.java | 2 +- .../activemq/memory/CacheFilter.java | 2 +- .../{ => apache}/activemq/memory/LRUMap.java | 2 +- .../activemq/memory/MapCache.java | 2 +- .../activemq/memory/UsageListener.java | 2 +- .../activemq/memory/UsageManager.java | 2 +- .../memory/UsageManagerCacheFilter.java | 2 +- .../activemq/memory/buffer/MessageBuffer.java | 2 +- .../activemq/memory/buffer/MessageQueue.java | 8 +- .../buffer/OrderBasedMessageBuffer.java | 2 +- .../memory/buffer/SizeBasedMessageBuffer.java | 2 +- .../list/DestinationBasedMessageList.java | 18 +- .../activemq/memory/list/MessageList.java | 6 +- .../memory/list/SimpleMessageList.java | 6 +- .../{ => apache}/activemq/network/Bridge.java | 4 +- .../network/DemandForwardingBridge.java | 56 +- .../activemq/network/ForwardingBridge.java | 40 +- .../activemq/network/NetworkConnector.java | 18 +- .../network/jms/DestinationBridge.java | 5 +- .../network/jms/InboundQueueBridge.java | 2 +- .../network/jms/InboundTopicBridge.java | 2 +- .../activemq/network/jms/JmsConnector.java | 11 +- .../network/jms/JmsMesageConvertor.java | 2 +- .../network/jms/JmsQueueConnector.java | 2 +- .../network/jms/JmsTopicConnector.java | 2 +- .../network/jms/OutboundQueueBridge.java | 2 +- .../network/jms/OutboundTopicBridge.java | 2 +- .../activemq/network/jms/QueueBridge.java | 2 +- .../jms/SimpleJmsMessageConvertor.java | 2 +- .../activemq/network/jms/TopicBridge.java | 2 +- .../activemq/network/jms/package.html | 0 .../activemq/network/package.html | 0 .../activemq/openwire/BooleanStream.java | 2 +- .../openwire/DataStreamMarshaller.java | 4 +- .../activemq/openwire/OpenWireFormat.java | 10 +- .../openwire/OpenWireFormatFactory.java | 2 +- .../v1/ActiveMQBytesMessageMarshaller.java | 6 +- .../v1/ActiveMQDestinationMarshaller.java | 8 +- .../v1/ActiveMQMapMessageMarshaller.java | 6 +- .../v1/ActiveMQMessageMarshaller.java | 6 +- .../v1/ActiveMQObjectMessageMarshaller.java | 6 +- .../openwire/v1/ActiveMQQueueMarshaller.java | 6 +- .../v1/ActiveMQStreamMessageMarshaller.java | 6 +- .../v1/ActiveMQTempDestinationMarshaller.java | 6 +- .../v1/ActiveMQTempQueueMarshaller.java | 6 +- .../v1/ActiveMQTempTopicMarshaller.java | 6 +- .../v1/ActiveMQTextMessageMarshaller.java | 6 +- .../openwire/v1/ActiveMQTopicMarshaller.java | 6 +- .../openwire/v1/BaseCommandMarshaller.java | 8 +- .../openwire/v1/BrokerIdMarshaller.java | 8 +- .../openwire/v1/BrokerInfoMarshaller.java | 14 +- .../openwire/v1/ConnectionIdMarshaller.java | 8 +- .../openwire/v1/ConnectionInfoMarshaller.java | 12 +- .../openwire/v1/ConsumerIdMarshaller.java | 8 +- .../openwire/v1/ConsumerInfoMarshaller.java | 14 +- .../openwire/v1/ControlCommandMarshaller.java | 6 +- .../v1/DataArrayResponseMarshaller.java | 10 +- .../openwire/v1/DataResponseMarshaller.java | 8 +- .../v1/DestinationInfoMarshaller.java | 14 +- .../v1/ExceptionResponseMarshaller.java | 6 +- .../openwire/v1/FlushCommandMarshaller.java | 6 +- .../v1/IntegerResponseMarshaller.java | 6 +- .../v1/JournalQueueAckMarshaller.java | 12 +- .../v1/JournalTopicAckMarshaller.java | 14 +- .../openwire/v1/JournalTraceMarshaller.java | 8 +- .../v1/JournalTransactionMarshaller.java | 10 +- .../openwire/v1/KeepAliveInfoMarshaller.java | 8 +- .../v1/LocalTransactionIdMarshaller.java | 8 +- .../openwire/v1/MarshallerFactory.java | 6 +- .../openwire/v1/MessageAckMarshaller.java | 16 +- .../v1/MessageDispatchMarshaller.java | 12 +- .../openwire/v1/MessageIdMarshaller.java | 10 +- .../openwire/v1/MessageMarshaller.java | 28 +- .../openwire/v1/ProducerIdMarshaller.java | 8 +- .../openwire/v1/ProducerInfoMarshaller.java | 14 +- .../v1/RedeliveryPolicyMarshaller.java | 8 +- .../openwire/v1/RemoveInfoMarshaller.java | 8 +- .../v1/RemoveSubscriptionInfoMarshaller.java | 8 +- .../openwire/v1/ResponseMarshaller.java | 6 +- .../openwire/v1/SessionIdMarshaller.java | 8 +- .../openwire/v1/SessionInfoMarshaller.java | 8 +- .../openwire/v1/ShutdownInfoMarshaller.java | 6 +- .../v1/SubscriptionInfoMarshaller.java | 10 +- .../openwire/v1/TransactionIdMarshaller.java | 8 +- .../v1/TransactionInfoMarshaller.java | 10 +- .../openwire/v1/WireFormatInfoMarshaller.java | 8 +- .../v1/XATransactionIdMarshaller.java | 6 +- .../org/{ => apache}/activemq/package.html | 0 .../activemq/pool/ConnectionKey.java | 2 +- .../activemq/pool/ConnectionPool.java | 6 +- .../activemq/pool/PooledConnection.java | 8 +- .../pool/PooledConnectionFactory.java | 14 +- .../activemq/pool/PooledProducer.java | 4 +- .../activemq/pool/PooledQueueSender.java | 4 +- .../activemq/pool/PooledSession.java | 14 +- .../activemq/pool/PooledTopicPublisher.java | 4 +- .../activemq/pool/SessionKey.java | 2 +- .../activemq/pool/SessionPool.java | 10 +- .../{ => apache}/activemq/pool/package.html | 0 .../activemq/proxy/ProxyConnection.java | 16 +- .../activemq/proxy/ProxyConnector.java | 14 +- .../security/JaasAuthenticationBroker.java | 10 +- .../security/JassCredentialCallback.java | 2 +- .../activemq/security/SecurityAdminMBean.java | 2 +- .../activemq/security/SecurityContext.java | 2 +- .../security/SimpleAuthenticationBroker.java | 10 +- .../security/SimpleAuthorizationBroker.java | 30 +- .../activemq/security/package.html | 0 .../activemq/selector/ParseException.java | 2 +- .../activemq/selector/SelectorParser.java | 635 +++++++++++------- .../selector/SelectorParserConstants.java | 2 +- .../selector/SelectorParserTokenManager.java | 10 +- .../activemq/selector/SimpleCharStream.java | 2 +- .../{ => apache}/activemq/selector/Token.java | 2 +- .../activemq/selector/TokenMgrError.java | 2 +- .../activemq/selector/package.html | 0 .../activemq/state/CommandVisitor.java | 40 +- .../activemq/state/ConnectionState.java | 10 +- .../state/ConnectionStateTracker.java | 46 +- .../activemq/state/ConsumerState.java | 4 +- .../activemq/state/ProducerState.java | 4 +- .../activemq/state/SessionState.java | 12 +- .../DefaultPersistenceAdapterFactory.java | 12 +- .../store/MessageRecoveryListener.java | 4 +- .../activemq/store/MessageStore.java | 14 +- .../activemq/store/PersistenceAdapter.java | 12 +- .../store/PersistenceAdapterFactory.java | 2 +- .../store/PersistenceAdapterFactoryBean.java | 2 +- .../activemq/store/ProxyMessageStore.java | 12 +- .../store/ProxyTopicMessageStore.java | 14 +- .../activemq/store/TopicMessageStore.java | 8 +- .../store/TransactionRecoveryListener.java | 8 +- .../activemq/store/TransactionStore.java | 6 +- .../activemq/store/jdbc/JDBCAdapter.java | 8 +- .../jdbc/JDBCMessageRecoveryListener.java | 2 +- .../activemq/store/jdbc/JDBCMessageStore.java | 20 +- .../store/jdbc/JDBCPersistenceAdapter.java | 26 +- .../store/jdbc/JDBCTopicMessageStore.java | 22 +- .../store/jdbc/StatementProvider.java | 2 +- .../store/jdbc/TransactionContext.java | 4 +- .../store/jdbc/adapter/AxionJDBCAdapter.java | 4 +- .../store/jdbc/adapter/BlobJDBCAdapter.java | 6 +- .../store/jdbc/adapter/BytesJDBCAdapter.java | 8 +- .../adapter/CachingStatementProvider.java | 4 +- .../jdbc/adapter/DefaultJDBCAdapter.java | 18 +- .../adapter/DefaultStatementProvider.java | 4 +- .../store/jdbc/adapter/HsqldbJDBCAdapter.java | 4 +- .../jdbc/adapter/ImageBasedJDBCAdaptor.java | 4 +- .../jdbc/adapter/InformixJDBCAdapter.java | 4 +- .../store/jdbc/adapter/OracleJDBCAdapter.java | 4 +- .../jdbc/adapter/PostgresqlJDBCAdapter.java | 4 +- .../store/jdbc/adapter/StreamJDBCAdapter.java | 8 +- .../activemq/store/jdbc/adapter/package.html | 0 .../activemq/store/jdbc/package.html | 0 .../store/journal/JournalMessageStore.java | 28 +- .../journal/JournalPersistenceAdapter.java | 56 +- .../journal/JournalTopicMessageStore.java | 24 +- .../journal/JournalTransactionStore.java | 30 +- .../journal/QuickJournalMessageData.java | 6 +- .../journal/QuickJournalMessageStore.java | 28 +- .../QuickJournalPersistenceAdapter.java | 56 +- .../QuickJournalTopicMessageStore.java | 24 +- .../journal/QuickJournalTransactionStore.java | 30 +- .../activemq/store/journal/package.html | 0 .../store/memory/MemoryMessageStore.java | 18 +- .../memory/MemoryPersistenceAdapter.java | 16 +- .../store/memory/MemoryTopicMessageStore.java | 20 +- .../store/memory/MemoryTransactionStore.java | 30 +- .../activemq/store/memory/package.html | 0 .../{ => apache}/activemq/store/package.html | 0 .../activemq/thread/DefaultThreadPools.java | 2 +- .../activemq/thread/Scheduler.java | 2 +- .../activemq/thread/SimpleTaskRunner.java | 2 +- .../{ => apache}/activemq/thread/Task.java | 2 +- .../activemq/thread/TaskRunner.java | 2 +- .../activemq/thread/TaskRunnerFactory.java | 2 +- .../{ => apache}/activemq/thread/Valve.java | 2 +- .../transaction/LocalTransaction.java | 10 +- .../activemq/transaction/Synchronization.java | 2 +- .../activemq/transaction/Transaction.java | 4 +- .../activemq/transaction/XATransaction.java | 10 +- .../transport/CompositeTransport.java | 2 +- .../activemq/transport/FutureResponse.java | 6 +- .../transport/InactivityIOException.java | 2 +- .../activemq/transport/InactivityMonitor.java | 8 +- .../transport/MarshallingTransportFilter.java | 4 +- .../activemq/transport/MutexTransport.java | 6 +- .../transport/ResponseCorrelator.java | 6 +- .../activemq/transport/Transport.java | 8 +- .../transport/TransportAcceptListener.java | 2 +- .../activemq/transport/TransportFactory.java | 12 +- .../activemq/transport/TransportFilter.java | 10 +- .../activemq/transport/TransportListener.java | 4 +- .../activemq/transport/TransportLogger.java | 4 +- .../activemq/transport/TransportServer.java | 6 +- .../transport/TransportServerFilter.java | 4 +- .../transport/TransportServerSupport.java | 2 +- .../TransportServerThreadSupport.java | 6 +- .../activemq/transport/TransportSupport.java | 6 +- .../transport/TransportThreadSupport.java | 4 +- .../transport/WireFormatNegotiator.java | 8 +- .../transport/activeio/ActiveIOTransport.java | 16 +- .../activeio/ActiveIOTransportFactory.java | 24 +- .../activeio/ActiveIOTransportServer.java | 12 +- .../transport/activeio/ActivityMonitor.java | 4 +- .../PacketAggregatingAsyncChannel.java | 2 +- .../activemq/transport/activeio/package.html | 0 .../transport/discovery/DiscoveryAgent.java | 6 +- .../discovery/DiscoveryAgentFactory.java | 6 +- .../discovery/DiscoveryListener.java | 4 +- .../discovery/DiscoveryTransport.java | 8 +- .../discovery/DiscoveryTransportFactory.java | 12 +- .../multicast/MulticastDiscoveryAgent.java | 9 +- .../MulticastDiscoveryAgentFactory.java | 12 +- .../activemq/transport/discovery/package.html | 0 .../discovery/rendezvous/JmDNSFactory.java | 2 +- .../rendezvous/RendezvousDiscoveryAgent.java | 12 +- .../RendezvousDiscoveryAgentFactory.java | 12 +- .../discovery/rendezvous/package.html | 0 .../simple/SimpleDiscoveryAgent.java | 8 +- .../simple/SimpleDiscoveryAgentFactory.java | 14 +- .../transport/failover/FailoverTransport.java | 28 +- .../failover/FailoverTransportFactory.java | 18 +- .../activemq/transport/failover/package.html | 0 .../transport/fanout/FanoutTransport.java | 32 +- .../fanout/FanoutTransportFactory.java | 24 +- .../activemq/transport/fanout/package.html | 0 .../transport/mock/MockTransport.java | 18 +- .../transport/mock/MockTransportFactory.java | 18 +- .../activemq/transport/package.html | 0 .../transport/peer/PeerTransportFactory.java | 24 +- .../activemq/transport/peer/package.html | 0 .../activemq/transport/stomp/Abort.java | 6 +- .../activemq/transport/stomp/Ack.java | 6 +- .../activemq/transport/stomp/AsyncHelper.java | 2 +- .../activemq/transport/stomp/Begin.java | 6 +- .../activemq/transport/stomp/Command.java | 2 +- .../transport/stomp/CommandEnvelope.java | 4 +- .../transport/stomp/CommandParser.java | 6 +- .../activemq/transport/stomp/Commit.java | 6 +- .../activemq/transport/stomp/Connect.java | 10 +- .../transport/stomp/DestinationNamer.java | 4 +- .../activemq/transport/stomp/Disconnect.java | 4 +- .../transport/stomp/FrameBuilder.java | 4 +- .../transport/stomp/HeaderParser.java | 2 +- .../transport/stomp/ResponseListener.java | 4 +- .../activemq/transport/stomp/Send.java | 12 +- .../activemq/transport/stomp/Stomp.java | 2 +- .../transport/stomp/StompCommand.java | 2 +- .../stomp/StompTransportFactory.java | 8 +- .../transport/stomp/StompWireFormat.java | 40 +- .../stomp/StompWireFormatFactory.java | 2 +- .../activemq/transport/stomp/Subscribe.java | 8 +- .../transport/stomp/Subscription.java | 18 +- .../activemq/transport/stomp/Unsubscribe.java | 4 +- .../activemq/transport/stomp/package.html | 0 .../transport/tcp/ResponseHolder.java | 4 +- .../transport/tcp/TcpBufferedInputStream.java | 2 +- .../tcp/TcpBufferedOutputStream.java | 2 +- .../activemq/transport/tcp/TcpTransport.java | 12 +- .../transport/tcp/TcpTransportFactory.java | 24 +- .../transport/tcp/TcpTransportServer.java | 10 +- .../activemq/transport/tcp/package.html | 0 .../activemq/transport/vm/VMTransport.java | 12 +- .../transport/vm/VMTransportFactory.java | 30 +- .../transport/vm/VMTransportServer.java | 14 +- .../activemq/transport/vm/package.html | 0 .../{ => apache}/activemq/util/Callback.java | 6 +- .../activemq/util/ClassLoading.java | 2 +- .../activemq/util/HexSupport.java | 2 +- .../activemq/util/IOExceptionSupport.java | 2 +- .../activemq/util/IdGenerator.java | 2 +- .../activemq/util/IndentPrinter.java | 2 +- .../activemq/util/IntrospectionSupport.java | 2 +- .../activemq/util/JMSExceptionSupport.java | 2 +- .../activemq/util/JMXSupport.java | 2 +- .../{ => apache}/activemq/util/LRUCache.java | 2 +- .../activemq/util/LongSequenceGenerator.java | 2 +- .../{ => apache}/activemq/util/MapHelper.java | 2 +- .../activemq/util/MarshallingSupport.java | 2 +- .../activemq/util/ServiceStopper.java | 4 +- .../activemq/util/ServiceSupport.java | 4 +- .../activemq/util/SubscriptionKey.java | 2 +- .../activemq/util/TransactionTemplate.java | 6 +- .../activemq/util/TypeConversionSupport.java | 2 +- .../activemq/util/URISupport.java | 2 +- .../activemq/util/WrappedException.java | 2 +- .../activemq/xbean/BrokerFactoryBean.java | 4 +- .../activemq/xbean/XBeanBrokerFactory.java | 6 +- .../activemq/xbean/XBeanBrokerService.java | 4 +- .../services/org/activemq/broker/broker | 1 - .../services/org/activemq/broker/xbean | 1 - .../jdbc/apache_derby_embedded_jdbc_driver | 1 - .../org/activemq/store/jdbc/axion_jdbc_driver | 1 - .../store/jdbc/hsql_database_engine_driver | 1 - .../activemq/store/jdbc/i-net_sprinta_2000 | 1 - ...dbc_driver_for_ibm_informix_dynamic_server | 1 - .../store/jdbc/jconnect__tm__for_jdbc__tm_ | 1 - ...4_jdbc_driver_for_ms_sql_server_and_sybase | 1 - .../activemq/store/jdbc/oracle_jdbc_driver | 1 - .../store/jdbc/postgresql_native_driver | 1 - .../org/activemq/store/jdbc/sqlserver | 1 - .../org/activemq/transport/.cvsignore | 1 - .../services/org/activemq/transport/aio | 1 - .../services/org/activemq/transport/discovery | 1 - .../transport/discoveryagent/multicast | 1 - .../transport/discoveryagent/rendezvous | 1 - .../activemq/transport/discoveryagent/simple | 1 - .../activemq/transport/discoveryagent/static | 1 - .../services/org/activemq/transport/failover | 1 - .../services/org/activemq/transport/fanout | 1 - .../services/org/activemq/transport/jxta | 1 - .../services/org/activemq/transport/mock | 1 - .../services/org/activemq/transport/nio | 1 - .../services/org/activemq/transport/peer | 1 - .../services/org/activemq/transport/ssl | 1 - .../services/org/activemq/transport/stomp | 1 - .../services/org/activemq/transport/tcp | 1 - .../services/org/activemq/transport/vm | 1 - .../services/org/activemq/transport/vmpipe | 1 - .../services/org/activemq/wireformat/default | 1 - .../services/org/activemq/wireformat/stomp | 1 - .../ActiveMQConnectionFactoryTest.java | 9 +- .../activemq/AutoFailTestSupport.java | 2 +- .../activemq/ClientTestSupport.java | 35 +- .../activemq/CombinationTestSupport.java | 2 +- .../activemq/ConnectionCleanupTest.java | 5 +- .../ConsumerReceiveWithTimeoutTest.java | 2 +- .../activemq/EmbeddedBrokerTestSupport.java | 11 +- .../activemq/JMSConsumerTest.java | 6 +- .../JMSDurableTopicRedeliverTest.java | 2 +- .../activemq/JMSExclusiveConsumerTest.java | 4 +- .../{ => apache}/activemq/JMSMessageTest.java | 5 +- .../activemq/JMSQueueRedeliverTest.java | 2 +- .../{ => apache}/activemq/JMSUsecaseTest.java | 6 +- .../activemq/JmsAutoAckListenerTest.java | 2 +- .../{ => apache}/activemq/JmsAutoAckTest.java | 2 +- .../{ => apache}/activemq/JmsBenchmark.java | 13 +- .../activemq/JmsClientAckListenerTest.java | 2 +- .../activemq/JmsClientAckTest.java | 2 +- .../activemq/JmsConnectionStartStopTest.java | 4 +- .../JmsCreateConsumerInOnMessageTest.java | 4 +- ...msDurableQueueWildcardSendReceiveTest.java | 4 +- .../activemq/JmsDurableTopicSelectorTest.java | 2 +- .../JmsDurableTopicSendReceiveTest.java | 4 +- .../JmsDurableTopicTransactionTest.java | 5 +- ...msDurableTopicWildcardSendReceiveTest.java | 4 +- .../activemq/JmsQueueBrowserTest.java | 4 +- .../JmsQueueCompositeSendReceiveTest.java | 8 +- .../activemq/JmsQueueRequestReplyTest.java | 2 +- .../activemq/JmsQueueSelectorTest.java | 2 +- .../activemq/JmsQueueSendReceiveTest.java | 4 +- ...veTwoConnectionsStartBeforeBrokerTest.java | 5 +- ...JmsQueueSendReceiveTwoConnectionsTest.java | 4 +- ...sQueueSendReceiveUsingTwoSessionsTest.java | 2 +- ...JmsQueueTopicCompositeSendReceiveTest.java | 8 +- .../activemq/JmsQueueTransactionTest.java | 6 +- .../JmsQueueWildcardSendReceiveTest.java | 10 +- .../activemq/JmsRedeliveredTest.java | 4 +- .../activemq/JmsSendReceiveTestSupport.java | 2 +- .../activemq/JmsSessionRecoverTest.java | 7 +- .../activemq/JmsTempDestinationTest.java | 4 +- .../{ => apache}/activemq/JmsTestSupport.java | 10 +- .../JmsTopicCompositeSendReceiveTest.java | 8 +- .../activemq/JmsTopicRedeliverTest.java | 8 +- .../activemq/JmsTopicRequestReplyTest.java | 4 +- .../activemq/JmsTopicSelectorTest.java | 2 +- .../JmsTopicSendReceiveSubscriberTest.java | 2 +- .../activemq/JmsTopicSendReceiveTest.java | 2 +- ...opicSendReceiveWithTwoConnectionsTest.java | 4 +- ...dReceiveWithTwoConnectionsWithJMXTest.java | 4 +- .../activemq/JmsTopicSendSameMessageTest.java | 4 +- .../activemq/JmsTopicTransactionTest.java | 6 +- .../JmsTopicWildcardSendReceiveTest.java | 6 +- .../activemq/JmsTransactionTestSupport.java | 8 +- .../activemq/LargeMessageTestSupport.java | 12 +- .../{ => apache}/activemq/LoadTestBurnIn.java | 13 +- .../activemq/MessageTransformationTest.java | 25 +- .../activemq/RedeliveryPolicyTest.java | 6 +- .../activemq/SpringTestSupport.java | 2 +- .../{ => apache}/activemq/TestSupport.java | 9 +- .../advisory/ConsumerListenerTest.java | 7 +- .../activemq/broker/BrokerBenchmark.java | 20 +- .../broker/BrokerRestartTestSupport.java | 5 +- .../activemq/broker/BrokerTest.java | 24 +- .../activemq/broker/BrokerTestSupport.java | 46 +- .../broker/MarshallingBrokerTest.java | 8 +- .../activemq/broker/ProgressPrinter.java | 2 +- .../activemq/broker/RecoveryBrokerTest.java | 22 +- .../activemq/broker/SpringTest.java | 8 +- .../activemq/broker/StubConnection.java | 25 +- .../activemq/broker/XARecoveryBrokerTest.java | 28 +- .../broker/advisory/AdvisoryBrokerTest.java | 24 +- .../broker/store/DefaultStoreBrokerTest.java | 16 +- .../store/DefaultStoreRecoveryBrokerTest.java | 8 +- .../DefaultStoreXARecoveryBrokerTest.java | 8 +- .../activemq/broker/store/LoadTester.java | 20 +- .../store/QuickJournalRecoveryBrokerTest.java | 6 +- .../QuickJournalXARecoveryBrokerTest.java | 6 +- .../command/ActiveMQBytesMessageTest.java | 5 +- .../command/ActiveMQDestinationTest.java | 8 +- .../command/ActiveMQMapMessageTest.java | 4 +- .../activemq/command/ActiveMQMessageTest.java | 19 +- .../command/ActiveMQObjectMessageTest.java | 5 +- .../command/ActiveMQStreamMessageTest.java | 5 +- .../command/ActiveMQTextMessageTest.java | 5 +- .../command/DataStructureTestSupport.java | 7 +- .../activemq/command/MessageSendTest.java | 8 +- .../activemq/command/MessageTest.java | 7 +- .../activemq/demo/SimpleConsumer.java | 2 +- .../activemq/demo/SimpleProducer.java | 2 +- .../activemq/demo/SimpleQueueReceiver.java | 2 +- .../activemq/demo/SimpleQueueSender.java | 2 +- .../filter/BadDummyPolicyConfigTest.java | 2 +- .../activemq/filter/DestinationMapTest.java | 8 +- .../activemq/filter/DestinationPathTest.java | 4 +- .../activemq/filter/DummyPolicy.java | 4 +- .../activemq/filter/DummyPolicyEntry.java | 4 +- .../activemq/filter/DummyPolicyTest.java | 8 +- .../ActiveMQInitialContextFactoryTest.java | 6 +- .../jndi/CustomConnectionFactoryNameTest.java | 4 +- .../jndi/DestinationNameWithSlashTest.java | 2 +- .../activemq/jndi/InitialContextTest.java | 7 +- .../activemq/jndi/JNDITestSupport.java | 5 +- .../management/BoundaryStatisticTest.java | 4 +- .../management/BoundedRangeStatisticTest.java | 4 +- .../management/CountStatisticTest.java | 4 +- .../management/RangeStatisticTest.java | 4 +- .../management/StatisticTestSupport.java | 4 +- .../management/TimeStatisticTest.java | 4 +- .../activemq/memory/buffer/DummyMessage.java | 4 +- .../buffer/MemoryBufferTestSupport.java | 8 +- .../buffer/OrderBasedMemoryBufferTest.java | 6 +- .../buffer/SizeBasedMessageBufferTest.java | 6 +- .../network/DemandForwardingBridgeTest.java | 17 +- .../network/ForwardingBridgeTest.java | 17 +- .../activemq/network/NetworkTestSupport.java | 22 +- .../activemq/network/jms/QueueBridgeTest.java | 28 +- .../network/jms/TopicBridgeSpringTest.java | 7 +- .../network/jms/TopicBridgeXBeanTest.java | 4 +- .../activemq/openwire/BrokerInfoData.java | 6 +- .../activemq/openwire/DataFileGenerator.java | 8 +- .../openwire/ItStillMarshallsTheSameTest.java | 2 +- .../activemq/openwire/WireFormatInfoData.java | 4 +- .../activemq/perf/PerfConsumer.java | 2 +- .../activemq/perf/PerfProducer.java | 2 +- .../{ => apache}/activemq/perf/PerfRate.java | 2 +- .../activemq/perf/SimpleDurableTopicTest.java | 2 +- .../perf/SimpleNonPersistentQueueTest.java | 2 +- .../perf/SimpleNonPersistentTopicTest.java | 2 +- .../activemq/perf/SimpleQueueTest.java | 2 +- .../activemq/perf/SimpleTopicTest.java | 7 +- ...TwoConnectionsWithSenderUsingPoolTest.java | 5 +- .../activemq/proxy/ProxyConnectorTest.java | 16 +- .../activemq/proxy/ProxyTestSupport.java | 19 +- .../SimpleSecurityBrokerSystemTest.java | 19 +- .../activemq/selector/SelectorParserTest.java | 15 +- .../activemq/selector/SelectorTest.java | 15 +- .../activemq/simple/Consumer.java | 6 +- .../activemq/simple/Producer.java | 6 +- .../activemq/spring/ConsumerBean.java | 2 +- .../activemq/spring/SpringConsumer.java | 2 +- .../activemq/spring/SpringProducer.java | 2 +- .../activemq/spring/SpringTest.java | 2 +- .../activemq/streams/JMSInputStreamTest.java | 10 +- .../activemq/test/JmsResourceProvider.java | 16 +- .../test/JmsSendReceiveTestSupport.java | 2 +- .../test/JmsTopicSendReceiveTest.java | 2 +- ...eceiveWithEmbeddedBrokerAndUserIDTest.java | 6 +- ...thTwoConnectionsAndEmbeddedBrokerTest.java | 6 +- ...opicSendReceiveWithTwoConnectionsTest.java | 6 +- .../activemq/test/TestSupport.java | 11 +- .../test/retroactive/DummyMessageQuery.java | 10 +- ...merTestWithDestinationBasedBufferTest.java | 4 +- ...ConsumerTestWithSimpleMessageListTest.java | 14 +- ...oactiveConsumerTestWithTimePolicyTest.java | 4 +- ...troactiveConsumerWithMessageQueryTest.java | 14 +- .../activemq/thread/TaskRunnerTest.java | 6 +- .../transport/TransportBrokerTestSupport.java | 12 +- .../NIOActiveIOTransportBrokerTest.java | 4 +- .../TCPActiveIOTransportBrokerTest.java | 4 +- .../DiscoveryTransportBrokerTest.java | 26 +- .../transport/failover/BadConnectionTest.java | 8 +- .../failover/FailoverTransportBrokerTest.java | 27 +- .../fanout/FanoutTransportBrokerTest.java | 30 +- .../transport/peer/PeerTransportTest.java | 12 +- .../activemq/transport/stomp/StompTest.java | 13 +- .../transport/stomp/StompWireFormatTest.java | 12 +- .../transport/tcp/TcpTransportBrokerTest.java | 4 +- .../transport/vm/VMTransportBrokerTest.java | 4 +- .../vm/VMTransportEmbeddedBrokerTest.java | 26 +- .../activemq/util/MessageList.java | 2 +- .../activemq/util/ReflectionSupportTest.java | 4 +- .../activemq/util/SimplePojo.java | 2 +- .../activemq/util/URISupportTest.java | 5 +- ...sWithEmbeddedBrokerAndPersistenceTest.java | 2 +- .../MultipleTestsWithEmbeddedBrokerTest.java | 4 +- ...ultipleTestsWithSpringFactoryBeanTest.java | 8 +- ...leTestsWithSpringXBeanFactoryBeanTest.java | 6 +- ...MultipleTestsWithXBeanFactoryBeanTest.java | 7 +- .../activemq/xbean/XBeanConfigTest.java | 31 +- .../activemq/xbean/XBeanXmlTest.java | 6 +- .../src/test/resources/jndi.properties | 2 +- .../src/test/resources/log4j.properties | 2 +- activemq-core/src/test/resources/login.config | 4 +- .../{ => apache}/activemq/broker/spring.xml | 12 +- .../activemq/broker/store/loadtester.xml | 0 .../activemq/filter/dummyPolicy.xml | 6 +- .../activemq/network/jms/queue-config.xml | 14 +- .../activemq/network/jms/topic-config.xml | 14 +- .../activemq/network/jms/topic-spring.xml | 14 +- .../activemq/security/groups.properties | 0 .../activemq/security/users.properties | 0 .../retroactive/activemq-fixed-buffer.xml | 2 +- .../activemq-fixed-destination-buffer.xml | 2 +- .../retroactive/activemq-message-query.xml | 4 +- .../retroactive/activemq-timed-policy.xml | 2 +- .../activemq/xbean/activemq-policy.xml | 0 .../{ => apache}/activemq/xbean/activemq.xml | 0 .../{ => apache}/activemq/xbean/activemq2.xml | 0 .../{ => apache}/activemq/xbean/spring.xml | 14 +- .../{ => apache}/activemq/xbean/spring2.xml | 4 +- .../src/test/resources/spring-embedded.xml | 12 +- .../src/test/resources/spring-jndi.xml | 8 +- .../src/test/resources/spring-queue.xml | 10 +- activemq-core/src/test/resources/spring.xml | 10 +- 771 files changed, 3470 insertions(+), 3250 deletions(-) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQConnection.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQConnectionConsumer.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQConnectionFactory.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQConnectionMetaData.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQDispatcher.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQInputStream.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQMessageConsumer.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQMessageProducer.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQMessageTransformation.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQOutputStream.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQPrefetchPolicy.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQQueueBrowser.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQQueueReceiver.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQQueueSender.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQQueueSession.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQSession.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQSessionExecutor.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQTopicPublisher.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQTopicSession.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQTopicSubscriber.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQXAConnection.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ActiveMQXASession.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/AdvisoryConsumer.java (86%) rename activemq-core/src/main/java/org/{ => apache}/activemq/AlreadyClosedException.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/Closeable.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ConfigurationException.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ConnectionClosedException.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ConnectionFailedException.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/LocalTransactionEventListener.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/MessageAvailableConsumer.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/MessageAvailableListener.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/MessageDispatchChannel.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/NotStartedException.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/Service.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/StreamConnection.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/ThreadPriorities.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/TransactionContext.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/advisory/AdvisoryBroker.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/advisory/AdvisorySupport.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/advisory/ConsumerEvent.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/advisory/ConsumerEventSource.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/advisory/ConsumerListener.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/advisory/ConsumerStartedEvent.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/advisory/ConsumerStoppedEvent.java (88%) rename activemq-core/src/main/java/org/{ => apache}/activemq/advisory/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/AbstractConnection.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/Broker.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/BrokerFactory.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/BrokerFilter.java (88%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/BrokerRegistry.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/BrokerService.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/CompositeDestinationBroker.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/Connection.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/ConnectionContext.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/Connector.java (84%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/DefaultBrokerFactory.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/ErrorBroker.java (88%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/Main.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/MutableBrokerFilter.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/TransactionBroker.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/TransportConnection.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/TransportConnector.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/TransportStatusDetector.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/UserIDBroker.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/BrokerView.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/BrokerViewMBean.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ConnectionView.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ConnectionViewMBean.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ConnectorView.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ConnectorViewMBean.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/DestinationView.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/DestinationViewMBean.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ManagedQueueRegion.java (74%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ManagedRegionBroker.java (87%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ManagedTempQueueRegion.java (78%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ManagedTempTopicRegion.java (78%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ManagedTopicRegion.java (74%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ManagedTransportConnection.java (88%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ManagedTransportConnector.java (86%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ManagementContext.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/NetworkConnectorView.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/NetworkConnectorViewMBean.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ProxyConnectorView.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/ProxyConnectorViewMBean.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/jmx/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/AbstractRegion.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/AbstractSubscription.java (86%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/ConnectionStatistics.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/ConnectorStatistics.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/Destination.java (78%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/DestinationStatistics.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/DurableTopicSubscription.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/IndirectMessageReference.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/MessageReference.java (88%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/PrefetchSubscription.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/Queue.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/QueueBrowserSubscription.java (87%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/QueueRegion.java (83%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/QueueSubscription.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/Region.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/RegionBroker.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/Subscription.java (88%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/TempQueueRegion.java (87%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/TempTopicRegion.java (87%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/Topic.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/TopicRegion.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/TopicSubscription.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/DispatchPolicy.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java (87%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java (85%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/MessageQuery.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java (81%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/PolicyEntry.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/PolicyMap.java (87%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java (84%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/RoundRobinDispatchPolicy.java (88%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/SimpleDispatchPolicy.java (85%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/StrictOrderDispatchPolicy.java (86%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java (82%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/broker/region/policy/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ActiveMQBytesMessage.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ActiveMQDestination.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ActiveMQMapMessage.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ActiveMQMessage.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ActiveMQObjectMessage.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ActiveMQQueue.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ActiveMQStreamMessage.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ActiveMQTempDestination.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ActiveMQTempQueue.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ActiveMQTempTopic.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ActiveMQTextMessage.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ActiveMQTopic.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/BaseCommand.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/BrokerId.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/BrokerInfo.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/Command.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/CommandTypes.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ConnectionId.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ConnectionInfo.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ConsumerId.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ConsumerInfo.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ControlCommand.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/DataArrayResponse.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/DataResponse.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/DataStructure.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/DestinationInfo.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/DiscoveryEvent.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ExceptionResponse.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/FlushCommand.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/IntegerResponse.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/JournalQueueAck.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/JournalTopicAck.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/JournalTrace.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/JournalTransaction.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/KeepAliveInfo.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/LocalTransactionId.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/MarshallAware.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/Message.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/MessageAck.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/MessageDispatch.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/MessageId.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ProducerId.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ProducerInfo.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/RedeliveryPolicy.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/RemoveInfo.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/RemoveSubscriptionInfo.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/Response.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/SessionId.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/SessionInfo.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/ShutdownInfo.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/SubscriptionInfo.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/TransactionId.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/TransactionInfo.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/WireFormatInfo.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/XATransactionId.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/command/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/ArithmeticExpression.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/BinaryExpression.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/BooleanExpression.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/ComparisonExpression.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/CompositeDestinationFilter.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/ConstantExpression.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/DestinationFilter.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/DestinationMap.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/DestinationMapEntry.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/DestinationMapNode.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/DestinationPath.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/Expression.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/JAXPXPathEvaluator.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/LogicExpression.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/MessageEvaluationContext.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/MultiExpressionEvaluator.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/NoLocalExpression.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/PrefixDestinationFilter.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/PropertyExpression.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/SimpleDestinationFilter.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/UnaryExpression.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/WildcardDestinationFilter.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/XMLBeansXPathEvaluator.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/XPathExpression.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/XQueryExpression.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/XalanXPathEvaluator.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/filter/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/jndi/ActiveMQInitialContextFactory.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/jndi/ActiveMQWASInitialContextFactory.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/jndi/LazyCreateContext.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/jndi/NameParserImpl.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/jndi/ReadOnlyContext.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/jndi/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/BoundaryStatisticImpl.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/BoundedRangeStatisticImpl.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/CountStatisticImpl.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/JCAConnectionPoolStatsImpl.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/JCAConnectionStatsImpl.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/JCAStatsImpl.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/JMSConnectionStatsImpl.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/JMSConsumerStatsImpl.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/JMSEndpointStatsImpl.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/JMSProducerStatsImpl.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/JMSSessionStatsImpl.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/JMSStatsImpl.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/PollCountStatisticImpl.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/RangeStatisticImpl.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/Resettable.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/StatisticImpl.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/StatsCapable.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/StatsImpl.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/TimeStatisticImpl.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/management/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/Cache.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/CacheEntry.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/CacheEntryList.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/CacheEvictionUsageListener.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/CacheEvictor.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/CacheFilter.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/LRUMap.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/MapCache.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/UsageListener.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/UsageManager.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/UsageManagerCacheFilter.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/buffer/MessageBuffer.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/buffer/MessageQueue.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/buffer/OrderBasedMessageBuffer.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/buffer/SizeBasedMessageBuffer.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/list/DestinationBasedMessageList.java (84%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/list/MessageList.java (86%) rename activemq-core/src/main/java/org/{ => apache}/activemq/memory/list/SimpleMessageList.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/Bridge.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/DemandForwardingBridge.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/ForwardingBridge.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/NetworkConnector.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/jms/DestinationBridge.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/jms/InboundQueueBridge.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/jms/InboundTopicBridge.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/jms/JmsConnector.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/jms/JmsMesageConvertor.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/jms/JmsQueueConnector.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/jms/JmsTopicConnector.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/jms/OutboundQueueBridge.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/jms/OutboundTopicBridge.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/jms/QueueBridge.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/jms/SimpleJmsMessageConvertor.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/jms/TopicBridge.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/jms/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/network/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/BooleanStream.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/DataStreamMarshaller.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/OpenWireFormat.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/OpenWireFormatFactory.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ActiveMQDestinationMarshaller.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ActiveMQMessageMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ActiveMQQueueMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ActiveMQTopicMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/BaseCommandMarshaller.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/BrokerIdMarshaller.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/BrokerInfoMarshaller.java (86%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ConnectionIdMarshaller.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ConnectionInfoMarshaller.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ConsumerIdMarshaller.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ConsumerInfoMarshaller.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ControlCommandMarshaller.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/DataArrayResponseMarshaller.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/DataResponseMarshaller.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/DestinationInfoMarshaller.java (86%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ExceptionResponseMarshaller.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/FlushCommandMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/IntegerResponseMarshaller.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/JournalQueueAckMarshaller.java (86%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/JournalTopicAckMarshaller.java (86%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/JournalTraceMarshaller.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/JournalTransactionMarshaller.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/KeepAliveInfoMarshaller.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/LocalTransactionIdMarshaller.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/MarshallerFactory.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/MessageAckMarshaller.java (83%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/MessageDispatchMarshaller.java (87%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/MessageIdMarshaller.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/MessageMarshaller.java (84%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ProducerIdMarshaller.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ProducerInfoMarshaller.java (85%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/RedeliveryPolicyMarshaller.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/RemoveInfoMarshaller.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ResponseMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/SessionIdMarshaller.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/SessionInfoMarshaller.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/ShutdownInfoMarshaller.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/SubscriptionInfoMarshaller.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/TransactionIdMarshaller.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/TransactionInfoMarshaller.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/WireFormatInfoMarshaller.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/openwire/v1/XATransactionIdMarshaller.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/pool/ConnectionKey.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/pool/ConnectionPool.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/pool/PooledConnection.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/pool/PooledConnectionFactory.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/pool/PooledProducer.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/pool/PooledQueueSender.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/pool/PooledSession.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/pool/PooledTopicPublisher.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/pool/SessionKey.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/pool/SessionPool.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/pool/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/proxy/ProxyConnection.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/proxy/ProxyConnector.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/security/JaasAuthenticationBroker.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/security/JassCredentialCallback.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/security/SecurityAdminMBean.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/security/SecurityContext.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/security/SimpleAuthenticationBroker.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/security/SimpleAuthorizationBroker.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/security/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/selector/ParseException.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/selector/SelectorParser.java (69%) rename activemq-core/src/main/java/org/{ => apache}/activemq/selector/SelectorParserConstants.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/selector/SelectorParserTokenManager.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/selector/SimpleCharStream.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/selector/Token.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/selector/TokenMgrError.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/selector/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/state/CommandVisitor.java (72%) rename activemq-core/src/main/java/org/{ => apache}/activemq/state/ConnectionState.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/state/ConnectionStateTracker.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/state/ConsumerState.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/state/ProducerState.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/state/SessionState.java (88%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/DefaultPersistenceAdapterFactory.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/MessageRecoveryListener.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/MessageStore.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/PersistenceAdapter.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/PersistenceAdapterFactory.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/PersistenceAdapterFactoryBean.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/ProxyMessageStore.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/ProxyTopicMessageStore.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/TopicMessageStore.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/TransactionRecoveryListener.java (81%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/TransactionStore.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/JDBCAdapter.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/JDBCMessageRecoveryListener.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/JDBCMessageStore.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/JDBCPersistenceAdapter.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/JDBCTopicMessageStore.java (88%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/StatementProvider.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/TransactionContext.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/adapter/AxionJDBCAdapter.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/adapter/BlobJDBCAdapter.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/adapter/BytesJDBCAdapter.java (81%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/adapter/CachingStatementProvider.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/adapter/DefaultStatementProvider.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/adapter/InformixJDBCAdapter.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/adapter/OracleJDBCAdapter.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/adapter/StreamJDBCAdapter.java (86%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/adapter/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/jdbc/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/journal/JournalMessageStore.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/journal/JournalPersistenceAdapter.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/journal/JournalTopicMessageStore.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/journal/JournalTransactionStore.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/journal/QuickJournalMessageData.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/journal/QuickJournalMessageStore.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/journal/QuickJournalPersistenceAdapter.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/journal/QuickJournalTopicMessageStore.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/journal/QuickJournalTransactionStore.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/journal/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/memory/MemoryMessageStore.java (86%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/memory/MemoryPersistenceAdapter.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/memory/MemoryTopicMessageStore.java (87%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/memory/MemoryTransactionStore.java (89%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/memory/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/store/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/thread/DefaultThreadPools.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/thread/Scheduler.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/thread/SimpleTaskRunner.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/thread/Task.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/thread/TaskRunner.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/thread/TaskRunnerFactory.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/thread/Valve.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transaction/LocalTransaction.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transaction/Synchronization.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transaction/Transaction.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transaction/XATransaction.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/CompositeTransport.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/FutureResponse.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/InactivityIOException.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/InactivityMonitor.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/MarshallingTransportFilter.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/MutexTransport.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/ResponseCorrelator.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/Transport.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/TransportAcceptListener.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/TransportFactory.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/TransportFilter.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/TransportListener.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/TransportLogger.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/TransportServer.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/TransportServerFilter.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/TransportServerSupport.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/TransportServerThreadSupport.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/TransportSupport.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/TransportThreadSupport.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/WireFormatNegotiator.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/activeio/ActiveIOTransport.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/activeio/ActiveIOTransportFactory.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/activeio/ActiveIOTransportServer.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/activeio/ActivityMonitor.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/activeio/PacketAggregatingAsyncChannel.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/activeio/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/DiscoveryAgent.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/DiscoveryAgentFactory.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/DiscoveryListener.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/DiscoveryTransport.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/DiscoveryTransportFactory.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java (78%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/rendezvous/JmDNSFactory.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java (78%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/rendezvous/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java (79%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/failover/FailoverTransport.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/failover/FailoverTransportFactory.java (84%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/failover/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/fanout/FanoutTransport.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/fanout/FanoutTransportFactory.java (80%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/fanout/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/mock/MockTransport.java (87%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/mock/MockTransportFactory.java (81%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/peer/PeerTransportFactory.java (87%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/peer/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/Abort.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/Ack.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/AsyncHelper.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/Begin.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/Command.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/CommandEnvelope.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/CommandParser.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/Commit.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/Connect.java (94%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/DestinationNamer.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/Disconnect.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/FrameBuilder.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/HeaderParser.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/ResponseListener.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/Send.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/Stomp.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/StompCommand.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/StompTransportFactory.java (86%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/StompWireFormat.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/StompWireFormatFactory.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/Subscribe.java (91%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/Subscription.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/Unsubscribe.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/stomp/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/tcp/ResponseHolder.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/tcp/TcpBufferedInputStream.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/tcp/TcpBufferedOutputStream.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/tcp/TcpTransport.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/tcp/TcpTransportFactory.java (85%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/tcp/TcpTransportServer.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/tcp/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/vm/VMTransport.java (92%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/vm/VMTransportFactory.java (88%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/vm/VMTransportServer.java (90%) rename activemq-core/src/main/java/org/{ => apache}/activemq/transport/vm/package.html (100%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/Callback.java (87%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/ClassLoading.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/HexSupport.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/IOExceptionSupport.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/IdGenerator.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/IndentPrinter.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/IntrospectionSupport.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/JMSExceptionSupport.java (98%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/JMXSupport.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/LRUCache.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/LongSequenceGenerator.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/MapHelper.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/MarshallingSupport.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/ServiceStopper.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/ServiceSupport.java (95%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/SubscriptionKey.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/TransactionTemplate.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/TypeConversionSupport.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/URISupport.java (99%) rename activemq-core/src/main/java/org/{ => apache}/activemq/util/WrappedException.java (96%) rename activemq-core/src/main/java/org/{ => apache}/activemq/xbean/BrokerFactoryBean.java (97%) rename activemq-core/src/main/java/org/{ => apache}/activemq/xbean/XBeanBrokerFactory.java (93%) rename activemq-core/src/main/java/org/{ => apache}/activemq/xbean/XBeanBrokerService.java (96%) delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/broker/broker delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/broker/xbean delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/apache_derby_embedded_jdbc_driver delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/axion_jdbc_driver delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/hsql_database_engine_driver delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/i-net_sprinta_2000 delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/ibm_informix_jdbc_driver_for_ibm_informix_dynamic_server delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/jconnect__tm__for_jdbc__tm_ delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/jtds_type_4_jdbc_driver_for_ms_sql_server_and_sybase delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/oracle_jdbc_driver delete mode 100644 activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/postgresql_native_driver delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/sqlserver delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/.cvsignore delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/aio delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discovery delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/multicast delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/rendezvous delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/simple delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/static delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/failover delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/fanout delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/jxta delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/mock delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/nio delete mode 100644 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/peer delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/ssl delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/stomp delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/tcp delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/vm delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/transport/vmpipe delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/wireformat/default delete mode 100755 activemq-core/src/main/resources/META-INF/services/org/activemq/wireformat/stomp rename activemq-core/src/test/java/org/{ => apache}/activemq/ActiveMQConnectionFactoryTest.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/AutoFailTestSupport.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/ClientTestSupport.java (84%) rename activemq-core/src/test/java/org/{ => apache}/activemq/CombinationTestSupport.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/ConnectionCleanupTest.java (93%) rename activemq-core/src/test/java/org/{ => apache}/activemq/ConsumerReceiveWithTimeoutTest.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/EmbeddedBrokerTestSupport.java (93%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JMSConsumerTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JMSDurableTopicRedeliverTest.java (98%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JMSExclusiveConsumerTest.java (98%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JMSMessageTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JMSQueueRedeliverTest.java (96%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JMSUsecaseTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsAutoAckListenerTest.java (98%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsAutoAckTest.java (98%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsBenchmark.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsClientAckListenerTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsClientAckTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsConnectionStartStopTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsCreateConsumerInOnMessageTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsDurableQueueWildcardSendReceiveTest.java (93%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsDurableTopicSelectorTest.java (96%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsDurableTopicSendReceiveTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsDurableTopicTransactionTest.java (93%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsDurableTopicWildcardSendReceiveTest.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsQueueBrowserTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsQueueCompositeSendReceiveTest.java (92%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsQueueRequestReplyTest.java (96%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsQueueSelectorTest.java (96%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsQueueSendReceiveTest.java (91%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsQueueSendReceiveTwoConnectionsTest.java (90%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsQueueTopicCompositeSendReceiveTest.java (92%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsQueueTransactionTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsQueueWildcardSendReceiveTest.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsRedeliveredTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsSendReceiveTestSupport.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsSessionRecoverTest.java (98%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTempDestinationTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTestSupport.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTopicCompositeSendReceiveTest.java (92%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTopicRedeliverTest.java (96%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTopicRequestReplyTest.java (98%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTopicSelectorTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTopicSendReceiveSubscriberTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTopicSendReceiveTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java (91%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTopicSendSameMessageTest.java (93%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTopicTransactionTest.java (85%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTopicWildcardSendReceiveTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/JmsTransactionTestSupport.java (98%) rename activemq-core/src/test/java/org/{ => apache}/activemq/LargeMessageTestSupport.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/LoadTestBurnIn.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/MessageTransformationTest.java (84%) rename activemq-core/src/test/java/org/{ => apache}/activemq/RedeliveryPolicyTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/SpringTestSupport.java (98%) rename activemq-core/src/test/java/org/{ => apache}/activemq/TestSupport.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/advisory/ConsumerListenerTest.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/BrokerBenchmark.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/BrokerRestartTestSupport.java (92%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/BrokerTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/BrokerTestSupport.java (90%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/MarshallingBrokerTest.java (92%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/ProgressPrinter.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/RecoveryBrokerTest.java (96%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/SpringTest.java (93%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/StubConnection.java (88%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/XARecoveryBrokerTest.java (93%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/advisory/AdvisoryBrokerTest.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/store/DefaultStoreBrokerTest.java (85%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java (87%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java (87%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/store/LoadTester.java (85%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/store/QuickJournalRecoveryBrokerTest.java (91%) rename activemq-core/src/test/java/org/{ => apache}/activemq/broker/store/QuickJournalXARecoveryBrokerTest.java (91%) rename activemq-core/src/test/java/org/{ => apache}/activemq/command/ActiveMQBytesMessageTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/command/ActiveMQDestinationTest.java (88%) rename activemq-core/src/test/java/org/{ => apache}/activemq/command/ActiveMQMapMessageTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/command/ActiveMQMessageTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/command/ActiveMQObjectMessageTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/command/ActiveMQStreamMessageTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/command/ActiveMQTextMessageTest.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/command/DataStructureTestSupport.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/command/MessageSendTest.java (88%) rename activemq-core/src/test/java/org/{ => apache}/activemq/command/MessageTest.java (93%) rename activemq-core/src/test/java/org/{ => apache}/activemq/demo/SimpleConsumer.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/demo/SimpleProducer.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/demo/SimpleQueueReceiver.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/demo/SimpleQueueSender.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/filter/BadDummyPolicyConfigTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/filter/DestinationMapTest.java (98%) rename activemq-core/src/test/java/org/{ => apache}/activemq/filter/DestinationPathTest.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/filter/DummyPolicy.java (91%) rename activemq-core/src/test/java/org/{ => apache}/activemq/filter/DummyPolicyEntry.java (92%) rename activemq-core/src/test/java/org/{ => apache}/activemq/filter/DummyPolicyTest.java (84%) rename activemq-core/src/test/java/org/{ => apache}/activemq/jndi/ActiveMQInitialContextFactoryTest.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/jndi/CustomConnectionFactoryNameTest.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/jndi/DestinationNameWithSlashTest.java (96%) rename activemq-core/src/test/java/org/{ => apache}/activemq/jndi/InitialContextTest.java (91%) rename activemq-core/src/test/java/org/{ => apache}/activemq/jndi/JNDITestSupport.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/management/BoundaryStatisticTest.java (92%) rename activemq-core/src/test/java/org/{ => apache}/activemq/management/BoundedRangeStatisticTest.java (91%) rename activemq-core/src/test/java/org/{ => apache}/activemq/management/CountStatisticTest.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/management/RangeStatisticTest.java (96%) rename activemq-core/src/test/java/org/{ => apache}/activemq/management/StatisticTestSupport.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/management/TimeStatisticTest.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/memory/buffer/DummyMessage.java (91%) rename activemq-core/src/test/java/org/{ => apache}/activemq/memory/buffer/MemoryBufferTestSupport.java (90%) rename activemq-core/src/test/java/org/{ => apache}/activemq/memory/buffer/OrderBasedMemoryBufferTest.java (92%) rename activemq-core/src/test/java/org/{ => apache}/activemq/memory/buffer/SizeBasedMessageBufferTest.java (90%) rename activemq-core/src/test/java/org/{ => apache}/activemq/network/DemandForwardingBridgeTest.java (92%) rename activemq-core/src/test/java/org/{ => apache}/activemq/network/ForwardingBridgeTest.java (88%) rename activemq-core/src/test/java/org/{ => apache}/activemq/network/NetworkTestSupport.java (90%) rename activemq-core/src/test/java/org/{ => apache}/activemq/network/jms/QueueBridgeTest.java (81%) rename activemq-core/src/test/java/org/{ => apache}/activemq/network/jms/TopicBridgeSpringTest.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/network/jms/TopicBridgeXBeanTest.java (86%) rename activemq-core/src/test/java/org/{ => apache}/activemq/openwire/BrokerInfoData.java (88%) rename activemq-core/src/test/java/org/{ => apache}/activemq/openwire/DataFileGenerator.java (96%) rename activemq-core/src/test/java/org/{ => apache}/activemq/openwire/ItStillMarshallsTheSameTest.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/openwire/WireFormatInfoData.java (90%) rename activemq-core/src/test/java/org/{ => apache}/activemq/perf/PerfConsumer.java (98%) rename activemq-core/src/test/java/org/{ => apache}/activemq/perf/PerfProducer.java (98%) rename activemq-core/src/test/java/org/{ => apache}/activemq/perf/PerfRate.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/perf/SimpleDurableTopicTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/perf/SimpleNonPersistentQueueTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/perf/SimpleNonPersistentTopicTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/perf/SimpleQueueTest.java (96%) rename activemq-core/src/test/java/org/{ => apache}/activemq/perf/SimpleTopicTest.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java (88%) rename activemq-core/src/test/java/org/{ => apache}/activemq/proxy/ProxyConnectorTest.java (90%) rename activemq-core/src/test/java/org/{ => apache}/activemq/proxy/ProxyTestSupport.java (89%) rename activemq-core/src/test/java/org/{ => apache}/activemq/security/SimpleSecurityBrokerSystemTest.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/selector/SelectorParserTest.java (87%) rename activemq-core/src/test/java/org/{ => apache}/activemq/selector/SelectorTest.java (96%) rename activemq-core/src/test/java/org/{ => apache}/activemq/simple/Consumer.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/simple/Producer.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/spring/ConsumerBean.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/spring/SpringConsumer.java (98%) rename activemq-core/src/test/java/org/{ => apache}/activemq/spring/SpringProducer.java (98%) rename activemq-core/src/test/java/org/{ => apache}/activemq/spring/SpringTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/streams/JMSInputStreamTest.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/test/JmsResourceProvider.java (90%) rename activemq-core/src/test/java/org/{ => apache}/activemq/test/JmsSendReceiveTestSupport.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/test/JmsTopicSendReceiveTest.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java (93%) rename activemq-core/src/test/java/org/{ => apache}/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java (93%) rename activemq-core/src/test/java/org/{ => apache}/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java (96%) rename activemq-core/src/test/java/org/{ => apache}/activemq/test/TestSupport.java (96%) rename activemq-core/src/test/java/org/{ => apache}/activemq/test/retroactive/DummyMessageQuery.java (83%) rename activemq-core/src/test/java/org/{ => apache}/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java (85%) rename activemq-core/src/test/java/org/{ => apache}/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java (89%) rename activemq-core/src/test/java/org/{ => apache}/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java (86%) rename activemq-core/src/test/java/org/{ => apache}/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java (89%) rename activemq-core/src/test/java/org/{ => apache}/activemq/thread/TaskRunnerTest.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/transport/TransportBrokerTestSupport.java (87%) rename activemq-core/src/test/java/org/{ => apache}/activemq/transport/activeio/NIOActiveIOTransportBrokerTest.java (91%) rename activemq-core/src/test/java/org/{ => apache}/activemq/transport/activeio/TCPActiveIOTransportBrokerTest.java (91%) rename activemq-core/src/test/java/org/{ => apache}/activemq/transport/discovery/DiscoveryTransportBrokerTest.java (88%) rename activemq-core/src/test/java/org/{ => apache}/activemq/transport/failover/BadConnectionTest.java (89%) rename activemq-core/src/test/java/org/{ => apache}/activemq/transport/failover/FailoverTransportBrokerTest.java (87%) rename activemq-core/src/test/java/org/{ => apache}/activemq/transport/fanout/FanoutTransportBrokerTest.java (91%) rename activemq-core/src/test/java/org/{ => apache}/activemq/transport/peer/PeerTransportTest.java (93%) rename activemq-core/src/test/java/org/{ => apache}/activemq/transport/stomp/StompTest.java (93%) rename activemq-core/src/test/java/org/{ => apache}/activemq/transport/stomp/StompWireFormatTest.java (88%) rename activemq-core/src/test/java/org/{ => apache}/activemq/transport/tcp/TcpTransportBrokerTest.java (91%) rename activemq-core/src/test/java/org/{ => apache}/activemq/transport/vm/VMTransportBrokerTest.java (90%) rename activemq-core/src/test/java/org/{ => apache}/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java (83%) rename activemq-core/src/test/java/org/{ => apache}/activemq/util/MessageList.java (99%) rename activemq-core/src/test/java/org/{ => apache}/activemq/util/ReflectionSupportTest.java (93%) rename activemq-core/src/test/java/org/{ => apache}/activemq/util/SimplePojo.java (97%) rename activemq-core/src/test/java/org/{ => apache}/activemq/util/URISupportTest.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java (95%) rename activemq-core/src/test/java/org/{ => apache}/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java (94%) rename activemq-core/src/test/java/org/{ => apache}/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java (90%) rename activemq-core/src/test/java/org/{ => apache}/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java (86%) rename activemq-core/src/test/java/org/{ => apache}/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java (81%) rename activemq-core/src/test/java/org/{ => apache}/activemq/xbean/XBeanConfigTest.java (80%) rename activemq-core/src/test/java/org/{ => apache}/activemq/xbean/XBeanXmlTest.java (83%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/broker/spring.xml (80%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/broker/store/loadtester.xml (100%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/filter/dummyPolicy.xml (70%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/network/jms/queue-config.xml (75%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/network/jms/topic-config.xml (74%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/network/jms/topic-spring.xml (74%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/security/groups.properties (100%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/security/users.properties (100%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/test/retroactive/activemq-fixed-buffer.xml (90%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/test/retroactive/activemq-fixed-destination-buffer.xml (91%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/test/retroactive/activemq-message-query.xml (83%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/test/retroactive/activemq-timed-policy.xml (90%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/xbean/activemq-policy.xml (100%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/xbean/activemq.xml (100%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/xbean/activemq2.xml (100%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/xbean/spring.xml (70%) rename activemq-core/src/test/resources/org/{ => apache}/activemq/xbean/spring2.xml (55%) diff --git a/activemq-core/maven.xml b/activemq-core/maven.xml index a7fe0ad66e..18577dd048 100755 --- a/activemq-core/maven.xml +++ b/activemq-core/maven.xml @@ -61,8 +61,8 @@ - - + + @@ -74,7 +74,7 @@ - + @@ -111,7 +111,7 @@ - + diff --git a/activemq-core/src/gram/java/org/activemq/openwire/tool/OpenWireScript.java b/activemq-core/src/gram/java/org/activemq/openwire/tool/OpenWireScript.java index 5ed15bf0c7..67c82cd458 100755 --- a/activemq-core/src/gram/java/org/activemq/openwire/tool/OpenWireScript.java +++ b/activemq-core/src/gram/java/org/activemq/openwire/tool/OpenWireScript.java @@ -16,7 +16,7 @@ * limitations under the License. * **/ -package org.activemq.openwire.tool; +package org.apache.activemq.openwire.tool; import org.codehaus.gram.GramSupport; import org.codehaus.jam.JAnnotationValue; @@ -66,7 +66,7 @@ public abstract class OpenWireScript extends GramSupport { public boolean isMarshallAware(JClass j) { JClass[] interfaces = j.getInterfaces(); for (int i = 0; i < interfaces.length; i++) { - if( interfaces[i].getQualifiedName().equals("org.activemq.command.MarshallAware") ) { + if( interfaces[i].getQualifiedName().equals("org.apache.activemq.command.MarshallAware") ) { return true; } } diff --git a/activemq-core/src/gram/script/GenerateCMarshalling.groovy b/activemq-core/src/gram/script/GenerateCMarshalling.groovy index 94d70bdbe4..d99b827626 100755 --- a/activemq-core/src/gram/script/GenerateCMarshalling.groovy +++ b/activemq-core/src/gram/script/GenerateCMarshalling.groovy @@ -16,7 +16,7 @@ * limitations under the License. * **/ -import org.activemq.openwire.tool.OpenWireScript +import org.apache.activemq.openwire.tool.OpenWireScript /** * Generates the Java marshalling code for the Open Wire Format diff --git a/activemq-core/src/gram/script/GenerateCSharpClasses.groovy b/activemq-core/src/gram/script/GenerateCSharpClasses.groovy index 863612d7be..827a415b27 100755 --- a/activemq-core/src/gram/script/GenerateCSharpClasses.groovy +++ b/activemq-core/src/gram/script/GenerateCSharpClasses.groovy @@ -16,7 +16,7 @@ * limitations under the License. * **/ -import org.activemq.openwire.tool.OpenWireScript +import org.apache.activemq.openwire.tool.OpenWireScript /** * Generates the C# marshalling code for the Open Wire Format @@ -26,7 +26,7 @@ import org.activemq.openwire.tool.OpenWireScript class GenerateCSharpClasses extends OpenWireScript { Object run() { - def destDir = new File("target/generated/dotnet/cs/org/activemq/openwire") + def destDir = new File("target/generated/dotnet/cs/org/apache/activemq/openwire") destDir.mkdirs() def messageClasses = classes.findAll { isMessageType(it) } @@ -130,9 +130,9 @@ namespace ActiveMQ switch (type) { case "java.lang.String": return "string" - case "org.activemq.message.ActiveMQDestination": + case "org.apache.activemq.message.ActiveMQDestination": return "ActiveMQDestination" - case "org.activemq.message.ActiveMQXid": + case "org.apache.activemq.message.ActiveMQXid": return "ActiveMQXid" default: return name diff --git a/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy b/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy index ff4f276737..00037b166b 100755 --- a/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy +++ b/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy @@ -16,7 +16,7 @@ * limitations under the License. * **/ -import org.activemq.openwire.tool.OpenWireScript +import org.apache.activemq.openwire.tool.OpenWireScript /** * Generates the Java marshalling code for the Open Wire Format @@ -26,7 +26,7 @@ import org.activemq.openwire.tool.OpenWireScript class GenerateCSharpMarshalling extends OpenWireScript { Object run() { - def destDir = new File("target/generated/dotnet/cs/org/activemq/openwire/io") + def destDir = new File("target/generated/dotnet/cs/org/apache/activemq/openwire/io") destDir.mkdirs() def messageClasses = classes.findAll { isMessageType(it) } @@ -93,7 +93,7 @@ namespace ActiveMQ out << "dataIn.readUTF()" break; - case "org.activemq.message.ActiveMQDestination": + case "org.apache.activemq.message.ActiveMQDestination": out << "readDestination(dataIn)" break; @@ -153,7 +153,7 @@ namespace ActiveMQ out << "writeUTF($getter, dataOut);" break; - case "org.activemq.message.ActiveMQDestination": + case "org.apache.activemq.message.ActiveMQDestination": out << "writeDestination($getter, dataOut);" break; diff --git a/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy b/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy index 3f5a92d308..8ded0adb3f 100755 --- a/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy +++ b/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy @@ -16,7 +16,7 @@ * limitations under the License. * **/ -import org.activemq.openwire.tool.OpenWireScript +import org.apache.activemq.openwire.tool.OpenWireScript /** * Generates the Java marshalling code for the Open Wire Format @@ -29,7 +29,7 @@ class GenerateJavaMarshalling extends OpenWireScript { def openwireVersion = System.getProperty("openwire.version"); - def destDir = new File("src/main/java/org/activemq/openwire/v${openwireVersion}") + def destDir = new File("src/main/java/org/apache/activemq/openwire/v${openwireVersion}") println "Generating Java marshalling code to directory ${destDir}" def openwireClasses = classes.findAll { @@ -78,14 +78,14 @@ out << """/** * limitations under the License. * **/ -package org.activemq.openwire.v${openwireVersion}; +package org.apache.activemq.openwire.v${openwireVersion}; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; """ for (pkg in jclass.importedPackages) { for (clazz in pkg.classes) { @@ -93,7 +93,7 @@ for (pkg in jclass.importedPackages) { } } -def baseClass = "org.activemq.openwire.DataStreamMarshaller" +def baseClass = "org.apache.activemq.openwire.DataStreamMarshaller" if( !jclass.superclass.simpleName.equals("Object") ) { baseClass = jclass.superclass.simpleName + "Marshaller"; } @@ -450,10 +450,10 @@ out << """/** * limitations under the License. * **/ -package org.activemq.openwire.v${openwireVersion}; +package org.apache.activemq.openwire.v${openwireVersion}; -import org.activemq.openwire.DataStreamMarshaller; -import org.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.DataStreamMarshaller; +import org.apache.activemq.openwire.OpenWireFormat; /** * MarshallerFactory for Open Wire Format. diff --git a/activemq-core/src/main/grammar/SelectorParser.jj b/activemq-core/src/main/grammar/SelectorParser.jj index 2cca7de1ca..169cb56e09 100755 --- a/activemq-core/src/main/grammar/SelectorParser.jj +++ b/activemq-core/src/main/grammar/SelectorParser.jj @@ -35,14 +35,14 @@ options { PARSER_BEGIN(SelectorParser) -package org.activemq.selector; +package org.apache.activemq.selector; import java.io.*; import java.util.*; import javax.jms.InvalidSelectorException; -import org.activemq.filter.*; +import org.apache.activemq.filter.*; /** * JMS Selector Parser generated by JavaCC diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQConnection.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/ActiveMQConnection.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java index 1c3ac68a47..8379cc343e 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQConnection.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.io.IOException; import java.io.InputStream; @@ -43,41 +43,41 @@ import javax.jms.TopicConnection; import javax.jms.TopicSession; import javax.jms.XAConnection; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ActiveMQTempDestination; -import org.activemq.command.ActiveMQTempQueue; -import org.activemq.command.ActiveMQTempTopic; -import org.activemq.command.BrokerInfo; -import org.activemq.command.Command; -import org.activemq.command.ConnectionId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerId; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.ControlCommand; -import org.activemq.command.DestinationInfo; -import org.activemq.command.ExceptionResponse; -import org.activemq.command.Message; -import org.activemq.command.MessageDispatch; -import org.activemq.command.MessageId; -import org.activemq.command.ProducerId; -import org.activemq.command.RedeliveryPolicy; -import org.activemq.command.RemoveSubscriptionInfo; -import org.activemq.command.Response; -import org.activemq.command.SessionId; -import org.activemq.command.ShutdownInfo; -import org.activemq.management.JMSConnectionStatsImpl; -import org.activemq.management.JMSStatsImpl; -import org.activemq.management.StatsCapable; -import org.activemq.management.StatsImpl; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportListener; -import org.activemq.util.IdGenerator; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.JMSExceptionSupport; -import org.activemq.util.LongSequenceGenerator; -import org.activemq.util.ServiceSupport; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQTempDestination; +import org.apache.activemq.command.ActiveMQTempQueue; +import org.apache.activemq.command.ActiveMQTempTopic; +import org.apache.activemq.command.BrokerInfo; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.ControlCommand; +import org.apache.activemq.command.DestinationInfo; +import org.apache.activemq.command.ExceptionResponse; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.ProducerId; +import org.apache.activemq.command.RedeliveryPolicy; +import org.apache.activemq.command.RemoveSubscriptionInfo; +import org.apache.activemq.command.Response; +import org.apache.activemq.command.SessionId; +import org.apache.activemq.command.ShutdownInfo; +import org.apache.activemq.management.JMSConnectionStatsImpl; +import org.apache.activemq.management.JMSStatsImpl; +import org.apache.activemq.management.StatsCapable; +import org.apache.activemq.management.StatsImpl; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportListener; +import org.apache.activemq.util.IdGenerator; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.JMSExceptionSupport; +import org.apache.activemq.util.LongSequenceGenerator; +import org.apache.activemq.util.ServiceSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -559,7 +559,7 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon * terminate a broker running in a standalone java process. Server must have * property enable.vm.shutdown=true defined to allow this to work. */ - // TODO : org.activemq.message.BrokerAdminCommand not yet implemented. + // TODO : org.apache.activemq.message.BrokerAdminCommand not yet implemented. /* * public void terminateBrokerVM() throws JMSException { BrokerAdminCommand * command = new BrokerAdminCommand(); diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java index e48d68cb43..aca6ad956a 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.util.Collections; import java.util.LinkedList; @@ -28,8 +28,8 @@ import javax.jms.ServerSession; import javax.jms.ServerSessionPool; import javax.jms.Session; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.MessageDispatch; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.MessageDispatch; /** * For application servers, Connection objects provide a special diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQConnectionFactory.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/ActiveMQConnectionFactory.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java index fa613ebeb5..749e9a19ad 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQConnectionFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.net.URI; import java.net.URISyntaxException; @@ -30,15 +30,15 @@ import javax.jms.TopicConnection; import javax.jms.TopicConnectionFactory; import javax.naming.Context; -import org.activemq.management.JMSStatsImpl; -import org.activemq.management.StatsCapable; -import org.activemq.management.StatsImpl; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.JMSExceptionSupport; -import org.activemq.util.URISupport; -import org.activemq.util.URISupport.CompositeData; +import org.apache.activemq.management.JMSStatsImpl; +import org.apache.activemq.management.StatsCapable; +import org.apache.activemq.management.StatsImpl; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.JMSExceptionSupport; +import org.apache.activemq.util.URISupport; +import org.apache.activemq.util.URISupport.CompositeData; import edu.emory.mathcs.backport.java.util.concurrent.Executor; import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor; diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQConnectionMetaData.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/ActiveMQConnectionMetaData.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java index 76a9b3c4e8..206c07c003 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQConnectionMetaData.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.util.Enumeration; import java.util.Hashtable; @@ -41,7 +41,7 @@ public class ActiveMQConnectionMetaData implements ConnectionMetaData { int major=0; int minor=0; try { - Package p = Package.getPackage("org.activemq"); + Package p = Package.getPackage("org.apache.activemq"); if (p != null) { version = p.getImplementationVersion(); Pattern pattern = Pattern.compile("(\\d+)\\.(\\d+).*"); diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQDispatcher.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQDispatcher.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/ActiveMQDispatcher.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQDispatcher.java index 2a638edd83..721b4b9cb6 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQDispatcher.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQDispatcher.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; -import org.activemq.command.MessageDispatch; +import org.apache.activemq.command.MessageDispatch; public interface ActiveMQDispatcher { void dispatch(MessageDispatch messageDispatch); diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java index 4824400f58..615f756131 100644 --- a/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.io.IOException; import java.io.InputStream; @@ -23,18 +23,18 @@ import javax.jms.IllegalStateException; import javax.jms.InvalidDestinationException; import javax.jms.JMSException; -import org.activemq.command.ActiveMQBytesMessage; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.CommandTypes; -import org.activemq.command.ConsumerId; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageDispatch; -import org.activemq.command.ProducerId; -import org.activemq.selector.SelectorParser; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.JMSExceptionSupport; +import org.apache.activemq.command.ActiveMQBytesMessage; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.CommandTypes; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.command.ProducerId; +import org.apache.activemq.selector.SelectorParser; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.JMSExceptionSupport; /** * @@ -85,9 +85,9 @@ public class ActiveMQInputStream extends InputStream implements ActiveMQDispatch this.info.setSubcriptionName(name); if (selector != null && selector.trim().length() != 0) { - selector = "JMSType='org.activemq.Stream' AND ( "+selector+" ) "; + selector = "JMSType='org.apache.activemq.Stream' AND ( "+selector+" ) "; } else { - selector = "JMSType='org.activemq.Stream'"; + selector = "JMSType='org.apache.activemq.Stream'"; } new SelectorParser().parse(selector); diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java index 74ef5307de..40c219ea34 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.util.HashMap; import java.util.Iterator; @@ -27,22 +27,22 @@ import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.MessageListener; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ConsumerId; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageDispatch; -import org.activemq.command.RedeliveryPolicy; -import org.activemq.management.JMSConsumerStatsImpl; -import org.activemq.management.StatsCapable; -import org.activemq.management.StatsImpl; -import org.activemq.selector.SelectorParser; -import org.activemq.thread.Scheduler; -import org.activemq.transaction.Synchronization; -import org.activemq.util.Callback; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.JMSExceptionSupport; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.command.RedeliveryPolicy; +import org.apache.activemq.management.JMSConsumerStatsImpl; +import org.apache.activemq.management.StatsCapable; +import org.apache.activemq.management.StatsImpl; +import org.apache.activemq.selector.SelectorParser; +import org.apache.activemq.thread.Scheduler; +import org.apache.activemq.transaction.Synchronization; +import org.apache.activemq.util.Callback; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.JMSExceptionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java index d9b37c70f1..7b6e9763cf 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.DeliveryMode; import javax.jms.Destination; @@ -26,12 +26,12 @@ import javax.jms.MessageFormatException; import javax.jms.MessageProducer; import org.activeio.Disposable; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ProducerId; -import org.activemq.command.ProducerInfo; -import org.activemq.management.JMSProducerStatsImpl; -import org.activemq.management.StatsCapable; -import org.activemq.management.StatsImpl; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ProducerId; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.management.JMSProducerStatsImpl; +import org.apache.activemq.management.StatsCapable; +import org.apache.activemq.management.StatsImpl; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong; diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQMessageTransformation.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/ActiveMQMessageTransformation.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java index 56fed914cb..268b6b05ce 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQMessageTransformation.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.util.Enumeration; @@ -32,18 +32,18 @@ import javax.jms.TemporaryTopic; import javax.jms.TextMessage; import javax.jms.Topic; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQBytesMessage; -import org.activemq.command.ActiveMQMapMessage; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ActiveMQObjectMessage; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQStreamMessage; -import org.activemq.command.ActiveMQTempQueue; -import org.activemq.command.ActiveMQTempTopic; -import org.activemq.command.ActiveMQTextMessage; -import org.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.ActiveMQBytesMessage; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMapMessage; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQObjectMessage; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQStreamMessage; +import org.apache.activemq.command.ActiveMQTempQueue; +import org.apache.activemq.command.ActiveMQTempTopic; +import org.apache.activemq.command.ActiveMQTextMessage; +import org.apache.activemq.command.ActiveMQTopic; /** * A helper class for converting normal JMS interfaces into ActiveMQ specific ones. diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java index e541bd58fe..981397eb19 100644 --- a/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.io.IOException; import java.io.OutputStream; @@ -26,13 +26,13 @@ import javax.jms.InvalidDestinationException; import javax.jms.JMSException; import org.activeio.Disposable; -import org.activemq.command.ActiveMQBytesMessage; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.MessageId; -import org.activemq.command.ProducerId; -import org.activemq.command.ProducerInfo; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.command.ActiveMQBytesMessage; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.ProducerId; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.util.IOExceptionSupport; /** * @version $Revision$ @@ -142,7 +142,7 @@ public class ActiveMQOutputStream extends OutputStream implements Disposable { msg.setObjectProperty(key, value); } } - msg.setType("org.activemq.Stream"); + msg.setType("org.apache.activemq.Stream"); msg.setGroupID(info.getProducerId().toString()); if( eosMessage ) { msg.setGroupSequence(-1); diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQPrefetchPolicy.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/ActiveMQPrefetchPolicy.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java index 9f17b4e993..8976f64e92 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQPrefetchPolicy.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import org.apache.commons.logging.Log; diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java index 0beeaac5e5..710e98278d 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.util.Enumeration; @@ -24,9 +24,9 @@ import javax.jms.Message; import javax.jms.Queue; import javax.jms.QueueBrowser; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConsumerId; -import org.activemq.command.MessageDispatch; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.MessageDispatch; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java index 456f1a4235..407e6f5916 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConsumerId; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConsumerId; import javax.jms.JMSException; import javax.jms.Queue; diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQQueueSender.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSender.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/ActiveMQQueueSender.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSender.java index 202ae3f632..f908be9886 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQQueueSender.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSender.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.JMSException; import javax.jms.Message; import javax.jms.Queue; import javax.jms.QueueSender; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQDestination; /** * A client uses a QueueSender object to send messages to a diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQQueueSession.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSession.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/ActiveMQQueueSession.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSession.java index eac9395eba..ec4a7da620 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQQueueSession.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSession.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.io.Serializable; diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQSession.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/ActiveMQSession.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java index fd30c7f9ab..3239b9ccd3 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQSession.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.io.Serializable; import java.util.Collections; @@ -49,33 +49,33 @@ import javax.jms.TopicSession; import javax.jms.TopicSubscriber; import javax.jms.TransactionRolledBackException; -import org.activemq.command.ActiveMQBytesMessage; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQMapMessage; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ActiveMQObjectMessage; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQStreamMessage; -import org.activemq.command.ActiveMQTextMessage; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.Command; -import org.activemq.command.ConsumerId; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageDispatch; -import org.activemq.command.MessageId; -import org.activemq.command.ProducerId; -import org.activemq.command.RedeliveryPolicy; -import org.activemq.command.Response; -import org.activemq.command.SessionId; -import org.activemq.command.SessionInfo; -import org.activemq.command.TransactionId; -import org.activemq.management.JMSSessionStatsImpl; -import org.activemq.management.StatsCapable; -import org.activemq.management.StatsImpl; -import org.activemq.thread.Scheduler; -import org.activemq.transaction.Synchronization; -import org.activemq.util.Callback; -import org.activemq.util.LongSequenceGenerator; +import org.apache.activemq.command.ActiveMQBytesMessage; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMapMessage; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQObjectMessage; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQStreamMessage; +import org.apache.activemq.command.ActiveMQTextMessage; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.ProducerId; +import org.apache.activemq.command.RedeliveryPolicy; +import org.apache.activemq.command.Response; +import org.apache.activemq.command.SessionId; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.management.JMSSessionStatsImpl; +import org.apache.activemq.management.StatsCapable; +import org.apache.activemq.management.StatsImpl; +import org.apache.activemq.thread.Scheduler; +import org.apache.activemq.transaction.Synchronization; +import org.apache.activemq.util.Callback; +import org.apache.activemq.util.LongSequenceGenerator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -248,7 +248,7 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta /* * (non-Javadoc) * - * @see org.activemq.management.StatsCapable#getStats() + * @see org.apache.activemq.management.StatsCapable#getStats() */ public StatsImpl getStats() { return stats; diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQSessionExecutor.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/ActiveMQSessionExecutor.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java index 15e95fe98c..b4e2bb0659 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQSessionExecutor.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.util.Iterator; import java.util.List; import javax.jms.JMSException; -import org.activemq.command.ConsumerId; -import org.activemq.command.MessageDispatch; -import org.activemq.thread.Task; -import org.activemq.thread.TaskRunner; -import org.activemq.util.JMSExceptionSupport; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.thread.Task; +import org.apache.activemq.thread.TaskRunner; +import org.apache.activemq.util.JMSExceptionSupport; /** * A utility class used by the Session for dispatching messages asynchronously to consumers diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQTopicPublisher.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/ActiveMQTopicPublisher.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java index b5024d7822..55cdf70406 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQTopicPublisher.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.activemq; +package org.apache.activemq; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQDestination; import javax.jms.Destination; import javax.jms.InvalidDestinationException; diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQTopicSession.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSession.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/ActiveMQTopicSession.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSession.java index 2e8b01a6a7..60e3f2ddb6 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQTopicSession.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSession.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.io.Serializable; diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQTopicSubscriber.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/ActiveMQTopicSubscriber.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java index f575576156..23c90a5025 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQTopicSubscriber.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.activemq; +package org.apache.activemq; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConsumerId; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConsumerId; import javax.jms.JMSException; import javax.jms.Topic; diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQXAConnection.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/ActiveMQXAConnection.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java index 635c694822..45048336e5 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQXAConnection.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.JMSException; import javax.jms.Session; @@ -25,8 +25,8 @@ import javax.jms.XASession; import javax.jms.XATopicConnection; import javax.jms.XATopicSession; -import org.activemq.management.JMSStatsImpl; -import org.activemq.transport.Transport; +import org.apache.activemq.management.JMSStatsImpl; +import org.apache.activemq.transport.Transport; /** * The XAConnection interface extends the capability of Connection by providing diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQXASession.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/ActiveMQXASession.java rename to activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java index a1f3f8d934..795a938e74 100755 --- a/activemq-core/src/main/java/org/activemq/ActiveMQXASession.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.JMSException; import javax.jms.QueueSession; @@ -26,7 +26,7 @@ import javax.jms.XAQueueSession; import javax.jms.XATopicSession; import javax.transaction.xa.XAResource; -import org.activemq.command.SessionId; +import org.apache.activemq.command.SessionId; /** * The XASession interface extends the capability of Session by adding access diff --git a/activemq-core/src/main/java/org/activemq/AdvisoryConsumer.java b/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java similarity index 86% rename from activemq-core/src/main/java/org/activemq/AdvisoryConsumer.java rename to activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java index fe06597f02..dd40d9d374 100755 --- a/activemq-core/src/main/java/org/activemq/AdvisoryConsumer.java +++ b/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.JMSException; -import org.activemq.advisory.AdvisorySupport; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConsumerId; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.DataStructure; -import org.activemq.command.DestinationInfo; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageDispatch; +import org.apache.activemq.advisory.AdvisorySupport; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.DataStructure; +import org.apache.activemq.command.DestinationInfo; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageDispatch; public class AdvisoryConsumer implements ActiveMQDispatcher { diff --git a/activemq-core/src/main/java/org/activemq/AlreadyClosedException.java b/activemq-core/src/main/java/org/apache/activemq/AlreadyClosedException.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/AlreadyClosedException.java rename to activemq-core/src/main/java/org/apache/activemq/AlreadyClosedException.java index fa47d3e13c..743fa81c97 100755 --- a/activemq-core/src/main/java/org/activemq/AlreadyClosedException.java +++ b/activemq-core/src/main/java/org/apache/activemq/AlreadyClosedException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/Closeable.java b/activemq-core/src/main/java/org/apache/activemq/Closeable.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/Closeable.java rename to activemq-core/src/main/java/org/apache/activemq/Closeable.java index 361b98720e..05f3315678 100755 --- a/activemq-core/src/main/java/org/activemq/Closeable.java +++ b/activemq-core/src/main/java/org/apache/activemq/Closeable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/ConfigurationException.java b/activemq-core/src/main/java/org/apache/activemq/ConfigurationException.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/ConfigurationException.java rename to activemq-core/src/main/java/org/apache/activemq/ConfigurationException.java index 7486a5c2eb..68485efd11 100755 --- a/activemq-core/src/main/java/org/activemq/ConfigurationException.java +++ b/activemq-core/src/main/java/org/apache/activemq/ConfigurationException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/ConnectionClosedException.java b/activemq-core/src/main/java/org/apache/activemq/ConnectionClosedException.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/ConnectionClosedException.java rename to activemq-core/src/main/java/org/apache/activemq/ConnectionClosedException.java index 423bb5dc7c..6eafc3ba57 100755 --- a/activemq-core/src/main/java/org/activemq/ConnectionClosedException.java +++ b/activemq-core/src/main/java/org/apache/activemq/ConnectionClosedException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.IllegalStateException; diff --git a/activemq-core/src/main/java/org/activemq/ConnectionFailedException.java b/activemq-core/src/main/java/org/apache/activemq/ConnectionFailedException.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/ConnectionFailedException.java rename to activemq-core/src/main/java/org/apache/activemq/ConnectionFailedException.java index f3a0f55f10..2f1eb98a39 100755 --- a/activemq-core/src/main/java/org/activemq/ConnectionFailedException.java +++ b/activemq-core/src/main/java/org/apache/activemq/ConnectionFailedException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/LocalTransactionEventListener.java b/activemq-core/src/main/java/org/apache/activemq/LocalTransactionEventListener.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/LocalTransactionEventListener.java rename to activemq-core/src/main/java/org/apache/activemq/LocalTransactionEventListener.java index 9adb3a3dc4..6d12a1969d 100755 --- a/activemq-core/src/main/java/org/activemq/LocalTransactionEventListener.java +++ b/activemq-core/src/main/java/org/apache/activemq/LocalTransactionEventListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; /** diff --git a/activemq-core/src/main/java/org/activemq/MessageAvailableConsumer.java b/activemq-core/src/main/java/org/apache/activemq/MessageAvailableConsumer.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/MessageAvailableConsumer.java rename to activemq-core/src/main/java/org/apache/activemq/MessageAvailableConsumer.java index 29b9943923..5165719a5d 100644 --- a/activemq-core/src/main/java/org/activemq/MessageAvailableConsumer.java +++ b/activemq-core/src/main/java/org/apache/activemq/MessageAvailableConsumer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.MessageConsumer; diff --git a/activemq-core/src/main/java/org/activemq/MessageAvailableListener.java b/activemq-core/src/main/java/org/apache/activemq/MessageAvailableListener.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/MessageAvailableListener.java rename to activemq-core/src/main/java/org/apache/activemq/MessageAvailableListener.java index 2a92f30053..ebb5b01262 100644 --- a/activemq-core/src/main/java/org/activemq/MessageAvailableListener.java +++ b/activemq-core/src/main/java/org/apache/activemq/MessageAvailableListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.MessageConsumer; diff --git a/activemq-core/src/main/java/org/activemq/MessageDispatchChannel.java b/activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/MessageDispatchChannel.java rename to activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java index db74d2c19b..a1e353aca7 100755 --- a/activemq-core/src/main/java/org/activemq/MessageDispatchChannel.java +++ b/activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.util.ArrayList; import java.util.LinkedList; @@ -22,7 +22,7 @@ import java.util.List; import javax.jms.JMSException; -import org.activemq.command.MessageDispatch; +import org.apache.activemq.command.MessageDispatch; public class MessageDispatchChannel { diff --git a/activemq-core/src/main/java/org/activemq/NotStartedException.java b/activemq-core/src/main/java/org/apache/activemq/NotStartedException.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/NotStartedException.java rename to activemq-core/src/main/java/org/apache/activemq/NotStartedException.java index 778a9b812d..5f5ad5ce35 100755 --- a/activemq-core/src/main/java/org/activemq/NotStartedException.java +++ b/activemq-core/src/main/java/org/apache/activemq/NotStartedException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.IllegalStateException; diff --git a/activemq-core/src/main/java/org/activemq/Service.java b/activemq-core/src/main/java/org/apache/activemq/Service.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/Service.java rename to activemq-core/src/main/java/org/apache/activemq/Service.java index 449d040f64..3159d0054e 100644 --- a/activemq-core/src/main/java/org/activemq/Service.java +++ b/activemq-core/src/main/java/org/apache/activemq/Service.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; /** diff --git a/activemq-core/src/main/java/org/activemq/StreamConnection.java b/activemq-core/src/main/java/org/apache/activemq/StreamConnection.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/StreamConnection.java rename to activemq-core/src/main/java/org/apache/activemq/StreamConnection.java index 49d218d201..d47e99c5fb 100644 --- a/activemq-core/src/main/java/org/activemq/StreamConnection.java +++ b/activemq-core/src/main/java/org/apache/activemq/StreamConnection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.io.InputStream; import java.io.OutputStream; diff --git a/activemq-core/src/main/java/org/activemq/ThreadPriorities.java b/activemq-core/src/main/java/org/apache/activemq/ThreadPriorities.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/ThreadPriorities.java rename to activemq-core/src/main/java/org/apache/activemq/ThreadPriorities.java index 23ffc585fe..557e9bbb09 100755 --- a/activemq-core/src/main/java/org/activemq/ThreadPriorities.java +++ b/activemq-core/src/main/java/org/apache/activemq/ThreadPriorities.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; /** diff --git a/activemq-core/src/main/java/org/activemq/TransactionContext.java b/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/TransactionContext.java rename to activemq-core/src/main/java/org/apache/activemq/TransactionContext.java index eb45516419..d533ea014c 100755 --- a/activemq-core/src/main/java/org/activemq/TransactionContext.java +++ b/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.util.ArrayList; import java.util.Arrays; @@ -27,16 +27,16 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.activemq.command.ConnectionId; -import org.activemq.command.DataArrayResponse; -import org.activemq.command.IntegerResponse; -import org.activemq.command.LocalTransactionId; -import org.activemq.command.TransactionId; -import org.activemq.command.TransactionInfo; -import org.activemq.command.XATransactionId; -import org.activemq.transaction.Synchronization; -import org.activemq.util.JMSExceptionSupport; -import org.activemq.util.LongSequenceGenerator; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.DataArrayResponse; +import org.apache.activemq.command.IntegerResponse; +import org.apache.activemq.command.LocalTransactionId; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.TransactionInfo; +import org.apache.activemq.command.XATransactionId; +import org.apache.activemq.transaction.Synchronization; +import org.apache.activemq.util.JMSExceptionSupport; +import org.apache.activemq.util.LongSequenceGenerator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/advisory/AdvisoryBroker.java b/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/advisory/AdvisoryBroker.java rename to activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java index 2bca28d2bb..c6cfe08da3 100755 --- a/activemq-core/src/main/java/org/activemq/advisory/AdvisoryBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java @@ -14,27 +14,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.advisory; +package org.apache.activemq.advisory; import java.util.Iterator; -import org.activemq.broker.Broker; -import org.activemq.broker.BrokerFilter; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.Destination; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.Command; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerId; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.DestinationInfo; -import org.activemq.command.MessageId; -import org.activemq.command.ProducerId; -import org.activemq.command.ProducerInfo; -import org.activemq.util.IdGenerator; -import org.activemq.util.LongSequenceGenerator; +import org.apache.activemq.broker.Broker; +import org.apache.activemq.broker.BrokerFilter; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.Destination; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.DestinationInfo; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.ProducerId; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.util.IdGenerator; +import org.apache.activemq.util.LongSequenceGenerator; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/advisory/AdvisorySupport.java b/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/advisory/AdvisorySupport.java rename to activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java index b94adfaeb2..76e5682eaa 100755 --- a/activemq-core/src/main/java/org/activemq/advisory/AdvisorySupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.advisory; +package org.apache.activemq.advisory; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQTopic; public class AdvisorySupport { diff --git a/activemq-core/src/main/java/org/activemq/advisory/ConsumerEvent.java b/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/advisory/ConsumerEvent.java rename to activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java index 10cb67c75b..7ff97afbdb 100644 --- a/activemq-core/src/main/java/org/activemq/advisory/ConsumerEvent.java +++ b/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.advisory; +package org.apache.activemq.advisory; -import org.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerId; import javax.jms.Destination; diff --git a/activemq-core/src/main/java/org/activemq/advisory/ConsumerEventSource.java b/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/advisory/ConsumerEventSource.java rename to activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java index 40b19dc2cd..dd021b9f19 100644 --- a/activemq-core/src/main/java/org/activemq/advisory/ConsumerEventSource.java +++ b/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.advisory; +package org.apache.activemq.advisory; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger; -import org.activemq.Service; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.ConsumerId; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.RemoveInfo; +import org.apache.activemq.Service; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.RemoveInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/advisory/ConsumerListener.java b/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerListener.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/advisory/ConsumerListener.java rename to activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerListener.java index a8ca85137a..865fba24ec 100644 --- a/activemq-core/src/main/java/org/activemq/advisory/ConsumerListener.java +++ b/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.advisory; +package org.apache.activemq.advisory; /** * Listen to the changes in the number of active consumers available for a given destination. diff --git a/activemq-core/src/main/java/org/activemq/advisory/ConsumerStartedEvent.java b/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/advisory/ConsumerStartedEvent.java rename to activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java index 7ca5f94791..abf793f7a8 100644 --- a/activemq-core/src/main/java/org/activemq/advisory/ConsumerStartedEvent.java +++ b/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.advisory; +package org.apache.activemq.advisory; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConsumerInfo; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConsumerInfo; /** * An event when a new consumer has started. diff --git a/activemq-core/src/main/java/org/activemq/advisory/ConsumerStoppedEvent.java b/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java similarity index 88% rename from activemq-core/src/main/java/org/activemq/advisory/ConsumerStoppedEvent.java rename to activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java index e948d9b9d4..30e116b574 100644 --- a/activemq-core/src/main/java/org/activemq/advisory/ConsumerStoppedEvent.java +++ b/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.advisory; +package org.apache.activemq.advisory; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConsumerId; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConsumerId; /** * An event generated when a consumer stops. diff --git a/activemq-core/src/main/java/org/activemq/advisory/package.html b/activemq-core/src/main/java/org/apache/activemq/advisory/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/advisory/package.html rename to activemq-core/src/main/java/org/apache/activemq/advisory/package.html diff --git a/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java b/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java rename to activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java index 1d37a25ff0..df145c3164 100755 --- a/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import java.io.IOException; import java.util.ArrayList; @@ -23,41 +23,41 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import org.activemq.Service; -import org.activemq.broker.region.ConnectionStatistics; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.BrokerInfo; -import org.activemq.command.Command; -import org.activemq.command.ConnectionId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerId; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.DataArrayResponse; -import org.activemq.command.DestinationInfo; -import org.activemq.command.ExceptionResponse; -import org.activemq.command.FlushCommand; -import org.activemq.command.KeepAliveInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageDispatch; -import org.activemq.command.ProducerId; -import org.activemq.command.ProducerInfo; -import org.activemq.command.RemoveSubscriptionInfo; -import org.activemq.command.Response; -import org.activemq.command.SessionId; -import org.activemq.command.SessionInfo; -import org.activemq.command.ShutdownInfo; -import org.activemq.command.TransactionId; -import org.activemq.command.TransactionInfo; -import org.activemq.command.WireFormatInfo; -import org.activemq.state.CommandVisitor; -import org.activemq.state.ConsumerState; -import org.activemq.state.ProducerState; -import org.activemq.state.SessionState; -import org.activemq.thread.Task; -import org.activemq.thread.TaskRunner; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.util.ServiceSupport; +import org.apache.activemq.Service; +import org.apache.activemq.broker.region.ConnectionStatistics; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.BrokerInfo; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.DataArrayResponse; +import org.apache.activemq.command.DestinationInfo; +import org.apache.activemq.command.ExceptionResponse; +import org.apache.activemq.command.FlushCommand; +import org.apache.activemq.command.KeepAliveInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.command.ProducerId; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.RemoveSubscriptionInfo; +import org.apache.activemq.command.Response; +import org.apache.activemq.command.SessionId; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.command.ShutdownInfo; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.TransactionInfo; +import org.apache.activemq.command.WireFormatInfo; +import org.apache.activemq.state.CommandVisitor; +import org.apache.activemq.state.ConsumerState; +import org.apache.activemq.state.ProducerState; +import org.apache.activemq.state.SessionState; +import org.apache.activemq.thread.Task; +import org.apache.activemq.thread.TaskRunner; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.util.ServiceSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -84,7 +84,7 @@ public abstract class AbstractConnection implements Service, Connection, Task, C protected boolean disposed=false; - static class ConnectionState extends org.activemq.state.ConnectionState { + static class ConnectionState extends org.apache.activemq.state.ConnectionState { private final ConnectionContext context; public ConnectionState(ConnectionInfo info, ConnectionContext context) { diff --git a/activemq-core/src/main/java/org/activemq/broker/Broker.java b/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/broker/Broker.java rename to activemq-core/src/main/java/org/apache/activemq/broker/Broker.java index d266a04d65..eb24ed77df 100755 --- a/activemq-core/src/main/java/org/activemq/broker/Broker.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; -import org.activemq.Service; -import org.activemq.broker.region.Region; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.BrokerId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ProducerInfo; -import org.activemq.command.SessionInfo; -import org.activemq.command.TransactionId; +import org.apache.activemq.Service; +import org.apache.activemq.broker.region.Region; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.BrokerId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.command.TransactionId; /** * The Message Broker which routes messages, diff --git a/activemq-core/src/main/java/org/activemq/broker/BrokerFactory.java b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/broker/BrokerFactory.java rename to activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java index 448506e066..651b824c98 100755 --- a/activemq-core/src/main/java/org/activemq/broker/BrokerFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import org.activeio.FactoryFinder; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IOExceptionSupport; import java.io.IOException; import java.net.URI; @@ -29,7 +29,7 @@ import java.net.URI; */ public class BrokerFactory { - static final private FactoryFinder brokerFactoryHandlerFinder = new FactoryFinder("META-INF/services/org/activemq/broker/"); + static final private FactoryFinder brokerFactoryHandlerFinder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/"); public interface BrokerFactoryHandler { public BrokerService createBroker(URI brokerURI) throws Exception; diff --git a/activemq-core/src/main/java/org/activemq/broker/BrokerFilter.java b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java similarity index 88% rename from activemq-core/src/main/java/org/activemq/broker/BrokerFilter.java rename to activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java index dbc4128818..afc69d9bdb 100755 --- a/activemq-core/src/main/java/org/activemq/broker/BrokerFilter.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; -import org.activemq.broker.region.Destination; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.BrokerId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.ProducerInfo; -import org.activemq.command.RemoveSubscriptionInfo; -import org.activemq.command.SessionInfo; -import org.activemq.command.TransactionId; +import org.apache.activemq.broker.region.Destination; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.BrokerId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.RemoveSubscriptionInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.command.TransactionId; /** * Allows you to intercept broker operation so that features such as security can be diff --git a/activemq-core/src/main/java/org/activemq/broker/BrokerRegistry.java b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/broker/BrokerRegistry.java rename to activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java index d0a5045c4a..74cb9d7ee8 100755 --- a/activemq-core/src/main/java/org/activemq/broker/BrokerRegistry.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/broker/BrokerService.java b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/broker/BrokerService.java rename to activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java index 97e5ff926d..474a0d0925 100644 --- a/activemq-core/src/main/java/org/activemq/broker/BrokerService.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import java.io.File; import java.io.IOException; @@ -30,35 +30,35 @@ import java.util.Map; import javax.management.MBeanServer; import javax.management.ObjectName; -import org.activemq.ActiveMQConnectionMetaData; -import org.activemq.Service; -import org.activemq.advisory.AdvisoryBroker; -import org.activemq.broker.jmx.BrokerView; -import org.activemq.broker.jmx.BrokerViewMBean; -import org.activemq.broker.jmx.ConnectorView; -import org.activemq.broker.jmx.ConnectorViewMBean; -import org.activemq.broker.jmx.ManagedRegionBroker; -import org.activemq.broker.jmx.ManagedTransportConnector; -import org.activemq.broker.jmx.ManagementContext; -import org.activemq.broker.jmx.NetworkConnectorView; -import org.activemq.broker.jmx.NetworkConnectorViewMBean; -import org.activemq.broker.jmx.ProxyConnectorView; -import org.activemq.broker.region.RegionBroker; -import org.activemq.broker.region.policy.PolicyMap; -import org.activemq.memory.UsageManager; -import org.activemq.network.NetworkConnector; -import org.activemq.network.jms.JmsConnector; -import org.activemq.proxy.ProxyConnector; -import org.activemq.store.DefaultPersistenceAdapterFactory; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.memory.MemoryPersistenceAdapter; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportServer; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.JMXSupport; -import org.activemq.util.ServiceStopper; -import org.activemq.util.URISupport; +import org.apache.activemq.ActiveMQConnectionMetaData; +import org.apache.activemq.Service; +import org.apache.activemq.advisory.AdvisoryBroker; +import org.apache.activemq.broker.jmx.BrokerView; +import org.apache.activemq.broker.jmx.BrokerViewMBean; +import org.apache.activemq.broker.jmx.ConnectorView; +import org.apache.activemq.broker.jmx.ConnectorViewMBean; +import org.apache.activemq.broker.jmx.ManagedRegionBroker; +import org.apache.activemq.broker.jmx.ManagedTransportConnector; +import org.apache.activemq.broker.jmx.ManagementContext; +import org.apache.activemq.broker.jmx.NetworkConnectorView; +import org.apache.activemq.broker.jmx.NetworkConnectorViewMBean; +import org.apache.activemq.broker.jmx.ProxyConnectorView; +import org.apache.activemq.broker.region.RegionBroker; +import org.apache.activemq.broker.region.policy.PolicyMap; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.network.NetworkConnector; +import org.apache.activemq.network.jms.JmsConnector; +import org.apache.activemq.proxy.ProxyConnector; +import org.apache.activemq.store.DefaultPersistenceAdapterFactory; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.memory.MemoryPersistenceAdapter; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportServer; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.JMXSupport; +import org.apache.activemq.util.ServiceStopper; +import org.apache.activemq.util.URISupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -654,7 +654,7 @@ public class BrokerService implements Service { map.put("BrokerName", JMXSupport.encodeObjectNamePart(getBrokerName())); map.put("ConnectorName", JMXSupport.encodeObjectNamePart(connector.getName())); try { - ObjectName objectName = new ObjectName("org.activemq", map); + ObjectName objectName = new ObjectName("org.apache.activemq", map); mbeanServer.registerMBean(view, objectName); registeredMBeanNames.add(objectName); } @@ -672,7 +672,7 @@ public class BrokerService implements Service { // map.put("ConnectorName", // JMXSupport.encodeObjectNamePart(connector.())); try { - ObjectName objectName = new ObjectName("org.activemq", map); + ObjectName objectName = new ObjectName("org.apache.activemq", map); mbeanServer.registerMBean(view, objectName); registeredMBeanNames.add(objectName); } @@ -690,7 +690,7 @@ public class BrokerService implements Service { // map.put("ConnectorName", // JMXSupport.encodeObjectNamePart(connector.())); try { - ObjectName objectName = new ObjectName("org.activemq", map); + ObjectName objectName = new ObjectName("org.apache.activemq", map); mbeanServer.registerMBean(view, objectName); registeredMBeanNames.add(objectName); } @@ -797,7 +797,7 @@ public class BrokerService implements Service { Hashtable map = new Hashtable(); map.put("Type", "Broker"); map.put("BrokerName", JMXSupport.encodeObjectNamePart(getBrokerName())); - return new ObjectName("org.activemq", map); + return new ObjectName("org.apache.activemq", map); } catch (Throwable e) { throw IOExceptionSupport.create("Invalid JMX broker name: " + brokerName, e); diff --git a/activemq-core/src/main/java/org/activemq/broker/CompositeDestinationBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/broker/CompositeDestinationBroker.java rename to activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java index 0364a74277..e6e2367acf 100755 --- a/activemq-core/src/main/java/org/activemq/broker/CompositeDestinationBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.ProducerInfo; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.ProducerInfo; /** * This broker filter handles composite destinations. diff --git a/activemq-core/src/main/java/org/activemq/broker/Connection.java b/activemq-core/src/main/java/org/apache/activemq/broker/Connection.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/broker/Connection.java rename to activemq-core/src/main/java/org/apache/activemq/broker/Connection.java index 6b98fbab5c..96237d9786 100755 --- a/activemq-core/src/main/java/org/activemq/broker/Connection.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/Connection.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; -import org.activemq.Service; -import org.activemq.broker.region.ConnectionStatistics; -import org.activemq.command.Command; -import org.activemq.command.Response; +import org.apache.activemq.Service; +import org.apache.activemq.broker.region.ConnectionStatistics; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; /** * diff --git a/activemq-core/src/main/java/org/activemq/broker/ConnectionContext.java b/activemq-core/src/main/java/org/apache/activemq/broker/ConnectionContext.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/broker/ConnectionContext.java rename to activemq-core/src/main/java/org/apache/activemq/broker/ConnectionContext.java index 25730e7699..112e5d8301 100755 --- a/activemq-core/src/main/java/org/activemq/broker/ConnectionContext.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/ConnectionContext.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; -import org.activemq.command.ConnectionId; -import org.activemq.command.WireFormatInfo; -import org.activemq.filter.MessageEvaluationContext; -import org.activemq.security.SecurityContext; -import org.activemq.transaction.Transaction; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.WireFormatInfo; +import org.apache.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.security.SecurityContext; +import org.apache.activemq.transaction.Transaction; /** * Used to hold context information needed to process requests sent to a broker. diff --git a/activemq-core/src/main/java/org/activemq/broker/Connector.java b/activemq-core/src/main/java/org/apache/activemq/broker/Connector.java similarity index 84% rename from activemq-core/src/main/java/org/activemq/broker/Connector.java rename to activemq-core/src/main/java/org/apache/activemq/broker/Connector.java index caa8b68f87..9c9dff5f7e 100755 --- a/activemq-core/src/main/java/org/activemq/broker/Connector.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/Connector.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; -import org.activemq.Service; -import org.activemq.broker.region.ConnectorStatistics; -import org.activemq.command.BrokerInfo; +import org.apache.activemq.Service; +import org.apache.activemq.broker.region.ConnectorStatistics; +import org.apache.activemq.command.BrokerInfo; /** * A connector creates and manages client connections that talk to the Broker. diff --git a/activemq-core/src/main/java/org/activemq/broker/DefaultBrokerFactory.java b/activemq-core/src/main/java/org/apache/activemq/broker/DefaultBrokerFactory.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/broker/DefaultBrokerFactory.java rename to activemq-core/src/main/java/org/apache/activemq/broker/DefaultBrokerFactory.java index 1aa6f690e8..7fa1efec3b 100644 --- a/activemq-core/src/main/java/org/activemq/broker/DefaultBrokerFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/DefaultBrokerFactory.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; -import org.activemq.broker.BrokerFactory.BrokerFactoryHandler; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.URISupport; -import org.activemq.util.URISupport.CompositeData; +import org.apache.activemq.broker.BrokerFactory.BrokerFactoryHandler; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.URISupport; +import org.apache.activemq.util.URISupport.CompositeData; import java.net.URI; import java.util.HashMap; diff --git a/activemq-core/src/main/java/org/activemq/broker/ErrorBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java similarity index 88% rename from activemq-core/src/main/java/org/activemq/broker/ErrorBroker.java rename to activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java index b0d2453423..0197a1bec5 100644 --- a/activemq-core/src/main/java/org/activemq/broker/ErrorBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; -import org.activemq.broker.region.Destination; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.BrokerId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.ProducerInfo; -import org.activemq.command.RemoveSubscriptionInfo; -import org.activemq.command.SessionInfo; -import org.activemq.command.TransactionId; +import org.apache.activemq.broker.region.Destination; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.BrokerId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.RemoveSubscriptionInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.command.TransactionId; /** * Implementation of the broker where all it's methods throw an IllegalStateException. diff --git a/activemq-core/src/main/java/org/activemq/broker/Main.java b/activemq-core/src/main/java/org/apache/activemq/broker/Main.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/broker/Main.java rename to activemq-core/src/main/java/org/apache/activemq/broker/Main.java index 8fec1d44b2..935990d8df 100755 --- a/activemq-core/src/main/java/org/activemq/broker/Main.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/Main.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import java.io.File; import java.lang.reflect.Field; @@ -75,10 +75,10 @@ public class Main { public static final int TASK_PRINT_ALL_HELP = 12; public static final int TASK_PRINT_VER = 13; - public static final String BROKER_FACTORY_CLASS = "org.activemq.broker.BrokerFactory"; + public static final String BROKER_FACTORY_CLASS = "org.apache.activemq.broker.BrokerFactory"; public static final String DEFAULT_CONFIG_URI = "xbean:activemq.xml"; public static final String DEFAULT_JMX_URL = "service:jmx:rmi:///jndi/rmi://localhost:1099/jmxconnector"; - public static final String DEFAULT_JMX_DOMAIN = "org.activemq"; + public static final String DEFAULT_JMX_DOMAIN = "org.apache.activemq"; private static final String DEFAULT_KEY_BROKER_NAME = "BrokerName"; private static final String DEFAULT_METHOD_BROKER_STOP = "terminateJVM"; @@ -821,7 +821,7 @@ public class Main { ClassLoader cl = getClassLoader(); // Use reflection to get the version try { - Class activeMQConnectionMetaData = cl.loadClass("org.activemq.ActiveMQConnectionMetaData"); + Class activeMQConnectionMetaData = cl.loadClass("org.apache.activemq.ActiveMQConnectionMetaData"); Field field = activeMQConnectionMetaData.getField("PROVIDER_VERSION"); return (String)field.get(null); } catch (Throwable e) { @@ -901,7 +901,7 @@ public class Main { if(activeMQHome==null){ // guess from the location of the jar - URL url = Main.class.getClassLoader().getResource("org/activemq/broker/Main.class"); + URL url = Main.class.getClassLoader().getResource("org/apache/activemq/broker/Main.class"); if (url != null) { try { JarURLConnection jarConnection = (JarURLConnection) url.openConnection(); diff --git a/activemq-core/src/main/java/org/activemq/broker/MutableBrokerFilter.java b/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/broker/MutableBrokerFilter.java rename to activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java index 126b688473..36979c48ae 100644 --- a/activemq-core/src/main/java/org/activemq/broker/MutableBrokerFilter.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; -import org.activemq.broker.region.Destination; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.BrokerId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.ProducerInfo; -import org.activemq.command.RemoveSubscriptionInfo; -import org.activemq.command.SessionInfo; -import org.activemq.command.TransactionId; +import org.apache.activemq.broker.region.Destination; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.BrokerId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.RemoveSubscriptionInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.command.TransactionId; /** * Like a BrokerFilter but it allows you to switch the getNext().broker. This has more diff --git a/activemq-core/src/main/java/org/activemq/broker/TransactionBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/broker/TransactionBroker.java rename to activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java index 86487705cf..1cc149aefc 100755 --- a/activemq-core/src/main/java/org/activemq/broker/TransactionBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.LocalTransactionId; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.TransactionId; -import org.activemq.command.XATransactionId; -import org.activemq.store.TransactionRecoveryListener; -import org.activemq.store.TransactionStore; -import org.activemq.transaction.LocalTransaction; -import org.activemq.transaction.Transaction; -import org.activemq.transaction.XATransaction; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.WrappedException; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.LocalTransactionId; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.XATransactionId; +import org.apache.activemq.store.TransactionRecoveryListener; +import org.apache.activemq.store.TransactionStore; +import org.apache.activemq.transaction.LocalTransaction; +import org.apache.activemq.transaction.Transaction; +import org.apache.activemq.transaction.XATransaction; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.WrappedException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/broker/TransportConnection.java b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/broker/TransportConnection.java rename to activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java index 3f5a029314..8362902cd5 100755 --- a/activemq-core/src/main/java/org/activemq/broker/TransportConnection.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import java.io.IOException; -import org.activemq.command.Command; -import org.activemq.command.Response; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportListener; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportListener; /** * diff --git a/activemq-core/src/main/java/org/activemq/broker/TransportConnector.java b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/broker/TransportConnector.java rename to activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java index 17ad3556e5..3f96411498 100755 --- a/activemq-core/src/main/java/org/activemq/broker/TransportConnector.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import java.io.IOException; import java.net.URI; @@ -24,18 +24,18 @@ import java.util.Iterator; import javax.management.MBeanServer; import javax.management.ObjectName; -import org.activemq.broker.jmx.ManagedTransportConnector; -import org.activemq.broker.region.ConnectorStatistics; -import org.activemq.command.BrokerInfo; -import org.activemq.command.ConnectionInfo; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportAcceptListener; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportServer; -import org.activemq.transport.discovery.DiscoveryAgent; -import org.activemq.transport.discovery.DiscoveryAgentFactory; -import org.activemq.util.ServiceStopper; +import org.apache.activemq.broker.jmx.ManagedTransportConnector; +import org.apache.activemq.broker.region.ConnectorStatistics; +import org.apache.activemq.command.BrokerInfo; +import org.apache.activemq.command.ConnectionInfo; +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.discovery.DiscoveryAgent; +import org.apache.activemq.transport.discovery.DiscoveryAgentFactory; +import org.apache.activemq.util.ServiceStopper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/broker/TransportStatusDetector.java b/activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/broker/TransportStatusDetector.java rename to activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java index 84a1f6e779..86c5247db2 100755 --- a/activemq-core/src/main/java/org/activemq/broker/TransportStatusDetector.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; -import org.activemq.Service; -import org.activemq.ThreadPriorities; +import org.apache.activemq.Service; +import org.apache.activemq.ThreadPriorities; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/broker/UserIDBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/broker/UserIDBroker.java rename to activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java index 5de5515e45..57ca566bea 100644 --- a/activemq-core/src/main/java/org/activemq/broker/UserIDBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; -import org.activemq.command.Message; +import org.apache.activemq.command.Message; /** * This broker filter will append the producer's user ID into the JMSXUserID header diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/BrokerView.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/broker/jmx/BrokerView.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java index ac2f3b87a2..6fce7ceff1 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/BrokerView.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.broker.Broker; -import org.activemq.broker.region.DestinationStatistics; -import org.activemq.memory.UsageManager; +import org.apache.activemq.broker.Broker; +import org.apache.activemq.broker.region.DestinationStatistics; +import org.apache.activemq.memory.UsageManager; public class BrokerView implements BrokerViewMBean { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/BrokerViewMBean.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/broker/jmx/BrokerViewMBean.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java index 404c499094..ae915bb6dd 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/BrokerViewMBean.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.Service; +import org.apache.activemq.Service; public interface BrokerViewMBean extends Service { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionView.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionView.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java index 7ec15d505d..ae6fe439f9 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionView.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.broker.Connection; +import org.apache.activemq.broker.Connection; public class ConnectionView implements ConnectionViewMBean { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionViewMBean.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionViewMBean.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java index 16a960899a..f40010a1af 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionViewMBean.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.Service; +import org.apache.activemq.Service; public interface ConnectionViewMBean extends Service { /** diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorView.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorView.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java index 5321b2868e..a6cbdf02f6 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorView.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.broker.Connector; -import org.activemq.command.BrokerInfo; -import org.activemq.command.RedeliveryPolicy; +import org.apache.activemq.broker.Connector; +import org.apache.activemq.command.BrokerInfo; +import org.apache.activemq.command.RedeliveryPolicy; public class ConnectorView implements ConnectorViewMBean { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorViewMBean.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorViewMBean.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java index 98fd3fe933..14aa0d91f4 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorViewMBean.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.Service; +import org.apache.activemq.Service; public interface ConnectorViewMBean extends Service { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/DestinationView.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/broker/jmx/DestinationView.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java index a837df1a4f..b3d0c0aa12 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/DestinationView.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.broker.region.Destination; +import org.apache.activemq.broker.region.Destination; public class DestinationView implements DestinationViewMBean { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/DestinationViewMBean.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/broker/jmx/DestinationViewMBean.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java index d1f7ad7ced..d5da79c702 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/DestinationViewMBean.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; public interface DestinationViewMBean { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedQueueRegion.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java similarity index 74% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ManagedQueueRegion.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java index cf22a49973..eddd488fd6 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedQueueRegion.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.Destination; -import org.activemq.broker.region.DestinationStatistics; -import org.activemq.broker.region.QueueRegion; -import org.activemq.broker.region.policy.PolicyMap; -import org.activemq.command.ActiveMQDestination; -import org.activemq.memory.UsageManager; -import org.activemq.store.PersistenceAdapter; -import org.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.Destination; +import org.apache.activemq.broker.region.DestinationStatistics; +import org.apache.activemq.broker.region.QueueRegion; +import org.apache.activemq.broker.region.policy.PolicyMap; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.thread.TaskRunnerFactory; public class ManagedQueueRegion extends QueueRegion { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedRegionBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java similarity index 87% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ManagedRegionBroker.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java index bc21bd50a5..927a11f6fc 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedRegionBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.broker.region.Destination; -import org.activemq.broker.region.Region; -import org.activemq.broker.region.RegionBroker; -import org.activemq.broker.region.policy.PolicyMap; -import org.activemq.command.ActiveMQDestination; -import org.activemq.memory.UsageManager; -import org.activemq.store.PersistenceAdapter; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.util.JMXSupport; +import org.apache.activemq.broker.region.Destination; +import org.apache.activemq.broker.region.Region; +import org.apache.activemq.broker.region.RegionBroker; +import org.apache.activemq.broker.region.policy.PolicyMap; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.util.JMXSupport; import javax.management.MBeanServer; import javax.management.ObjectName; diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempQueueRegion.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java similarity index 78% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempQueueRegion.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java index 2d103ef2b9..3ac2cc7f1b 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempQueueRegion.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.Destination; -import org.activemq.broker.region.DestinationStatistics; -import org.activemq.broker.region.TempQueueRegion; -import org.activemq.command.ActiveMQDestination; -import org.activemq.memory.UsageManager; -import org.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.Destination; +import org.apache.activemq.broker.region.DestinationStatistics; +import org.apache.activemq.broker.region.TempQueueRegion; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.thread.TaskRunnerFactory; public class ManagedTempQueueRegion extends TempQueueRegion { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempTopicRegion.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java similarity index 78% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempTopicRegion.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java index 09ab3f776f..1bb1ac0834 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempTopicRegion.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.Destination; -import org.activemq.broker.region.DestinationStatistics; -import org.activemq.broker.region.TempTopicRegion; -import org.activemq.command.ActiveMQDestination; -import org.activemq.memory.UsageManager; -import org.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.Destination; +import org.apache.activemq.broker.region.DestinationStatistics; +import org.apache.activemq.broker.region.TempTopicRegion; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.thread.TaskRunnerFactory; public class ManagedTempTopicRegion extends TempTopicRegion { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTopicRegion.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java similarity index 74% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTopicRegion.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java index 4f37aa4d79..7c7fed6054 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTopicRegion.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.Destination; -import org.activemq.broker.region.DestinationStatistics; -import org.activemq.broker.region.TopicRegion; -import org.activemq.broker.region.policy.PolicyMap; -import org.activemq.command.ActiveMQDestination; -import org.activemq.memory.UsageManager; -import org.activemq.store.PersistenceAdapter; -import org.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.Destination; +import org.apache.activemq.broker.region.DestinationStatistics; +import org.apache.activemq.broker.region.TopicRegion; +import org.apache.activemq.broker.region.policy.PolicyMap; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.thread.TaskRunnerFactory; public class ManagedTopicRegion extends TopicRegion { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnection.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java similarity index 88% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnection.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java index a75ab33005..c699cb40ee 100644 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnection.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.broker.Broker; -import org.activemq.broker.TransportConnection; -import org.activemq.broker.TransportConnector; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.Response; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.transport.Transport; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.JMXSupport; +import org.apache.activemq.broker.Broker; +import org.apache.activemq.broker.TransportConnection; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.Response; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.JMXSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnector.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java similarity index 86% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnector.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java index f546ae0f46..15e343d871 100755 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnector.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.broker.Broker; -import org.activemq.broker.Connection; -import org.activemq.broker.TransportConnector; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportServer; +import org.apache.activemq.broker.Broker; +import org.apache.activemq.broker.Connection; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportServer; import javax.management.MBeanServer; import javax.management.ObjectName; diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagementContext.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ManagementContext.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java index 8a9088db0a..bb761de37d 100644 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagementContext.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; import java.io.IOException; import java.net.MalformedURLException; @@ -31,7 +31,7 @@ import javax.management.remote.JMXConnectorServer; import javax.management.remote.JMXConnectorServerFactory; import javax.management.remote.JMXServiceURL; -import org.activemq.Service; +import org.apache.activemq.Service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,7 +46,7 @@ public class ManagementContext implements Service { /** * Default activemq domain */ - public static final String DEFAULT_DOMAIN = "org.activemq"; + public static final String DEFAULT_DOMAIN = "org.apache.activemq"; private final static Log log = LogFactory.getLog(ManagementContext.class); diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorView.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorView.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorView.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorView.java index 93608100b4..3cfe23cfc4 100644 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorView.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorView.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.network.NetworkConnector; +import org.apache.activemq.network.NetworkConnector; public class NetworkConnectorView implements NetworkConnectorViewMBean { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorViewMBean.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorViewMBean.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorViewMBean.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorViewMBean.java index e6f61b289a..9a3c7f7100 100644 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorViewMBean.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorViewMBean.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.Service; +import org.apache.activemq.Service; public interface NetworkConnectorViewMBean extends Service { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorView.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorView.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorView.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorView.java index 3ba8813f57..5eee4966f0 100644 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorView.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorView.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.proxy.ProxyConnector; +import org.apache.activemq.proxy.ProxyConnector; public class ProxyConnectorView implements ProxyConnectorViewMBean { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorViewMBean.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorViewMBean.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorViewMBean.java rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorViewMBean.java index db3047ac98..648eeea161 100644 --- a/activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorViewMBean.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorViewMBean.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.jmx; +package org.apache.activemq.broker.jmx; -import org.activemq.Service; +import org.apache.activemq.Service; public interface ProxyConnectorViewMBean extends Service { diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/package.html b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/broker/jmx/package.html rename to activemq-core/src/main/java/org/apache/activemq/broker/jmx/package.html diff --git a/activemq-core/src/main/java/org/activemq/broker/package.html b/activemq-core/src/main/java/org/apache/activemq/broker/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/broker/package.html rename to activemq-core/src/main/java/org/apache/activemq/broker/package.html diff --git a/activemq-core/src/main/java/org/activemq/broker/region/AbstractRegion.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/broker/region/AbstractRegion.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java index b6fa78f8d2..a605436de5 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/AbstractRegion.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import java.util.Iterator; import java.util.Set; import javax.jms.JMSException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.RemoveSubscriptionInfo; -import org.activemq.filter.DestinationMap; -import org.activemq.memory.UsageManager; -import org.activemq.store.PersistenceAdapter; -import org.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.RemoveSubscriptionInfo; +import org.apache.activemq.filter.DestinationMap; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.thread.TaskRunnerFactory; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/AbstractSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java similarity index 86% rename from activemq-core/src/main/java/org/activemq/broker/region/AbstractSubscription.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java index 67041401f5..54797894f5 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/AbstractSubscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import javax.jms.InvalidSelectorException; import javax.jms.JMSException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConsumerId; -import org.activemq.command.ConsumerInfo; -import org.activemq.filter.BooleanExpression; -import org.activemq.filter.DestinationFilter; -import org.activemq.filter.LogicExpression; -import org.activemq.filter.MessageEvaluationContext; -import org.activemq.filter.NoLocalExpression; -import org.activemq.selector.SelectorParser; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.filter.BooleanExpression; +import org.apache.activemq.filter.DestinationFilter; +import org.apache.activemq.filter.LogicExpression; +import org.apache.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.filter.NoLocalExpression; +import org.apache.activemq.selector.SelectorParser; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/ConnectionStatistics.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectionStatistics.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/broker/region/ConnectionStatistics.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectionStatistics.java index 802890a44f..2fb828c3ab 100644 --- a/activemq-core/src/main/java/org/activemq/broker/region/ConnectionStatistics.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectionStatistics.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; -import org.activemq.command.Command; -import org.activemq.command.Message; -import org.activemq.management.CountStatisticImpl; -import org.activemq.management.StatsImpl; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Message; +import org.apache.activemq.management.CountStatisticImpl; +import org.apache.activemq.management.StatsImpl; /** * The J2EE Statistics for the Connection. diff --git a/activemq-core/src/main/java/org/activemq/broker/region/ConnectorStatistics.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectorStatistics.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/broker/region/ConnectorStatistics.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectorStatistics.java index 6ff1cf200e..b2405076ab 100644 --- a/activemq-core/src/main/java/org/activemq/broker/region/ConnectorStatistics.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectorStatistics.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.activemq.broker.region; -import org.activemq.management.CountStatisticImpl; -import org.activemq.management.PollCountStatisticImpl; -import org.activemq.management.StatsImpl; +package org.apache.activemq.broker.region; +import org.apache.activemq.management.CountStatisticImpl; +import org.apache.activemq.management.PollCountStatisticImpl; +import org.apache.activemq.management.StatsImpl; /** * The J2EE Statistics for the a Destination. diff --git a/activemq-core/src/main/java/org/activemq/broker/region/Destination.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java similarity index 78% rename from activemq-core/src/main/java/org/activemq/broker/region/Destination.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java index 6a65088d55..70fa3d8c18 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/Destination.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import java.io.IOException; -import org.activemq.Service; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; -import org.activemq.memory.UsageManager; -import org.activemq.store.MessageStore; +import org.apache.activemq.Service; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.MessageStore; /** * diff --git a/activemq-core/src/main/java/org/activemq/broker/region/DestinationStatistics.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationStatistics.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/broker/region/DestinationStatistics.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationStatistics.java index bbd86e5b39..6120ec7be6 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/DestinationStatistics.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationStatistics.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; -import org.activemq.command.Message; -import org.activemq.management.CountStatisticImpl; -import org.activemq.management.PollCountStatisticImpl; -import org.activemq.management.StatsImpl; +import org.apache.activemq.command.Message; +import org.apache.activemq.management.CountStatisticImpl; +import org.apache.activemq.management.PollCountStatisticImpl; +import org.apache.activemq.management.StatsImpl; /** * The J2EE Statistics for the a Destination. diff --git a/activemq-core/src/main/java/org/activemq/broker/region/DurableTopicSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/broker/region/DurableTopicSubscription.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java index 88124ec129..4c18567465 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/DurableTopicSubscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import java.io.IOException; import java.util.Iterator; import javax.jms.InvalidSelectorException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageDispatch; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageDispatch; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/IndirectMessageReference.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/broker/region/IndirectMessageReference.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java index 5a34a16270..d0c473e7bb 100644 --- a/activemq-core/src/main/java/org/activemq/broker/region/IndirectMessageReference.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java @@ -16,14 +16,14 @@ * limitations under the License. * **/ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import java.io.IOException; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ConsumerId; -import org.activemq.command.Message; -import org.activemq.command.MessageId; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; /** * Keeps track of a message that is flowing through the Broker. This diff --git a/activemq-core/src/main/java/org/activemq/broker/region/MessageReference.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReference.java similarity index 88% rename from activemq-core/src/main/java/org/activemq/broker/region/MessageReference.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReference.java index 70b1cfcaa3..3c3faffc66 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/MessageReference.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReference.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import java.io.IOException; -import org.activemq.command.ConsumerId; -import org.activemq.command.Message; -import org.activemq.command.MessageId; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; /** * Keeps track of a message that is flowing through the Broker. This diff --git a/activemq-core/src/main/java/org/activemq/broker/region/PrefetchSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/broker/region/PrefetchSubscription.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java index 88aac87b67..8ddbd38612 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/PrefetchSubscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import java.io.IOException; import java.util.Iterator; @@ -23,15 +23,15 @@ import java.util.LinkedList; import javax.jms.InvalidSelectorException; import javax.jms.JMSException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageDispatch; -import org.activemq.command.MessageId; -import org.activemq.transaction.Synchronization; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.transaction.Synchronization; /** * A subscription that honors the pre-fetch option of the ConsumerInfo. diff --git a/activemq-core/src/main/java/org/activemq/broker/region/Queue.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/broker/region/Queue.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java index 241a797951..05eecb8986 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/Queue.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java @@ -14,28 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import java.io.IOException; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.policy.DispatchPolicy; -import org.activemq.broker.region.policy.RoundRobinDispatchPolicy; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConsumerId; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; -import org.activemq.filter.MessageEvaluationContext; -import org.activemq.memory.UsageManager; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.MessageStore; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.thread.Valve; -import org.activemq.transaction.Synchronization; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.policy.DispatchPolicy; +import org.apache.activemq.broker.region.policy.RoundRobinDispatchPolicy; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.thread.Valve; +import org.apache.activemq.transaction.Synchronization; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/QueueBrowserSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java similarity index 87% rename from activemq-core/src/main/java/org/activemq/broker/region/QueueBrowserSubscription.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java index c52ab73332..604784b503 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/QueueBrowserSubscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import javax.jms.InvalidSelectorException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageDispatch; -import org.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.filter.MessageEvaluationContext; public class QueueBrowserSubscription extends PrefetchSubscription { diff --git a/activemq-core/src/main/java/org/activemq/broker/region/QueueRegion.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueRegion.java similarity index 83% rename from activemq-core/src/main/java/org/activemq/broker/region/QueueRegion.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/QueueRegion.java index 87849d697a..81b0fdbab9 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/QueueRegion.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueRegion.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.policy.PolicyEntry; -import org.activemq.broker.region.policy.PolicyMap; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ConsumerInfo; -import org.activemq.memory.UsageManager; -import org.activemq.store.MessageStore; -import org.activemq.store.PersistenceAdapter; -import org.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.broker.ConnectionContext; +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; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.thread.TaskRunnerFactory; import javax.jms.InvalidSelectorException; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/QueueSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/broker/region/QueueSubscription.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java index 0c871728ee..edd6e1df62 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/QueueSubscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import java.io.IOException; import javax.jms.InvalidSelectorException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ConsumerId; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.MessageAck; -import org.activemq.transaction.Synchronization; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.transaction.Synchronization; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/Region.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/Region.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/broker/region/Region.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/Region.java index 9bcb20625b..4548f511df 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/Region.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/Region.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.RemoveSubscriptionInfo; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.RemoveSubscriptionInfo; /** * A Region is used to implement the different QOS options available to diff --git a/activemq-core/src/main/java/org/activemq/broker/region/RegionBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/broker/region/RegionBroker.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java index 72b27ead36..058ee358d6 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/RegionBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java @@ -14,31 +14,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet; -import org.activemq.broker.Broker; -import org.activemq.broker.Connection; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.policy.PolicyMap; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.BrokerId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.ProducerInfo; -import org.activemq.command.RemoveSubscriptionInfo; -import org.activemq.command.SessionInfo; -import org.activemq.command.TransactionId; -import org.activemq.memory.UsageManager; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.memory.MemoryPersistenceAdapter; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.util.IdGenerator; -import org.activemq.util.LongSequenceGenerator; +import org.apache.activemq.broker.Broker; +import org.apache.activemq.broker.Connection; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.policy.PolicyMap; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.BrokerId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.RemoveSubscriptionInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.memory.MemoryPersistenceAdapter; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.util.IdGenerator; +import org.apache.activemq.util.LongSequenceGenerator; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/Subscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/Subscription.java similarity index 88% rename from activemq-core/src/main/java/org/activemq/broker/region/Subscription.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/Subscription.java index aaf370d785..e06a2109e8 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/Subscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/Subscription.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import java.io.IOException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.MessageAck; -import org.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.filter.MessageEvaluationContext; /** * @version $Revision: 1.5 $ diff --git a/activemq-core/src/main/java/org/activemq/broker/region/TempQueueRegion.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java similarity index 87% rename from activemq-core/src/main/java/org/activemq/broker/region/TempQueueRegion.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java index 661bb19f7c..0191cdd72e 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/TempQueueRegion.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import javax.jms.InvalidSelectorException; import javax.jms.JMSException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQTempDestination; -import org.activemq.command.ConsumerInfo; -import org.activemq.memory.UsageManager; -import org.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQTempDestination; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.thread.TaskRunnerFactory; /** * diff --git a/activemq-core/src/main/java/org/activemq/broker/region/TempTopicRegion.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java similarity index 87% rename from activemq-core/src/main/java/org/activemq/broker/region/TempTopicRegion.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java index 1abe8a08f9..15d9c35a73 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/TempTopicRegion.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import javax.jms.JMSException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQTempDestination; -import org.activemq.command.ConsumerInfo; -import org.activemq.memory.UsageManager; -import org.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQTempDestination; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.thread.TaskRunnerFactory; /** * diff --git a/activemq-core/src/main/java/org/activemq/broker/region/Topic.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/broker/region/Topic.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java index 2c88036a2b..58060cfae6 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/Topic.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java @@ -14,29 +14,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import java.io.IOException; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.policy.DispatchPolicy; -import org.activemq.broker.region.policy.LastImageSubscriptionRecoveryPolicy; -import org.activemq.broker.region.policy.SimpleDispatchPolicy; -import org.activemq.broker.region.policy.SubscriptionRecoveryPolicy; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; -import org.activemq.filter.MessageEvaluationContext; -import org.activemq.memory.UsageManager; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.MessageStore; -import org.activemq.store.TopicMessageStore; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.thread.Valve; -import org.activemq.transaction.Synchronization; -import org.activemq.util.SubscriptionKey; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.policy.DispatchPolicy; +import org.apache.activemq.broker.region.policy.LastImageSubscriptionRecoveryPolicy; +import org.apache.activemq.broker.region.policy.SimpleDispatchPolicy; +import org.apache.activemq.broker.region.policy.SubscriptionRecoveryPolicy; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; +import org.apache.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.thread.Valve; +import org.apache.activemq.transaction.Synchronization; +import org.apache.activemq.util.SubscriptionKey; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/TopicRegion.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/broker/region/TopicRegion.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java index c7bec1cec2..412764705c 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/TopicRegion.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.policy.PolicyEntry; -import org.activemq.broker.region.policy.PolicyMap; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.RemoveSubscriptionInfo; -import org.activemq.memory.UsageManager; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.TopicMessageStore; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.util.SubscriptionKey; +import org.apache.activemq.broker.ConnectionContext; +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.ActiveMQTopic; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.RemoveSubscriptionInfo; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.util.SubscriptionKey; import javax.jms.InvalidDestinationException; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/TopicSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/broker/region/TopicSubscription.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java index 155b44165a..8a47aa96c1 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/TopicSubscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region; +package org.apache.activemq.broker.region; import java.io.IOException; import java.util.Iterator; @@ -23,15 +23,15 @@ import java.util.LinkedList; import javax.jms.InvalidSelectorException; import javax.jms.JMSException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageDispatch; -import org.activemq.memory.UsageManager; -import org.activemq.transaction.Synchronization; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.transaction.Synchronization; public class TopicSubscription extends AbstractSubscription { diff --git a/activemq-core/src/main/java/org/activemq/broker/region/package.html b/activemq-core/src/main/java/org/apache/activemq/broker/region/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/broker/region/package.html rename to activemq-core/src/main/java/org/apache/activemq/broker/region/package.html diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/DispatchPolicy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DispatchPolicy.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/DispatchPolicy.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DispatchPolicy.java index 874ed63137..5a3a41d729 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/policy/DispatchPolicy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DispatchPolicy.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region.policy; +package org.apache.activemq.broker.region.policy; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.MessageReference; -import org.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.filter.MessageEvaluationContext; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java similarity index 87% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java index 587228ff4c..4c85d54e71 100644 --- a/activemq-core/src/main/java/org/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region.policy; +package org.apache.activemq.broker.region.policy; import java.util.Iterator; import java.util.List; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.MessageReference; -import org.activemq.broker.region.Subscription; -import org.activemq.broker.region.Topic; -import org.activemq.filter.MessageEvaluationContext; -import org.activemq.memory.list.DestinationBasedMessageList; -import org.activemq.memory.list.MessageList; -import org.activemq.memory.list.SimpleMessageList; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.broker.region.Subscription; +import org.apache.activemq.broker.region.Topic; +import org.apache.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.memory.list.DestinationBasedMessageList; +import org.apache.activemq.memory.list.MessageList; +import org.apache.activemq.memory.list.SimpleMessageList; /** * This implementation of {@link SubscriptionRecoveryPolicy} will keep a fixed diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java similarity index 85% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java index 931c366083..6c620a863a 100644 --- a/activemq-core/src/main/java/org/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region.policy; +package org.apache.activemq.broker.region.policy; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.MessageReference; -import org.activemq.broker.region.Subscription; -import org.activemq.broker.region.Topic; -import org.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.broker.region.Subscription; +import org.apache.activemq.broker.region.Topic; +import org.apache.activemq.filter.MessageEvaluationContext; /** * This implementation of {@link SubscriptionRecoveryPolicy} will only keep diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/MessageQuery.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/MessageQuery.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/MessageQuery.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/MessageQuery.java index 49185e3158..e7458c6f88 100644 --- a/activemq-core/src/main/java/org/activemq/broker/region/policy/MessageQuery.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/MessageQuery.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region.policy; +package org.apache.activemq.broker.region.policy; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; import javax.jms.MessageListener; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java similarity index 81% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java index ad6f1cf160..7a49eb85b5 100644 --- a/activemq-core/src/main/java/org/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region.policy; +package org.apache.activemq.broker.region.policy; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.MessageReference; -import org.activemq.broker.region.Subscription; -import org.activemq.broker.region.Topic; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.broker.region.Subscription; +import org.apache.activemq.broker.region.Topic; /** * This is the default Topic recovery policy which does not recover any messages. diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyEntry.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyEntry.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java index ccf18bce3f..684dced284 100644 --- a/activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyEntry.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region.policy; +package org.apache.activemq.broker.region.policy; -import org.activemq.broker.region.Queue; -import org.activemq.broker.region.Topic; -import org.activemq.command.RedeliveryPolicy; -import org.activemq.filter.DestinationMapEntry; +import org.apache.activemq.broker.region.Queue; +import org.apache.activemq.broker.region.Topic; +import org.apache.activemq.command.RedeliveryPolicy; +import org.apache.activemq.filter.DestinationMapEntry; /** * Represents an entry in a {@link PolicyMap} for assigning policies to a diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyMap.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java similarity index 87% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyMap.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java index 2df820a21f..75bd86acac 100644 --- a/activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyMap.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region.policy; +package org.apache.activemq.broker.region.policy; -import org.activemq.command.ActiveMQDestination; -import org.activemq.filter.DestinationMap; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.filter.DestinationMap; import java.util.List; @@ -45,7 +45,7 @@ public class PolicyMap extends DestinationMap { /** * Sets the individual entries on the policy map * - * @org.xbean.ElementType class="org.activemq.broker.region.policy.PolicyEntry" + * @org.xbean.ElementType class="org.apache.activemq.broker.region.policy.PolicyEntry" */ public void setPolicyEntries(List entries) { super.setEntries(entries); diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java similarity index 84% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java index 04a7c09c61..8697cc359f 100644 --- a/activemq-core/src/main/java/org/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region.policy; +package org.apache.activemq.broker.region.policy; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong; -import org.activemq.ActiveMQMessageTransformation; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.Destination; -import org.activemq.broker.region.MessageReference; -import org.activemq.broker.region.Subscription; -import org.activemq.broker.region.Topic; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ConnectionId; -import org.activemq.command.MessageId; -import org.activemq.command.ProducerId; -import org.activemq.command.SessionId; -import org.activemq.filter.MessageEvaluationContext; -import org.activemq.util.IdGenerator; +import org.apache.activemq.ActiveMQMessageTransformation; +import org.apache.activemq.broker.ConnectionContext; +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.Topic; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.ProducerId; +import org.apache.activemq.command.SessionId; +import org.apache.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.util.IdGenerator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/RoundRobinDispatchPolicy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java similarity index 88% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/RoundRobinDispatchPolicy.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java index 829191872d..e4c4de34ba 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/policy/RoundRobinDispatchPolicy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region.policy; +package org.apache.activemq.broker.region.policy; import java.util.Iterator; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.MessageReference; -import org.activemq.broker.region.Subscription; -import org.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.broker.region.Subscription; +import org.apache.activemq.filter.MessageEvaluationContext; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/SimpleDispatchPolicy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchPolicy.java similarity index 85% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/SimpleDispatchPolicy.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchPolicy.java index 21b39b9b22..3f32d60bfa 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/policy/SimpleDispatchPolicy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchPolicy.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region.policy; +package org.apache.activemq.broker.region.policy; import java.util.Iterator; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.MessageReference; -import org.activemq.broker.region.Subscription; -import org.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.broker.region.Subscription; +import org.apache.activemq.filter.MessageEvaluationContext; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/StrictOrderDispatchPolicy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StrictOrderDispatchPolicy.java similarity index 86% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/StrictOrderDispatchPolicy.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StrictOrderDispatchPolicy.java index 77beac476c..28c4537c30 100755 --- a/activemq-core/src/main/java/org/activemq/broker/region/policy/StrictOrderDispatchPolicy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StrictOrderDispatchPolicy.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region.policy; +package org.apache.activemq.broker.region.policy; import java.util.Iterator; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.MessageReference; -import org.activemq.broker.region.Subscription; -import org.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.broker.region.Subscription; +import org.apache.activemq.filter.MessageEvaluationContext; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java similarity index 82% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java index 1250f7fc8e..62f61ac81a 100644 --- a/activemq-core/src/main/java/org/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region.policy; +package org.apache.activemq.broker.region.policy; -import org.activemq.Service; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.MessageReference; -import org.activemq.broker.region.Subscription; -import org.activemq.broker.region.Topic; +import org.apache.activemq.Service; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.broker.region.Subscription; +import org.apache.activemq.broker.region.Topic; /** * Abstraction to allow different recovery policies to be plugged diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java index d2e8175785..2df50577b2 100644 --- a/activemq-core/src/main/java/org/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.region.policy; +package org.apache.activemq.broker.region.policy; import java.util.ArrayList; import java.util.Collections; @@ -22,12 +22,12 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.MessageReference; -import org.activemq.broker.region.Subscription; -import org.activemq.broker.region.Topic; -import org.activemq.filter.MessageEvaluationContext; -import org.activemq.thread.Scheduler; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.broker.region.Subscription; +import org.apache.activemq.broker.region.Topic; +import org.apache.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.thread.Scheduler; /** * This implementation of {@link SubscriptionRecoveryPolicy} will keep a timed diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/package.html b/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/broker/region/policy/package.html rename to activemq-core/src/main/java/org/apache/activemq/broker/region/policy/package.html diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQBytesMessage.java b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/command/ActiveMQBytesMessage.java rename to activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java index 24a1859cbb..11e48b1814 100755 --- a/activemq-core/src/main/java/org/activemq/command/ActiveMQBytesMessage.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -39,8 +39,8 @@ import org.activeio.ByteArrayOutputStream; import org.activeio.ByteSequence; import org.activeio.PacketData; import org.activeio.packet.ByteArrayPacket; -import org.activemq.ActiveMQConnection; -import org.activemq.util.JMSExceptionSupport; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.util.JMSExceptionSupport; /** * A BytesMessage object is used to send a message containing a stream of uninterpreted bytes. It inherits diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQDestination.java b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQDestination.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/command/ActiveMQDestination.java rename to activemq-core/src/main/java/org/apache/activemq/command/ActiveMQDestination.java index 410e5babd5..c4ee920f71 100755 --- a/activemq-core/src/main/java/org/activemq/command/ActiveMQDestination.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQDestination.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.Externalizable; import java.io.IOException; @@ -33,7 +33,7 @@ import javax.jms.TemporaryQueue; import javax.jms.TemporaryTopic; import javax.jms.Topic; -import org.activemq.util.URISupport; +import org.apache.activemq.util.URISupport; /** * @openwire:marshaller diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQMapMessage.java b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/command/ActiveMQMapMessage.java rename to activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java index 5f18fcdc75..6e3564717f 100755 --- a/activemq-core/src/main/java/org/activemq/command/ActiveMQMapMessage.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -36,9 +36,9 @@ import org.activeio.ByteArrayInputStream; import org.activeio.ByteArrayOutputStream; import org.activeio.ByteSequence; import org.activeio.command.WireFormat; -import org.activemq.ActiveMQConnection; -import org.activemq.util.JMSExceptionSupport; -import org.activemq.util.MarshallingSupport; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.util.JMSExceptionSupport; +import org.apache.activemq.util.MarshallingSupport; /** * A MapMessage object is used to send a set of name-value pairs. The names are String diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQMessage.java b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/command/ActiveMQMessage.java rename to activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java index cb3ab7720a..9972554272 100755 --- a/activemq-core/src/main/java/org/activemq/command/ActiveMQMessage.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -28,11 +28,11 @@ import javax.jms.JMSException; import javax.jms.MessageFormatException; import javax.jms.MessageNotWriteableException; -import org.activemq.filter.PropertyExpression; -import org.activemq.state.CommandVisitor; -import org.activemq.util.Callback; -import org.activemq.util.JMSExceptionSupport; -import org.activemq.util.TypeConversionSupport; +import org.apache.activemq.filter.PropertyExpression; +import org.apache.activemq.state.CommandVisitor; +import org.apache.activemq.util.Callback; +import org.apache.activemq.util.JMSExceptionSupport; +import org.apache.activemq.util.TypeConversionSupport; /** * @version $Revision$ diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQObjectMessage.java b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/ActiveMQObjectMessage.java rename to activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java index 529a54bce0..7ab9f64946 100755 --- a/activemq-core/src/main/java/org/activemq/command/ActiveMQObjectMessage.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; @@ -23,9 +23,9 @@ package org.activemq.command; import org.activeio.ByteArrayInputStream; import org.activeio.ByteArrayOutputStream; import org.activeio.ByteSequence; -import org.activemq.ActiveMQConnection; -import org.activemq.util.ClassLoading; -import org.activemq.util.JMSExceptionSupport; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.util.ClassLoading; +import org.apache.activemq.util.JMSExceptionSupport; import javax.jms.JMSException; import javax.jms.ObjectMessage; diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQQueue.java b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQQueue.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/ActiveMQQueue.java rename to activemq-core/src/main/java/org/apache/activemq/command/ActiveMQQueue.java index 275102f2c0..de942f6f2d 100755 --- a/activemq-core/src/main/java/org/activemq/command/ActiveMQQueue.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQQueue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import javax.jms.JMSException; import javax.jms.Queue; diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQStreamMessage.java b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/command/ActiveMQStreamMessage.java rename to activemq-core/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java index 52c6a4c197..74f0614ed3 100755 --- a/activemq-core/src/main/java/org/activemq/command/ActiveMQStreamMessage.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import javax.jms.JMSException; import javax.jms.MessageEOFException; @@ -27,8 +27,8 @@ import javax.jms.StreamMessage; import org.activeio.ByteArrayInputStream; import org.activeio.ByteArrayOutputStream; import org.activeio.ByteSequence; -import org.activemq.ActiveMQConnection; -import org.activemq.util.JMSExceptionSupport; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.util.JMSExceptionSupport; import java.io.BufferedInputStream; import java.io.DataInputStream; diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQTempDestination.java b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/command/ActiveMQTempDestination.java rename to activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java index 3dd4483b6d..65c0aa5013 100755 --- a/activemq-core/src/main/java/org/activemq/command/ActiveMQTempDestination.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import javax.jms.JMSException; -import org.activemq.ActiveMQConnection; +import org.apache.activemq.ActiveMQConnection; /** * @openwire:marshaller diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQTempQueue.java b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/ActiveMQTempQueue.java rename to activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java index 1cfdc5ee55..9d96f96226 100755 --- a/activemq-core/src/main/java/org/activemq/command/ActiveMQTempQueue.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import javax.jms.JMSException; import javax.jms.TemporaryQueue; diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQTempTopic.java b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/ActiveMQTempTopic.java rename to activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java index a0057a61e9..b356f6f6c7 100755 --- a/activemq-core/src/main/java/org/activemq/command/ActiveMQTempTopic.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import javax.jms.JMSException; import javax.jms.TemporaryTopic; diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQTextMessage.java b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/command/ActiveMQTextMessage.java rename to activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java index a972eed6e4..04f65583bc 100755 --- a/activemq-core/src/main/java/org/activemq/command/ActiveMQTextMessage.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -32,9 +32,9 @@ import org.activeio.ByteArrayInputStream; import org.activeio.ByteArrayOutputStream; import org.activeio.ByteSequence; import org.activeio.command.WireFormat; -import org.activemq.ActiveMQConnection; -import org.activemq.util.JMSExceptionSupport; -import org.activemq.util.MarshallingSupport; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.util.JMSExceptionSupport; +import org.apache.activemq.util.MarshallingSupport; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQTopic.java b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTopic.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/ActiveMQTopic.java rename to activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTopic.java index 9a062d68d0..c29301830c 100755 --- a/activemq-core/src/main/java/org/activemq/command/ActiveMQTopic.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTopic.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import javax.jms.JMSException; import javax.jms.Topic; diff --git a/activemq-core/src/main/java/org/activemq/command/BaseCommand.java b/activemq-core/src/main/java/org/apache/activemq/command/BaseCommand.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/command/BaseCommand.java rename to activemq-core/src/main/java/org/apache/activemq/command/BaseCommand.java index 2ab6c33acc..3231b3e110 100755 --- a/activemq-core/src/main/java/org/activemq/command/BaseCommand.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/BaseCommand.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/activemq-core/src/main/java/org/activemq/command/BrokerId.java b/activemq-core/src/main/java/org/apache/activemq/command/BrokerId.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/BrokerId.java rename to activemq-core/src/main/java/org/apache/activemq/command/BrokerId.java index 5856e04bee..f7e79d75cb 100755 --- a/activemq-core/src/main/java/org/activemq/command/BrokerId.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/BrokerId.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** diff --git a/activemq-core/src/main/java/org/activemq/command/BrokerInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/BrokerInfo.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/command/BrokerInfo.java rename to activemq-core/src/main/java/org/apache/activemq/command/BrokerInfo.java index a77b2b6e43..a663aab0f5 100755 --- a/activemq-core/src/main/java/org/activemq/command/BrokerInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/BrokerInfo.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** diff --git a/activemq-core/src/main/java/org/activemq/command/Command.java b/activemq-core/src/main/java/org/apache/activemq/command/Command.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/command/Command.java rename to activemq-core/src/main/java/org/apache/activemq/command/Command.java index be6d68288e..8415b82691 100755 --- a/activemq-core/src/main/java/org/activemq/command/Command.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/Command.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** * The Command Pattern so that we can send and receive commands diff --git a/activemq-core/src/main/java/org/activemq/command/CommandTypes.java b/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/command/CommandTypes.java rename to activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java index e446dd526d..d0b9ce59f4 100755 --- a/activemq-core/src/main/java/org/activemq/command/CommandTypes.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** * Holds the command id constants used by the command objects. diff --git a/activemq-core/src/main/java/org/activemq/command/ConnectionId.java b/activemq-core/src/main/java/org/apache/activemq/command/ConnectionId.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/command/ConnectionId.java rename to activemq-core/src/main/java/org/apache/activemq/command/ConnectionId.java index 63be88c22d..e9b0f983eb 100755 --- a/activemq-core/src/main/java/org/activemq/command/ConnectionId.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ConnectionId.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** diff --git a/activemq-core/src/main/java/org/activemq/command/ConnectionInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/command/ConnectionInfo.java rename to activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java index d62b012e2f..6e8ed8fcd1 100755 --- a/activemq-core/src/main/java/org/activemq/command/ConnectionInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** diff --git a/activemq-core/src/main/java/org/activemq/command/ConsumerId.java b/activemq-core/src/main/java/org/apache/activemq/command/ConsumerId.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/command/ConsumerId.java rename to activemq-core/src/main/java/org/apache/activemq/command/ConsumerId.java index 5ec310a6f3..feb06281cf 100755 --- a/activemq-core/src/main/java/org/activemq/command/ConsumerId.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ConsumerId.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** diff --git a/activemq-core/src/main/java/org/activemq/command/ConsumerInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/command/ConsumerInfo.java rename to activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java index e3c320b1dd..c86572421a 100755 --- a/activemq-core/src/main/java/org/activemq/command/ConsumerInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.filter.BooleanExpression; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.filter.BooleanExpression; +import org.apache.activemq.state.CommandVisitor; /** diff --git a/activemq-core/src/main/java/org/activemq/command/ControlCommand.java b/activemq-core/src/main/java/org/apache/activemq/command/ControlCommand.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/command/ControlCommand.java rename to activemq-core/src/main/java/org/apache/activemq/command/ControlCommand.java index ce4062ae72..8a61e2ca1a 100644 --- a/activemq-core/src/main/java/org/activemq/command/ControlCommand.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ControlCommand.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** * Used to start and stop transports as well as terminating clients. diff --git a/activemq-core/src/main/java/org/activemq/command/DataArrayResponse.java b/activemq-core/src/main/java/org/apache/activemq/command/DataArrayResponse.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/DataArrayResponse.java rename to activemq-core/src/main/java/org/apache/activemq/command/DataArrayResponse.java index 712c910acf..922d4dd0e3 100755 --- a/activemq-core/src/main/java/org/activemq/command/DataArrayResponse.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/DataArrayResponse.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/DataResponse.java b/activemq-core/src/main/java/org/apache/activemq/command/DataResponse.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/DataResponse.java rename to activemq-core/src/main/java/org/apache/activemq/command/DataResponse.java index dae7e3d44a..14693fb86e 100755 --- a/activemq-core/src/main/java/org/activemq/command/DataResponse.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/DataResponse.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/DataStructure.java b/activemq-core/src/main/java/org/apache/activemq/command/DataStructure.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/command/DataStructure.java rename to activemq-core/src/main/java/org/apache/activemq/command/DataStructure.java index 149922ed01..b01961cd55 100755 --- a/activemq-core/src/main/java/org/activemq/command/DataStructure.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/DataStructure.java @@ -16,7 +16,7 @@ * limitations under the License. * **/ -package org.activemq.command; +package org.apache.activemq.command; /** * @version $Revision$ diff --git a/activemq-core/src/main/java/org/activemq/command/DestinationInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/DestinationInfo.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/DestinationInfo.java rename to activemq-core/src/main/java/org/apache/activemq/command/DestinationInfo.java index 4c3e24e5f9..883aac37d1 100755 --- a/activemq-core/src/main/java/org/activemq/command/DestinationInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/DestinationInfo.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.IOException; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** * Used to create and destroy destinations on the broker. diff --git a/activemq-core/src/main/java/org/activemq/command/DiscoveryEvent.java b/activemq-core/src/main/java/org/apache/activemq/command/DiscoveryEvent.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/DiscoveryEvent.java rename to activemq-core/src/main/java/org/apache/activemq/command/DiscoveryEvent.java index 8f138f5390..36fc8f745c 100755 --- a/activemq-core/src/main/java/org/activemq/command/DiscoveryEvent.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/DiscoveryEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** diff --git a/activemq-core/src/main/java/org/activemq/command/ExceptionResponse.java b/activemq-core/src/main/java/org/apache/activemq/command/ExceptionResponse.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/ExceptionResponse.java rename to activemq-core/src/main/java/org/apache/activemq/command/ExceptionResponse.java index 1affc9aa0a..254fe6c9a9 100755 --- a/activemq-core/src/main/java/org/activemq/command/ExceptionResponse.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ExceptionResponse.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/FlushCommand.java b/activemq-core/src/main/java/org/apache/activemq/command/FlushCommand.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/command/FlushCommand.java rename to activemq-core/src/main/java/org/apache/activemq/command/FlushCommand.java index 64ccc9ddf3..a4c5b88526 100644 --- a/activemq-core/src/main/java/org/activemq/command/FlushCommand.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/FlushCommand.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** * An indication to the transport layer that a flush is required. diff --git a/activemq-core/src/main/java/org/activemq/command/IntegerResponse.java b/activemq-core/src/main/java/org/apache/activemq/command/IntegerResponse.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/IntegerResponse.java rename to activemq-core/src/main/java/org/apache/activemq/command/IntegerResponse.java index f113debbd4..3c3291c238 100755 --- a/activemq-core/src/main/java/org/activemq/command/IntegerResponse.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/IntegerResponse.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/JournalQueueAck.java b/activemq-core/src/main/java/org/apache/activemq/command/JournalQueueAck.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/JournalQueueAck.java rename to activemq-core/src/main/java/org/apache/activemq/command/JournalQueueAck.java index 6b88e7b7ed..ec2513c68c 100755 --- a/activemq-core/src/main/java/org/activemq/command/JournalQueueAck.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/JournalQueueAck.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/JournalTopicAck.java b/activemq-core/src/main/java/org/apache/activemq/command/JournalTopicAck.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/command/JournalTopicAck.java rename to activemq-core/src/main/java/org/apache/activemq/command/JournalTopicAck.java index 0dbddf605f..5ff63e277a 100755 --- a/activemq-core/src/main/java/org/activemq/command/JournalTopicAck.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/JournalTopicAck.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/JournalTrace.java b/activemq-core/src/main/java/org/apache/activemq/command/JournalTrace.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/JournalTrace.java rename to activemq-core/src/main/java/org/apache/activemq/command/JournalTrace.java index 56273fc639..4d2a0bd832 100755 --- a/activemq-core/src/main/java/org/activemq/command/JournalTrace.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/JournalTrace.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/JournalTransaction.java b/activemq-core/src/main/java/org/apache/activemq/command/JournalTransaction.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/command/JournalTransaction.java rename to activemq-core/src/main/java/org/apache/activemq/command/JournalTransaction.java index fe5fd215ac..87f0c96446 100755 --- a/activemq-core/src/main/java/org/activemq/command/JournalTransaction.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/JournalTransaction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** diff --git a/activemq-core/src/main/java/org/activemq/command/KeepAliveInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/KeepAliveInfo.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/command/KeepAliveInfo.java rename to activemq-core/src/main/java/org/apache/activemq/command/KeepAliveInfo.java index b3823e62e2..f532945814 100755 --- a/activemq-core/src/main/java/org/activemq/command/KeepAliveInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/KeepAliveInfo.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** * @openwire:marshaller diff --git a/activemq-core/src/main/java/org/activemq/command/LocalTransactionId.java b/activemq-core/src/main/java/org/apache/activemq/command/LocalTransactionId.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/command/LocalTransactionId.java rename to activemq-core/src/main/java/org/apache/activemq/command/LocalTransactionId.java index 2c6b496e08..e8f4cb58fd 100755 --- a/activemq-core/src/main/java/org/activemq/command/LocalTransactionId.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/LocalTransactionId.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** * @openwire:marshaller diff --git a/activemq-core/src/main/java/org/activemq/command/MarshallAware.java b/activemq-core/src/main/java/org/apache/activemq/command/MarshallAware.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/MarshallAware.java rename to activemq-core/src/main/java/org/apache/activemq/command/MarshallAware.java index dc7613f2fd..ab9d0a755b 100755 --- a/activemq-core/src/main/java/org/activemq/command/MarshallAware.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/MarshallAware.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/command/Message.java b/activemq-core/src/main/java/org/apache/activemq/command/Message.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/Message.java rename to activemq-core/src/main/java/org/apache/activemq/command/Message.java index 81d11b8c3b..75df49e4c4 100755 --- a/activemq-core/src/main/java/org/activemq/command/Message.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/Message.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -27,10 +27,10 @@ import org.activeio.ByteArrayInputStream; import org.activeio.ByteArrayOutputStream; import org.activeio.ByteSequence; import org.activeio.command.WireFormat; -import org.activemq.ActiveMQConnection; -import org.activemq.advisory.AdvisorySupport; -import org.activemq.broker.region.MessageReference; -import org.activemq.util.MarshallingSupport; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.advisory.AdvisorySupport; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.util.MarshallingSupport; /** * Represents an ActiveMQ message @@ -78,7 +78,7 @@ abstract public class Message extends BaseCommand implements MarshallAware, Mess private BrokerId [] brokerPath; private transient short referenceCount; private transient ActiveMQConnection connection; - private transient org.activemq.broker.region.Destination regionDestination; + private transient org.apache.activemq.broker.region.Destination regionDestination; private WireFormat cachedWireFormat; private ByteSequence cachedWireFormatData; @@ -516,11 +516,11 @@ abstract public class Message extends BaseCommand implements MarshallAware, Mess return this; } - public org.activemq.broker.region.Destination getRegionDestination() { + public org.apache.activemq.broker.region.Destination getRegionDestination() { return regionDestination; } - public void setRegionDestination(org.activemq.broker.region.Destination destination) { + public void setRegionDestination(org.apache.activemq.broker.region.Destination destination) { this.regionDestination = destination; } diff --git a/activemq-core/src/main/java/org/activemq/command/MessageAck.java b/activemq-core/src/main/java/org/apache/activemq/command/MessageAck.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/command/MessageAck.java rename to activemq-core/src/main/java/org/apache/activemq/command/MessageAck.java index f5ea369ca4..2f313a1694 100755 --- a/activemq-core/src/main/java/org/activemq/command/MessageAck.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/MessageAck.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** diff --git a/activemq-core/src/main/java/org/activemq/command/MessageDispatch.java b/activemq-core/src/main/java/org/apache/activemq/command/MessageDispatch.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/command/MessageDispatch.java rename to activemq-core/src/main/java/org/apache/activemq/command/MessageDispatch.java index f04a72029a..0139e872b0 100755 --- a/activemq-core/src/main/java/org/activemq/command/MessageDispatch.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/MessageDispatch.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** diff --git a/activemq-core/src/main/java/org/activemq/command/MessageId.java b/activemq-core/src/main/java/org/apache/activemq/command/MessageId.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/command/MessageId.java rename to activemq-core/src/main/java/org/apache/activemq/command/MessageId.java index 4c9e2d30aa..ed3b581429 100755 --- a/activemq-core/src/main/java/org/activemq/command/MessageId.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/MessageId.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** diff --git a/activemq-core/src/main/java/org/activemq/command/ProducerId.java b/activemq-core/src/main/java/org/apache/activemq/command/ProducerId.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/command/ProducerId.java rename to activemq-core/src/main/java/org/apache/activemq/command/ProducerId.java index fdeeb45054..05b59012b9 100755 --- a/activemq-core/src/main/java/org/activemq/command/ProducerId.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ProducerId.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/ProducerInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/ProducerInfo.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/command/ProducerInfo.java rename to activemq-core/src/main/java/org/apache/activemq/command/ProducerInfo.java index 0ee7d00be9..0a381e4ebc 100755 --- a/activemq-core/src/main/java/org/activemq/command/ProducerInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ProducerInfo.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/RedeliveryPolicy.java b/activemq-core/src/main/java/org/apache/activemq/command/RedeliveryPolicy.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/command/RedeliveryPolicy.java rename to activemq-core/src/main/java/org/apache/activemq/command/RedeliveryPolicy.java index f0e9c90299..c1b9b8ff6c 100644 --- a/activemq-core/src/main/java/org/activemq/command/RedeliveryPolicy.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/RedeliveryPolicy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** * Configuration options used to control how messages are re-delivered when diff --git a/activemq-core/src/main/java/org/activemq/command/RemoveInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/RemoveInfo.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/RemoveInfo.java rename to activemq-core/src/main/java/org/apache/activemq/command/RemoveInfo.java index 825ce724ee..0b76e679e5 100755 --- a/activemq-core/src/main/java/org/activemq/command/RemoveInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/RemoveInfo.java @@ -16,11 +16,11 @@ * limitations under the License. * **/ -package org.activemq.command; +package org.apache.activemq.command; import java.io.IOException; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** * Removes a consumer, producer, session or connection. diff --git a/activemq-core/src/main/java/org/activemq/command/RemoveSubscriptionInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/command/RemoveSubscriptionInfo.java rename to activemq-core/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java index c7840c1552..520858dd25 100755 --- a/activemq-core/src/main/java/org/activemq/command/RemoveSubscriptionInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/Response.java b/activemq-core/src/main/java/org/apache/activemq/command/Response.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/command/Response.java rename to activemq-core/src/main/java/org/apache/activemq/command/Response.java index 497dabdf93..4fb67b3848 100755 --- a/activemq-core/src/main/java/org/activemq/command/Response.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/Response.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** * @openwire:marshaller diff --git a/activemq-core/src/main/java/org/activemq/command/SessionId.java b/activemq-core/src/main/java/org/apache/activemq/command/SessionId.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/command/SessionId.java rename to activemq-core/src/main/java/org/apache/activemq/command/SessionId.java index e3beb18f71..72a6055906 100755 --- a/activemq-core/src/main/java/org/activemq/command/SessionId.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/SessionId.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/SessionInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/SessionInfo.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/command/SessionInfo.java rename to activemq-core/src/main/java/org/apache/activemq/command/SessionInfo.java index 2ec3bfbc53..fa1d1571a3 100755 --- a/activemq-core/src/main/java/org/activemq/command/SessionInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/SessionInfo.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/ShutdownInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/ShutdownInfo.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/command/ShutdownInfo.java rename to activemq-core/src/main/java/org/apache/activemq/command/ShutdownInfo.java index 3063c2bda5..24b6feab17 100755 --- a/activemq-core/src/main/java/org/activemq/command/ShutdownInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ShutdownInfo.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/SubscriptionInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/SubscriptionInfo.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/command/SubscriptionInfo.java rename to activemq-core/src/main/java/org/apache/activemq/command/SubscriptionInfo.java index ea07c0f4fe..ff80b5f55a 100755 --- a/activemq-core/src/main/java/org/activemq/command/SubscriptionInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/SubscriptionInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** diff --git a/activemq-core/src/main/java/org/activemq/command/TransactionId.java b/activemq-core/src/main/java/org/apache/activemq/command/TransactionId.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/command/TransactionId.java rename to activemq-core/src/main/java/org/apache/activemq/command/TransactionId.java index f7e7cac199..fddbb22964 100755 --- a/activemq-core/src/main/java/org/activemq/command/TransactionId.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/TransactionId.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; /** * @openwire:marshaller diff --git a/activemq-core/src/main/java/org/activemq/command/TransactionInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/TransactionInfo.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/TransactionInfo.java rename to activemq-core/src/main/java/org/apache/activemq/command/TransactionInfo.java index 751b832061..d7cebe9a1a 100755 --- a/activemq-core/src/main/java/org/activemq/command/TransactionInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/TransactionInfo.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.IOException; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; /** * diff --git a/activemq-core/src/main/java/org/activemq/command/WireFormatInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/WireFormatInfo.java rename to activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java index 803fdb5878..f2b3b1e73e 100755 --- a/activemq-core/src/main/java/org/activemq/command/WireFormatInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.state.CommandVisitor; import java.util.Arrays; diff --git a/activemq-core/src/main/java/org/activemq/command/XATransactionId.java b/activemq-core/src/main/java/org/apache/activemq/command/XATransactionId.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/command/XATransactionId.java rename to activemq-core/src/main/java/org/apache/activemq/command/XATransactionId.java index 765ef43152..2ad4eac905 100755 --- a/activemq-core/src/main/java/org/activemq/command/XATransactionId.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/XATransactionId.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.util.Arrays; import javax.transaction.xa.Xid; -import org.activemq.util.HexSupport; +import org.apache.activemq.util.HexSupport; /** diff --git a/activemq-core/src/main/java/org/activemq/command/package.html b/activemq-core/src/main/java/org/apache/activemq/command/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/command/package.html rename to activemq-core/src/main/java/org/apache/activemq/command/package.html diff --git a/activemq-core/src/main/java/org/activemq/filter/ArithmeticExpression.java b/activemq-core/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/filter/ArithmeticExpression.java rename to activemq-core/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java index f751061bd9..ec6cb17ff9 100755 --- a/activemq-core/src/main/java/org/activemq/filter/ArithmeticExpression.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/filter/BinaryExpression.java b/activemq-core/src/main/java/org/apache/activemq/filter/BinaryExpression.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/filter/BinaryExpression.java rename to activemq-core/src/main/java/org/apache/activemq/filter/BinaryExpression.java index 5a0e3e40f1..c65fd5636d 100755 --- a/activemq-core/src/main/java/org/activemq/filter/BinaryExpression.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/BinaryExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; diff --git a/activemq-core/src/main/java/org/activemq/filter/BooleanExpression.java b/activemq-core/src/main/java/org/apache/activemq/filter/BooleanExpression.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/filter/BooleanExpression.java rename to activemq-core/src/main/java/org/apache/activemq/filter/BooleanExpression.java index c85c46cf3e..14cc8334bb 100755 --- a/activemq-core/src/main/java/org/activemq/filter/BooleanExpression.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/BooleanExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/filter/ComparisonExpression.java b/activemq-core/src/main/java/org/apache/activemq/filter/ComparisonExpression.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/filter/ComparisonExpression.java rename to activemq-core/src/main/java/org/apache/activemq/filter/ComparisonExpression.java index 3ddf52a3ad..6becbdf4ae 100755 --- a/activemq-core/src/main/java/org/activemq/filter/ComparisonExpression.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/ComparisonExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.util.HashSet; import java.util.List; @@ -108,14 +108,14 @@ public abstract class ComparisonExpression extends BinaryExpression implements B } /** - * @see org.activemq.filter.UnaryExpression#getExpressionSymbol() + * @see org.apache.activemq.filter.UnaryExpression#getExpressionSymbol() */ public String getExpressionSymbol() { return "LIKE"; } /** - * @see org.activemq.filter.Expression#evaluate(MessageEvaluationContext) + * @see org.apache.activemq.filter.Expression#evaluate(MessageEvaluationContext) */ public Object evaluate(MessageEvaluationContext message) throws JMSException { diff --git a/activemq-core/src/main/java/org/activemq/filter/CompositeDestinationFilter.java b/activemq-core/src/main/java/org/apache/activemq/filter/CompositeDestinationFilter.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/filter/CompositeDestinationFilter.java rename to activemq-core/src/main/java/org/apache/activemq/filter/CompositeDestinationFilter.java index 5e397ddbe3..4d3a54ff7a 100755 --- a/activemq-core/src/main/java/org/activemq/filter/CompositeDestinationFilter.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/CompositeDestinationFilter.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQDestination; /** * A {@link DestinationFilter} used for composite destinations diff --git a/activemq-core/src/main/java/org/activemq/filter/ConstantExpression.java b/activemq-core/src/main/java/org/apache/activemq/filter/ConstantExpression.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/filter/ConstantExpression.java rename to activemq-core/src/main/java/org/apache/activemq/filter/ConstantExpression.java index b49aec3c0f..6918a801d0 100755 --- a/activemq-core/src/main/java/org/activemq/filter/ConstantExpression.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/ConstantExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.math.BigDecimal; diff --git a/activemq-core/src/main/java/org/activemq/filter/DestinationFilter.java b/activemq-core/src/main/java/org/apache/activemq/filter/DestinationFilter.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/filter/DestinationFilter.java rename to activemq-core/src/main/java/org/apache/activemq/filter/DestinationFilter.java index 62f663f907..d2498375c5 100755 --- a/activemq-core/src/main/java/org/activemq/filter/DestinationFilter.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/DestinationFilter.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.io.IOException; import javax.jms.JMSException; -import org.activemq.command.ActiveMQDestination; -import org.activemq.util.JMSExceptionSupport; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.util.JMSExceptionSupport; /** diff --git a/activemq-core/src/main/java/org/activemq/filter/DestinationMap.java b/activemq-core/src/main/java/org/apache/activemq/filter/DestinationMap.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/filter/DestinationMap.java rename to activemq-core/src/main/java/org/apache/activemq/filter/DestinationMap.java index 3adddc346c..76dd743180 100755 --- a/activemq-core/src/main/java/org/activemq/filter/DestinationMap.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/DestinationMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.util.HashSet; import java.util.Iterator; @@ -23,7 +23,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQDestination; /** * A Map-like data structure allowing values to be indexed by {@link ActiveMQDestination} diff --git a/activemq-core/src/main/java/org/activemq/filter/DestinationMapEntry.java b/activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapEntry.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/filter/DestinationMapEntry.java rename to activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapEntry.java index 31016bf6c1..1739d0f33d 100644 --- a/activemq-core/src/main/java/org/activemq/filter/DestinationMapEntry.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapEntry.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; import org.springframework.beans.factory.InitializingBean; /** diff --git a/activemq-core/src/main/java/org/activemq/filter/DestinationMapNode.java b/activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapNode.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/filter/DestinationMapNode.java rename to activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapNode.java index 032448b460..b45756ec5c 100755 --- a/activemq-core/src/main/java/org/activemq/filter/DestinationMapNode.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.util.ArrayList; import java.util.HashMap; diff --git a/activemq-core/src/main/java/org/activemq/filter/DestinationPath.java b/activemq-core/src/main/java/org/apache/activemq/filter/DestinationPath.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/filter/DestinationPath.java rename to activemq-core/src/main/java/org/apache/activemq/filter/DestinationPath.java index f74b4aabad..cfe4d5fffd 100755 --- a/activemq-core/src/main/java/org/activemq/filter/DestinationPath.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/DestinationPath.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.util.ArrayList; import java.util.List; import javax.jms.JMSException; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; /** * Helper class for decomposing a Destination into a number of paths diff --git a/activemq-core/src/main/java/org/activemq/filter/Expression.java b/activemq-core/src/main/java/org/apache/activemq/filter/Expression.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/filter/Expression.java rename to activemq-core/src/main/java/org/apache/activemq/filter/Expression.java index 57b4333b60..196c3b914a 100755 --- a/activemq-core/src/main/java/org/activemq/filter/Expression.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/Expression.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/filter/JAXPXPathEvaluator.java b/activemq-core/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/filter/JAXPXPathEvaluator.java rename to activemq-core/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java index e75d88d63b..000616ca1a 100755 --- a/activemq-core/src/main/java/org/activemq/filter/JAXPXPathEvaluator.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.io.StringReader; @@ -27,7 +27,7 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; import org.activeio.ByteArrayInputStream; -import org.activemq.command.Message; +import org.apache.activemq.command.Message; import org.xml.sax.InputSource; public class JAXPXPathEvaluator implements XPathExpression.XPathEvaluator { diff --git a/activemq-core/src/main/java/org/activemq/filter/LogicExpression.java b/activemq-core/src/main/java/org/apache/activemq/filter/LogicExpression.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/filter/LogicExpression.java rename to activemq-core/src/main/java/org/apache/activemq/filter/LogicExpression.java index d760edb860..cb2a689b3f 100755 --- a/activemq-core/src/main/java/org/activemq/filter/LogicExpression.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/LogicExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/filter/MessageEvaluationContext.java b/activemq-core/src/main/java/org/apache/activemq/filter/MessageEvaluationContext.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/filter/MessageEvaluationContext.java rename to activemq-core/src/main/java/org/apache/activemq/filter/MessageEvaluationContext.java index e1c02a8599..8a05d1f071 100755 --- a/activemq-core/src/main/java/org/activemq/filter/MessageEvaluationContext.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/MessageEvaluationContext.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.io.IOException; -import org.activemq.broker.region.MessageReference; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; /** * MessageEvaluationContext is used to cache selection results. diff --git a/activemq-core/src/main/java/org/activemq/filter/MultiExpressionEvaluator.java b/activemq-core/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/filter/MultiExpressionEvaluator.java rename to activemq-core/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java index 29c26641c1..031e642cb2 100755 --- a/activemq-core/src/main/java/org/activemq/filter/MultiExpressionEvaluator.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.util.ArrayList; import java.util.Collection; @@ -94,7 +94,7 @@ public class MultiExpressionEvaluator { } /** - * @see org.activemq.filter.Expression#evaluate(MessageEvaluationContext) + * @see org.apache.activemq.filter.Expression#evaluate(MessageEvaluationContext) */ public Object evaluate(MessageEvaluationContext message) throws JMSException { if (view == cview) { diff --git a/activemq-core/src/main/java/org/activemq/filter/NoLocalExpression.java b/activemq-core/src/main/java/org/apache/activemq/filter/NoLocalExpression.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/filter/NoLocalExpression.java rename to activemq-core/src/main/java/org/apache/activemq/filter/NoLocalExpression.java index 38567259a0..b23a220e3f 100755 --- a/activemq-core/src/main/java/org/activemq/filter/NoLocalExpression.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/NoLocalExpression.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.io.IOException; import javax.jms.JMSException; -import org.activemq.util.JMSExceptionSupport; +import org.apache.activemq.util.JMSExceptionSupport; public class NoLocalExpression implements BooleanExpression { diff --git a/activemq-core/src/main/java/org/activemq/filter/PrefixDestinationFilter.java b/activemq-core/src/main/java/org/apache/activemq/filter/PrefixDestinationFilter.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/filter/PrefixDestinationFilter.java rename to activemq-core/src/main/java/org/apache/activemq/filter/PrefixDestinationFilter.java index 1a293ff410..2fcae58d8e 100755 --- a/activemq-core/src/main/java/org/activemq/filter/PrefixDestinationFilter.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/PrefixDestinationFilter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQDestination; /** diff --git a/activemq-core/src/main/java/org/activemq/filter/PropertyExpression.java b/activemq-core/src/main/java/org/apache/activemq/filter/PropertyExpression.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/filter/PropertyExpression.java rename to activemq-core/src/main/java/org/apache/activemq/filter/PropertyExpression.java index b9937b544d..a6bac29665 100755 --- a/activemq-core/src/main/java/org/activemq/filter/PropertyExpression.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/PropertyExpression.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.io.IOException; import java.util.HashMap; @@ -23,10 +23,10 @@ import java.util.HashMap; import javax.jms.DeliveryMode; import javax.jms.JMSException; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.TransactionId; -import org.activemq.util.JMSExceptionSupport; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.util.JMSExceptionSupport; /** * Represents a property expression diff --git a/activemq-core/src/main/java/org/activemq/filter/SimpleDestinationFilter.java b/activemq-core/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/filter/SimpleDestinationFilter.java rename to activemq-core/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java index bec8c5d085..f3f4bcb796 100755 --- a/activemq-core/src/main/java/org/activemq/filter/SimpleDestinationFilter.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQDestination; /** diff --git a/activemq-core/src/main/java/org/activemq/filter/UnaryExpression.java b/activemq-core/src/main/java/org/apache/activemq/filter/UnaryExpression.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/filter/UnaryExpression.java rename to activemq-core/src/main/java/org/apache/activemq/filter/UnaryExpression.java index e9dbe30725..6e21efc0e9 100755 --- a/activemq-core/src/main/java/org/activemq/filter/UnaryExpression.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/UnaryExpression.java @@ -16,7 +16,7 @@ * limitations under the License. * **/ -package org.activemq.filter; +package org.apache.activemq.filter; import java.math.BigDecimal; import java.util.Collection; diff --git a/activemq-core/src/main/java/org/activemq/filter/WildcardDestinationFilter.java b/activemq-core/src/main/java/org/apache/activemq/filter/WildcardDestinationFilter.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/filter/WildcardDestinationFilter.java rename to activemq-core/src/main/java/org/apache/activemq/filter/WildcardDestinationFilter.java index 88ec4890c1..733b3abad6 100755 --- a/activemq-core/src/main/java/org/activemq/filter/WildcardDestinationFilter.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/WildcardDestinationFilter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQDestination; /** diff --git a/activemq-core/src/main/java/org/activemq/filter/XMLBeansXPathEvaluator.java b/activemq-core/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/filter/XMLBeansXPathEvaluator.java rename to activemq-core/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java index da1a7293c7..ea59b3993a 100755 --- a/activemq-core/src/main/java/org/activemq/filter/XMLBeansXPathEvaluator.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import javax.jms.BytesMessage; import javax.jms.JMSException; import javax.jms.TextMessage; import org.activeio.ByteArrayInputStream; -import org.activemq.command.Message; +import org.apache.activemq.command.Message; import org.apache.xmlbeans.XmlObject; public class XMLBeansXPathEvaluator implements XPathExpression.XPathEvaluator { diff --git a/activemq-core/src/main/java/org/activemq/filter/XPathExpression.java b/activemq-core/src/main/java/org/apache/activemq/filter/XPathExpression.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/filter/XPathExpression.java rename to activemq-core/src/main/java/org/apache/activemq/filter/XPathExpression.java index cf74f4fc9a..c1d8a69e9b 100755 --- a/activemq-core/src/main/java/org/activemq/filter/XPathExpression.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/XPathExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.io.IOException; import java.lang.reflect.Constructor; @@ -22,8 +22,8 @@ import java.lang.reflect.InvocationTargetException; import javax.jms.JMSException; -import org.activemq.command.Message; -import org.activemq.util.JMSExceptionSupport; +import org.apache.activemq.command.Message; +import org.apache.activemq.util.JMSExceptionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory; public final class XPathExpression implements BooleanExpression { private static final Log log = LogFactory.getLog(XPathExpression.class); - private static final String EVALUATOR_SYSTEM_PROPERTY = "org.activemq.XPathEvaluatorClassName"; + private static final String EVALUATOR_SYSTEM_PROPERTY = "org.apache.activemq.XPathEvaluatorClassName"; private static final String DEFAULT_EVALUATOR_CLASS_NAME=XalanXPathEvaluator.class.getName(); private static final Constructor EVALUATOR_CONSTRUCTOR; diff --git a/activemq-core/src/main/java/org/activemq/filter/XQueryExpression.java b/activemq-core/src/main/java/org/apache/activemq/filter/XQueryExpression.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/filter/XQueryExpression.java rename to activemq-core/src/main/java/org/apache/activemq/filter/XQueryExpression.java index b6c5243ced..dfded8dca8 100755 --- a/activemq-core/src/main/java/org/activemq/filter/XQueryExpression.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/XQueryExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/filter/XalanXPathEvaluator.java b/activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/filter/XalanXPathEvaluator.java rename to activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java index 182a2a5065..314cc7c46a 100755 --- a/activemq-core/src/main/java/org/activemq/filter/XalanXPathEvaluator.java +++ b/activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.io.StringReader; @@ -26,7 +26,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.activeio.ByteArrayInputStream; -import org.activemq.command.Message; +import org.apache.activemq.command.Message; import org.apache.xpath.CachedXPathAPI; import org.w3c.dom.Document; import org.w3c.dom.traversal.NodeIterator; diff --git a/activemq-core/src/main/java/org/activemq/filter/package.html b/activemq-core/src/main/java/org/apache/activemq/filter/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/filter/package.html rename to activemq-core/src/main/java/org/apache/activemq/filter/package.html diff --git a/activemq-core/src/main/java/org/activemq/jndi/ActiveMQInitialContextFactory.java b/activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/jndi/ActiveMQInitialContextFactory.java rename to activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java index 432dfc417d..0659d7fd77 100755 --- a/activemq-core/src/main/java/org/activemq/jndi/ActiveMQInitialContextFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jndi; +package org.apache.activemq.jndi; import java.net.URISyntaxException; import java.util.ArrayList; @@ -32,10 +32,10 @@ import javax.naming.Context; import javax.naming.NamingException; import javax.naming.spi.InitialContextFactory; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.broker.Broker; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.Broker; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/jndi/ActiveMQWASInitialContextFactory.java b/activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactory.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/jndi/ActiveMQWASInitialContextFactory.java rename to activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactory.java index df68b61da7..02b8823b3a 100644 --- a/activemq-core/src/main/java/org/activemq/jndi/ActiveMQWASInitialContextFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jndi; +package org.apache.activemq.jndi; import javax.naming.Context; import javax.naming.NamingException; diff --git a/activemq-core/src/main/java/org/activemq/jndi/LazyCreateContext.java b/activemq-core/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/jndi/LazyCreateContext.java rename to activemq-core/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java index 0a4a33532f..235b001cc2 100755 --- a/activemq-core/src/main/java/org/activemq/jndi/LazyCreateContext.java +++ b/activemq-core/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jndi; +package org.apache.activemq.jndi; import javax.naming.NameNotFoundException; import javax.naming.NamingException; diff --git a/activemq-core/src/main/java/org/activemq/jndi/NameParserImpl.java b/activemq-core/src/main/java/org/apache/activemq/jndi/NameParserImpl.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/jndi/NameParserImpl.java rename to activemq-core/src/main/java/org/apache/activemq/jndi/NameParserImpl.java index c00a548da3..3288af4ef5 100755 --- a/activemq-core/src/main/java/org/activemq/jndi/NameParserImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/jndi/NameParserImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.jndi; +package org.apache.activemq.jndi; import javax.naming.CompositeName; import javax.naming.Name; diff --git a/activemq-core/src/main/java/org/activemq/jndi/ReadOnlyContext.java b/activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/jndi/ReadOnlyContext.java rename to activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java index 58c58b1cae..61d9da94be 100755 --- a/activemq-core/src/main/java/org/activemq/jndi/ReadOnlyContext.java +++ b/activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.jndi; +package org.apache.activemq.jndi; import javax.naming.*; import javax.naming.spi.NamingManager; diff --git a/activemq-core/src/main/java/org/activemq/jndi/package.html b/activemq-core/src/main/java/org/apache/activemq/jndi/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/jndi/package.html rename to activemq-core/src/main/java/org/apache/activemq/jndi/package.html diff --git a/activemq-core/src/main/java/org/activemq/management/BoundaryStatisticImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/BoundaryStatisticImpl.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/management/BoundaryStatisticImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/BoundaryStatisticImpl.java index b8cc7b06bb..032948de2b 100755 --- a/activemq-core/src/main/java/org/activemq/management/BoundaryStatisticImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/BoundaryStatisticImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; /** diff --git a/activemq-core/src/main/java/org/activemq/management/BoundedRangeStatisticImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/BoundedRangeStatisticImpl.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/management/BoundedRangeStatisticImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/BoundedRangeStatisticImpl.java index a36bbd456f..2d2d27f7bd 100755 --- a/activemq-core/src/main/java/org/activemq/management/BoundedRangeStatisticImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/BoundedRangeStatisticImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; /** diff --git a/activemq-core/src/main/java/org/activemq/management/CountStatisticImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/CountStatisticImpl.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/management/CountStatisticImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/CountStatisticImpl.java index 941b7f4c69..6888d884a8 100755 --- a/activemq-core/src/main/java/org/activemq/management/CountStatisticImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/CountStatisticImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; import javax.management.j2ee.statistics.CountStatistic; diff --git a/activemq-core/src/main/java/org/activemq/management/JCAConnectionPoolStatsImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionPoolStatsImpl.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/management/JCAConnectionPoolStatsImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionPoolStatsImpl.java index f8b4892742..57c093c8d4 100755 --- a/activemq-core/src/main/java/org/activemq/management/JCAConnectionPoolStatsImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionPoolStatsImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; /** diff --git a/activemq-core/src/main/java/org/activemq/management/JCAConnectionStatsImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionStatsImpl.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/management/JCAConnectionStatsImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionStatsImpl.java index 34c6ca0447..2233fb29be 100755 --- a/activemq-core/src/main/java/org/activemq/management/JCAConnectionStatsImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/JCAConnectionStatsImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; /** diff --git a/activemq-core/src/main/java/org/activemq/management/JCAStatsImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/JCAStatsImpl.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/management/JCAStatsImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/JCAStatsImpl.java index 4e2db83c1a..4591cf77f0 100755 --- a/activemq-core/src/main/java/org/activemq/management/JCAStatsImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/JCAStatsImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; /** diff --git a/activemq-core/src/main/java/org/activemq/management/JMSConnectionStatsImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/JMSConnectionStatsImpl.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/management/JMSConnectionStatsImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/JMSConnectionStatsImpl.java index b1c8e63e15..9c9a17596e 100755 --- a/activemq-core/src/main/java/org/activemq/management/JMSConnectionStatsImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/JMSConnectionStatsImpl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; -import org.activemq.ActiveMQSession; -import org.activemq.util.IndentPrinter; +import org.apache.activemq.ActiveMQSession; +import org.apache.activemq.util.IndentPrinter; import java.util.List; /** diff --git a/activemq-core/src/main/java/org/activemq/management/JMSConsumerStatsImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/management/JMSConsumerStatsImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java index 353c9ed966..76b2c1d59c 100755 --- a/activemq-core/src/main/java/org/activemq/management/JMSConsumerStatsImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; import javax.jms.Destination; -import org.activemq.util.IndentPrinter; +import org.apache.activemq.util.IndentPrinter; /** * Statistics for a JMS consumer diff --git a/activemq-core/src/main/java/org/activemq/management/JMSEndpointStatsImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/management/JMSEndpointStatsImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java index 508732aacc..c219dbed7d 100755 --- a/activemq-core/src/main/java/org/activemq/management/JMSEndpointStatsImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; import javax.jms.Destination; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; -import org.activemq.util.IndentPrinter; +import org.apache.activemq.util.IndentPrinter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/management/JMSProducerStatsImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/management/JMSProducerStatsImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java index cff42349b8..17a538f222 100755 --- a/activemq-core/src/main/java/org/activemq/management/JMSProducerStatsImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; import javax.jms.Destination; -import org.activemq.util.IndentPrinter; +import org.apache.activemq.util.IndentPrinter; /** * Statistics for a JMS producer diff --git a/activemq-core/src/main/java/org/activemq/management/JMSSessionStatsImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/JMSSessionStatsImpl.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/management/JMSSessionStatsImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/JMSSessionStatsImpl.java index 23993406db..2151b2b847 100755 --- a/activemq-core/src/main/java/org/activemq/management/JMSSessionStatsImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/JMSSessionStatsImpl.java @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; import java.util.List; import javax.management.j2ee.statistics.*; -import org.activemq.ActiveMQMessageConsumer; -import org.activemq.ActiveMQMessageProducer; -import org.activemq.util.IndentPrinter; + +import org.apache.activemq.ActiveMQMessageConsumer; +import org.apache.activemq.ActiveMQMessageProducer; +import org.apache.activemq.util.IndentPrinter; /** * Statistics for a JMS session diff --git a/activemq-core/src/main/java/org/activemq/management/JMSStatsImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/JMSStatsImpl.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/management/JMSStatsImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/JMSStatsImpl.java index 147169aace..31b80bf137 100755 --- a/activemq-core/src/main/java/org/activemq/management/JMSStatsImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/JMSStatsImpl.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; import java.util.List; -import org.activemq.ActiveMQConnection; -import org.activemq.util.IndentPrinter; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.util.IndentPrinter; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; diff --git a/activemq-core/src/main/java/org/activemq/management/PollCountStatisticImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/PollCountStatisticImpl.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/management/PollCountStatisticImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/PollCountStatisticImpl.java index f90442b43c..9f8b498eba 100755 --- a/activemq-core/src/main/java/org/activemq/management/PollCountStatisticImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/PollCountStatisticImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; import java.util.ArrayList; import java.util.Iterator; diff --git a/activemq-core/src/main/java/org/activemq/management/RangeStatisticImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/RangeStatisticImpl.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/management/RangeStatisticImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/RangeStatisticImpl.java index a02ac0d343..ad6b5c814a 100755 --- a/activemq-core/src/main/java/org/activemq/management/RangeStatisticImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/RangeStatisticImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; /** diff --git a/activemq-core/src/main/java/org/activemq/management/Resettable.java b/activemq-core/src/main/java/org/apache/activemq/management/Resettable.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/management/Resettable.java rename to activemq-core/src/main/java/org/apache/activemq/management/Resettable.java index d9362061dd..a63f7edd64 100755 --- a/activemq-core/src/main/java/org/activemq/management/Resettable.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/Resettable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; /** * Represents some statistic that is capable of being reset diff --git a/activemq-core/src/main/java/org/activemq/management/StatisticImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/StatisticImpl.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/management/StatisticImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/StatisticImpl.java index 91c13c3ada..5426c4d210 100755 --- a/activemq-core/src/main/java/org/activemq/management/StatisticImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/StatisticImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; import javax.management.j2ee.statistics.Statistic; /** diff --git a/activemq-core/src/main/java/org/activemq/management/StatsCapable.java b/activemq-core/src/main/java/org/apache/activemq/management/StatsCapable.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/management/StatsCapable.java rename to activemq-core/src/main/java/org/apache/activemq/management/StatsCapable.java index a8d6d6926b..cf044c3860 100755 --- a/activemq-core/src/main/java/org/activemq/management/StatsCapable.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/StatsCapable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; /** diff --git a/activemq-core/src/main/java/org/activemq/management/StatsImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/StatsImpl.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/management/StatsImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/StatsImpl.java index 21f8e1bfcc..43ad5964da 100755 --- a/activemq-core/src/main/java/org/activemq/management/StatsImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/StatsImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; import java.util.*; import javax.management.j2ee.statistics.Statistic; diff --git a/activemq-core/src/main/java/org/activemq/management/TimeStatisticImpl.java b/activemq-core/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/management/TimeStatisticImpl.java rename to activemq-core/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java index 742e485530..2f4e04e690 100755 --- a/activemq-core/src/main/java/org/activemq/management/TimeStatisticImpl.java +++ b/activemq-core/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; /** diff --git a/activemq-core/src/main/java/org/activemq/management/package.html b/activemq-core/src/main/java/org/apache/activemq/management/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/management/package.html rename to activemq-core/src/main/java/org/apache/activemq/management/package.html diff --git a/activemq-core/src/main/java/org/activemq/memory/Cache.java b/activemq-core/src/main/java/org/apache/activemq/memory/Cache.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/memory/Cache.java rename to activemq-core/src/main/java/org/apache/activemq/memory/Cache.java index c7e3db3114..a851fd34b0 100755 --- a/activemq-core/src/main/java/org/activemq/memory/Cache.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/Cache.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory; +package org.apache.activemq.memory; /** diff --git a/activemq-core/src/main/java/org/activemq/memory/CacheEntry.java b/activemq-core/src/main/java/org/apache/activemq/memory/CacheEntry.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/memory/CacheEntry.java rename to activemq-core/src/main/java/org/apache/activemq/memory/CacheEntry.java index 12f5585637..165a8050d1 100755 --- a/activemq-core/src/main/java/org/activemq/memory/CacheEntry.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/CacheEntry.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory; +package org.apache.activemq.memory; public class CacheEntry { diff --git a/activemq-core/src/main/java/org/activemq/memory/CacheEntryList.java b/activemq-core/src/main/java/org/apache/activemq/memory/CacheEntryList.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/memory/CacheEntryList.java rename to activemq-core/src/main/java/org/apache/activemq/memory/CacheEntryList.java index f65e5bc561..83dc6b6fcb 100755 --- a/activemq-core/src/main/java/org/activemq/memory/CacheEntryList.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/CacheEntryList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory; +package org.apache.activemq.memory; /** * Maintains a simple linked list of CacheEntry objects. It is thread safe. diff --git a/activemq-core/src/main/java/org/activemq/memory/CacheEvictionUsageListener.java b/activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictionUsageListener.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/memory/CacheEvictionUsageListener.java rename to activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictionUsageListener.java index 5d7baff72c..aa5d27057a 100755 --- a/activemq-core/src/main/java/org/activemq/memory/CacheEvictionUsageListener.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictionUsageListener.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory; +package org.apache.activemq.memory; import java.util.Iterator; import java.util.LinkedList; -import org.activemq.thread.Task; -import org.activemq.thread.TaskRunner; -import org.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.thread.Task; +import org.apache.activemq.thread.TaskRunner; +import org.apache.activemq.thread.TaskRunnerFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/memory/CacheEvictor.java b/activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictor.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/memory/CacheEvictor.java rename to activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictor.java index 375d34029e..60fec8317e 100755 --- a/activemq-core/src/main/java/org/activemq/memory/CacheEvictor.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory; +package org.apache.activemq.memory; public interface CacheEvictor { diff --git a/activemq-core/src/main/java/org/activemq/memory/CacheFilter.java b/activemq-core/src/main/java/org/apache/activemq/memory/CacheFilter.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/memory/CacheFilter.java rename to activemq-core/src/main/java/org/apache/activemq/memory/CacheFilter.java index c268f0bcc5..9556ae02dd 100755 --- a/activemq-core/src/main/java/org/activemq/memory/CacheFilter.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/CacheFilter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory; +package org.apache.activemq.memory; /** diff --git a/activemq-core/src/main/java/org/activemq/memory/LRUMap.java b/activemq-core/src/main/java/org/apache/activemq/memory/LRUMap.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/memory/LRUMap.java rename to activemq-core/src/main/java/org/apache/activemq/memory/LRUMap.java index eadd7ace8c..14b4b4c66a 100755 --- a/activemq-core/src/main/java/org/activemq/memory/LRUMap.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/LRUMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory; +package org.apache.activemq.memory; import java.util.LinkedHashMap; import java.util.Map; diff --git a/activemq-core/src/main/java/org/activemq/memory/MapCache.java b/activemq-core/src/main/java/org/apache/activemq/memory/MapCache.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/memory/MapCache.java rename to activemq-core/src/main/java/org/apache/activemq/memory/MapCache.java index 56db054060..6ebbf617a7 100755 --- a/activemq-core/src/main/java/org/activemq/memory/MapCache.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/MapCache.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory; +package org.apache.activemq.memory; import java.util.Map; diff --git a/activemq-core/src/main/java/org/activemq/memory/UsageListener.java b/activemq-core/src/main/java/org/apache/activemq/memory/UsageListener.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/memory/UsageListener.java rename to activemq-core/src/main/java/org/apache/activemq/memory/UsageListener.java index 707d468fa9..3e8c7dd335 100755 --- a/activemq-core/src/main/java/org/activemq/memory/UsageListener.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/UsageListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory; +package org.apache.activemq.memory; public interface UsageListener { public void onMemoryUseChanged( UsageManager memoryManager, int oldPercentUsage, int newPercentUsage ); diff --git a/activemq-core/src/main/java/org/activemq/memory/UsageManager.java b/activemq-core/src/main/java/org/apache/activemq/memory/UsageManager.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/memory/UsageManager.java rename to activemq-core/src/main/java/org/apache/activemq/memory/UsageManager.java index 5d6a018c84..2f945b30b2 100755 --- a/activemq-core/src/main/java/org/activemq/memory/UsageManager.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/UsageManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory; +package org.apache.activemq.memory; import java.util.Iterator; diff --git a/activemq-core/src/main/java/org/activemq/memory/UsageManagerCacheFilter.java b/activemq-core/src/main/java/org/apache/activemq/memory/UsageManagerCacheFilter.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/memory/UsageManagerCacheFilter.java rename to activemq-core/src/main/java/org/apache/activemq/memory/UsageManagerCacheFilter.java index c20a1c49cb..e9e81ec1da 100755 --- a/activemq-core/src/main/java/org/activemq/memory/UsageManagerCacheFilter.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/UsageManagerCacheFilter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory; +package org.apache.activemq.memory; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong; diff --git a/activemq-core/src/main/java/org/activemq/memory/buffer/MessageBuffer.java b/activemq-core/src/main/java/org/apache/activemq/memory/buffer/MessageBuffer.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/memory/buffer/MessageBuffer.java rename to activemq-core/src/main/java/org/apache/activemq/memory/buffer/MessageBuffer.java index 40b7bc84f9..c7288205d5 100644 --- a/activemq-core/src/main/java/org/activemq/memory/buffer/MessageBuffer.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/buffer/MessageBuffer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.memory.buffer; +package org.apache.activemq.memory.buffer; /** * Represents a collection of MessageQueue instances which are all bound by the diff --git a/activemq-core/src/main/java/org/activemq/memory/buffer/MessageQueue.java b/activemq-core/src/main/java/org/apache/activemq/memory/buffer/MessageQueue.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/memory/buffer/MessageQueue.java rename to activemq-core/src/main/java/org/apache/activemq/memory/buffer/MessageQueue.java index ef94011b6a..5a8d152841 100644 --- a/activemq-core/src/main/java/org/activemq/memory/buffer/MessageQueue.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/buffer/MessageQueue.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory.buffer; +package org.apache.activemq.memory.buffer; -import org.activemq.broker.region.MessageReference; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.Message; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.Message; import java.util.ArrayList; import java.util.Iterator; diff --git a/activemq-core/src/main/java/org/activemq/memory/buffer/OrderBasedMessageBuffer.java b/activemq-core/src/main/java/org/apache/activemq/memory/buffer/OrderBasedMessageBuffer.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/memory/buffer/OrderBasedMessageBuffer.java rename to activemq-core/src/main/java/org/apache/activemq/memory/buffer/OrderBasedMessageBuffer.java index f1f99b313f..1839d73d81 100644 --- a/activemq-core/src/main/java/org/activemq/memory/buffer/OrderBasedMessageBuffer.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/buffer/OrderBasedMessageBuffer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory.buffer; +package org.apache.activemq.memory.buffer; import java.util.Iterator; import java.util.LinkedList; diff --git a/activemq-core/src/main/java/org/activemq/memory/buffer/SizeBasedMessageBuffer.java b/activemq-core/src/main/java/org/apache/activemq/memory/buffer/SizeBasedMessageBuffer.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/memory/buffer/SizeBasedMessageBuffer.java rename to activemq-core/src/main/java/org/apache/activemq/memory/buffer/SizeBasedMessageBuffer.java index 2e91d7bd5a..e0561bf675 100644 --- a/activemq-core/src/main/java/org/activemq/memory/buffer/SizeBasedMessageBuffer.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/buffer/SizeBasedMessageBuffer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory.buffer; +package org.apache.activemq.memory.buffer; import java.util.ArrayList; import java.util.Iterator; diff --git a/activemq-core/src/main/java/org/activemq/memory/list/DestinationBasedMessageList.java b/activemq-core/src/main/java/org/apache/activemq/memory/list/DestinationBasedMessageList.java similarity index 84% rename from activemq-core/src/main/java/org/activemq/memory/list/DestinationBasedMessageList.java rename to activemq-core/src/main/java/org/apache/activemq/memory/list/DestinationBasedMessageList.java index d76f5aac02..1bc0f91f42 100644 --- a/activemq-core/src/main/java/org/activemq/memory/list/DestinationBasedMessageList.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/list/DestinationBasedMessageList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory.list; +package org.apache.activemq.memory.list; import java.util.ArrayList; import java.util.HashMap; @@ -23,14 +23,14 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.activemq.broker.region.MessageReference; -import org.activemq.broker.region.Subscription; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQMessage; -import org.activemq.filter.DestinationMap; -import org.activemq.memory.buffer.MessageBuffer; -import org.activemq.memory.buffer.MessageQueue; -import org.activemq.memory.buffer.OrderBasedMessageBuffer; +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.ActiveMQMessage; +import org.apache.activemq.filter.DestinationMap; +import org.apache.activemq.memory.buffer.MessageBuffer; +import org.apache.activemq.memory.buffer.MessageQueue; +import org.apache.activemq.memory.buffer.OrderBasedMessageBuffer; /** * An implementation of {@link MessageList} which maintains a separate message diff --git a/activemq-core/src/main/java/org/activemq/memory/list/MessageList.java b/activemq-core/src/main/java/org/apache/activemq/memory/list/MessageList.java similarity index 86% rename from activemq-core/src/main/java/org/activemq/memory/list/MessageList.java rename to activemq-core/src/main/java/org/apache/activemq/memory/list/MessageList.java index 57004c37ee..484e422296 100644 --- a/activemq-core/src/main/java/org/activemq/memory/list/MessageList.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/list/MessageList.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory.list; +package org.apache.activemq.memory.list; -import org.activemq.broker.region.MessageReference; -import org.activemq.broker.region.Subscription; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.broker.region.Subscription; import java.util.List; diff --git a/activemq-core/src/main/java/org/activemq/memory/list/SimpleMessageList.java b/activemq-core/src/main/java/org/apache/activemq/memory/list/SimpleMessageList.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/memory/list/SimpleMessageList.java rename to activemq-core/src/main/java/org/apache/activemq/memory/list/SimpleMessageList.java index 52b1d18d1e..2bc7b72455 100644 --- a/activemq-core/src/main/java/org/activemq/memory/list/SimpleMessageList.java +++ b/activemq-core/src/main/java/org/apache/activemq/memory/list/SimpleMessageList.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory.list; +package org.apache.activemq.memory.list; -import org.activemq.broker.region.MessageReference; -import org.activemq.broker.region.Subscription; +import org.apache.activemq.broker.region.MessageReference; +import org.apache.activemq.broker.region.Subscription; import java.util.ArrayList; import java.util.LinkedList; diff --git a/activemq-core/src/main/java/org/activemq/network/Bridge.java b/activemq-core/src/main/java/org/apache/activemq/network/Bridge.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/network/Bridge.java rename to activemq-core/src/main/java/org/apache/activemq/network/Bridge.java index e8c8347107..b46113afdf 100644 --- a/activemq-core/src/main/java/org/activemq/network/Bridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/Bridge.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network; +package org.apache.activemq.network; -import org.activemq.Service; +import org.apache.activemq.Service; /** diff --git a/activemq-core/src/main/java/org/activemq/network/DemandForwardingBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/network/DemandForwardingBridge.java rename to activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java index 116ac81e7f..19b62ce19d 100755 --- a/activemq-core/src/main/java/org/activemq/network/DemandForwardingBridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java @@ -14,39 +14,39 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network; +package org.apache.activemq.network; import java.io.IOException; import javax.jms.JMSException; -import org.activemq.advisory.AdvisorySupport; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.BrokerId; -import org.activemq.command.BrokerInfo; -import org.activemq.command.Command; -import org.activemq.command.CommandTypes; -import org.activemq.command.ConnectionId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerId; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.DataStructure; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageDispatch; -import org.activemq.command.ProducerInfo; -import org.activemq.command.RemoveInfo; -import org.activemq.command.SessionInfo; -import org.activemq.command.ShutdownInfo; -import org.activemq.filter.BooleanExpression; -import org.activemq.filter.MessageEvaluationContext; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportListener; -import org.activemq.util.IdGenerator; -import org.activemq.util.JMSExceptionSupport; -import org.activemq.util.LongSequenceGenerator; -import org.activemq.util.ServiceStopper; -import org.activemq.util.ServiceSupport; +import org.apache.activemq.advisory.AdvisorySupport; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.BrokerId; +import org.apache.activemq.command.BrokerInfo; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.CommandTypes; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.DataStructure; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.RemoveInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.command.ShutdownInfo; +import org.apache.activemq.filter.BooleanExpression; +import org.apache.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportListener; +import org.apache.activemq.util.IdGenerator; +import org.apache.activemq.util.JMSExceptionSupport; +import org.apache.activemq.util.LongSequenceGenerator; +import org.apache.activemq.util.ServiceStopper; +import org.apache.activemq.util.ServiceSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/network/ForwardingBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/network/ForwardingBridge.java rename to activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java index ee2009dc65..bfd085a4cc 100755 --- a/activemq-core/src/main/java/org/activemq/network/ForwardingBridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java @@ -14,29 +14,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network; +package org.apache.activemq.network; import java.io.IOException; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.BrokerId; -import org.activemq.command.BrokerInfo; -import org.activemq.command.Command; -import org.activemq.command.ConnectionId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageDispatch; -import org.activemq.command.ProducerInfo; -import org.activemq.command.SessionInfo; -import org.activemq.command.ShutdownInfo; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportListener; -import org.activemq.util.IdGenerator; -import org.activemq.util.ServiceStopper; -import org.activemq.util.ServiceSupport; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.BrokerId; +import org.apache.activemq.command.BrokerInfo; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.command.ShutdownInfo; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportListener; +import org.apache.activemq.util.IdGenerator; +import org.apache.activemq.util.ServiceStopper; +import org.apache.activemq.util.ServiceSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/network/NetworkConnector.java b/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/network/NetworkConnector.java rename to activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java index f57b42d5ec..ca868e4034 100644 --- a/activemq-core/src/main/java/org/activemq/network/NetworkConnector.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network; +package org.apache.activemq.network; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import org.activemq.Service; -import org.activemq.command.DiscoveryEvent; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.discovery.DiscoveryAgent; -import org.activemq.transport.discovery.DiscoveryAgentFactory; -import org.activemq.transport.discovery.DiscoveryListener; -import org.activemq.util.ServiceSupport; +import org.apache.activemq.Service; +import org.apache.activemq.command.DiscoveryEvent; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.discovery.DiscoveryAgent; +import org.apache.activemq.transport.discovery.DiscoveryAgentFactory; +import org.apache.activemq.transport.discovery.DiscoveryListener; +import org.apache.activemq.util.ServiceSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/network/jms/DestinationBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/network/jms/DestinationBridge.java rename to activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java index 6ff5396695..b14633c8ed 100755 --- a/activemq-core/src/main/java/org/activemq/network/jms/DestinationBridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; import javax.jms.Destination; import javax.jms.JMSException; @@ -22,7 +22,8 @@ import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.MessageListener; import javax.jms.MessageProducer; -import org.activemq.Service; + +import org.apache.activemq.Service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; diff --git a/activemq-core/src/main/java/org/activemq/network/jms/InboundQueueBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/network/jms/InboundQueueBridge.java rename to activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java index e330a95fcd..bf9470ace5 100755 --- a/activemq-core/src/main/java/org/activemq/network/jms/InboundQueueBridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; /** diff --git a/activemq-core/src/main/java/org/activemq/network/jms/InboundTopicBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/network/jms/InboundTopicBridge.java rename to activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java index ab44cd8851..0eada1f701 100755 --- a/activemq-core/src/main/java/org/activemq/network/jms/InboundTopicBridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; /** diff --git a/activemq-core/src/main/java/org/activemq/network/jms/JmsConnector.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/network/jms/JmsConnector.java rename to activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java index 6756e6d817..9ed50af836 100755 --- a/activemq-core/src/main/java/org/activemq/network/jms/JmsConnector.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; import java.util.Iterator; import java.util.List; import java.util.Map; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.Service; -import org.activemq.broker.BrokerService; -import org.activemq.util.LRUCache; + +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.Service; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.util.LRUCache; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.jndi.JndiTemplate; diff --git a/activemq-core/src/main/java/org/activemq/network/jms/JmsMesageConvertor.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/network/jms/JmsMesageConvertor.java rename to activemq-core/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java index 70364fea50..2e881cadb4 100755 --- a/activemq-core/src/main/java/org/activemq/network/jms/JmsMesageConvertor.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; import javax.jms.JMSException; import javax.jms.Message; diff --git a/activemq-core/src/main/java/org/activemq/network/jms/JmsQueueConnector.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/network/jms/JmsQueueConnector.java rename to activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java index ef7c67d1b9..e3bc9381e5 100755 --- a/activemq-core/src/main/java/org/activemq/network/jms/JmsQueueConnector.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/network/jms/JmsTopicConnector.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/network/jms/JmsTopicConnector.java rename to activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java index c2b76035d3..a812ff4b63 100755 --- a/activemq-core/src/main/java/org/activemq/network/jms/JmsTopicConnector.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; import javax.jms.Destination; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/network/jms/OutboundQueueBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/network/jms/OutboundQueueBridge.java rename to activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java index e25bdf8a16..d4d6e692be 100755 --- a/activemq-core/src/main/java/org/activemq/network/jms/OutboundQueueBridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; /** diff --git a/activemq-core/src/main/java/org/activemq/network/jms/OutboundTopicBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/network/jms/OutboundTopicBridge.java rename to activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java index 290654009d..24bff6ae5a 100755 --- a/activemq-core/src/main/java/org/activemq/network/jms/OutboundTopicBridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; /** diff --git a/activemq-core/src/main/java/org/activemq/network/jms/QueueBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/QueueBridge.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/network/jms/QueueBridge.java rename to activemq-core/src/main/java/org/apache/activemq/network/jms/QueueBridge.java index aa9581bdbe..d33831d8fc 100755 --- a/activemq-core/src/main/java/org/activemq/network/jms/QueueBridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/QueueBridge.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; import javax.jms.Destination; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/network/jms/SimpleJmsMessageConvertor.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/network/jms/SimpleJmsMessageConvertor.java rename to activemq-core/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java index dde0b8e9f2..89e0e08126 100755 --- a/activemq-core/src/main/java/org/activemq/network/jms/SimpleJmsMessageConvertor.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; import javax.jms.JMSException; import javax.jms.Message; diff --git a/activemq-core/src/main/java/org/activemq/network/jms/TopicBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/TopicBridge.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/network/jms/TopicBridge.java rename to activemq-core/src/main/java/org/apache/activemq/network/jms/TopicBridge.java index 34ef958c0a..98ecb3dcff 100755 --- a/activemq-core/src/main/java/org/activemq/network/jms/TopicBridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/TopicBridge.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; import javax.jms.Destination; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/network/jms/package.html b/activemq-core/src/main/java/org/apache/activemq/network/jms/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/network/jms/package.html rename to activemq-core/src/main/java/org/apache/activemq/network/jms/package.html diff --git a/activemq-core/src/main/java/org/activemq/network/package.html b/activemq-core/src/main/java/org/apache/activemq/network/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/network/package.html rename to activemq-core/src/main/java/org/apache/activemq/network/package.html diff --git a/activemq-core/src/main/java/org/activemq/openwire/BooleanStream.java b/activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/openwire/BooleanStream.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java index 09da45697b..14f0d93783 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/BooleanStream.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire; +package org.apache.activemq.openwire; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/activemq-core/src/main/java/org/activemq/openwire/DataStreamMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/openwire/DataStreamMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java index 2924039fd4..7270f09807 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/DataStreamMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire; +package org.apache.activemq.openwire; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -22,7 +22,7 @@ import java.io.IOException; import java.lang.reflect.Constructor; import org.activeio.command.ClassLoading; -import org.activemq.command.DataStructure; +import org.apache.activemq.command.DataStructure; abstract public class DataStreamMarshaller { diff --git a/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormat.java b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/openwire/OpenWireFormat.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java index ac7d8214c2..255e865f37 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormat.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire; +package org.apache.activemq.openwire; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -29,9 +29,9 @@ import org.activeio.adapter.PacketToInputStream; import org.activeio.command.ClassLoading; import org.activeio.command.WireFormat; import org.activeio.packet.ByteArrayPacket; -import org.activemq.command.CommandTypes; -import org.activemq.command.DataStructure; -import org.activemq.command.MarshallAware; +import org.apache.activemq.command.CommandTypes; +import org.apache.activemq.command.DataStructure; +import org.apache.activemq.command.MarshallAware; /** * @@ -186,7 +186,7 @@ final public class OpenWireFormat implements WireFormat { * @param version */ public void setVersion(int version) { - String mfName = "org.activemq.openwire.v"+version+".MarshallerFactory"; + String mfName = "org.apache.activemq.openwire.v"+version+".MarshallerFactory"; Class mfClass; try { mfClass = ClassLoading.loadClass(mfName, getClass().getClassLoader()); diff --git a/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormatFactory.java b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/openwire/OpenWireFormatFactory.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java index 868fbabfd4..c28bdac5bd 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormatFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire; +package org.apache.activemq.openwire; import org.activeio.command.WireFormat; import org.activeio.command.WireFormatFactory; diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java index bd9df3b5e0..5f372f2053 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQDestinationMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQDestinationMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java index 77c10249ea..cb5360528a 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQDestinationMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public abstract class ActiveMQDestinationMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public abstract class ActiveMQDestinationMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Un-marshal an object instance from the data input stream diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java index c5d6084300..2b1b9d183d 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMessageMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java index 96c62a630f..4454345aee 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java index 1501b6a8b9..932da55186 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQQueueMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQQueueMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java index a2fbc8b52b..574d558bd5 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQQueueMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java index b01374ef2a..80dcb13720 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java index 3e2a7de7ee..4e93b9c460 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java index c3e81e51be..001fb7ed76 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java index 2c4096d894..397a651a63 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java index 20b6542328..a0fcc35897 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTopicMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTopicMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java index 1421f95642..a409e2f3dd 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTopicMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/BaseCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/openwire/v1/BaseCommandMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java index abafb50f5a..f46ec12d10 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/BaseCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public abstract class BaseCommandMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public abstract class BaseCommandMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Un-marshal an object instance from the data input stream diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/BrokerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/openwire/v1/BrokerIdMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java index 445d86f142..99a9a98337 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/BrokerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class BrokerIdMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class BrokerIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/BrokerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java similarity index 86% rename from activemq-core/src/main/java/org/activemq/openwire/v1/BrokerInfoMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java index 42bfff774c..f88d73e204 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/BrokerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -63,21 +63,21 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { super.unmarshal(wireFormat, o, dataIn, bs); BrokerInfo info = (BrokerInfo)o; - info.setBrokerId((org.activemq.command.BrokerId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setBrokerId((org.apache.activemq.command.BrokerId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setBrokerURL(readString(dataIn, bs)); if( bs.readBoolean() ) { short size = dataIn.readShort(); - org.activemq.command.BrokerInfo value[] = new org.activemq.command.BrokerInfo[size]; + org.apache.activemq.command.BrokerInfo value[] = new org.apache.activemq.command.BrokerInfo[size]; for( int i=0; i < size; i++ ) { - value[i] = (org.activemq.command.BrokerInfo)unmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerInfo)unmarsalNestedObject(wireFormat,dataIn, bs); } info.setPeerBrokerInfos(value); } else { info.setPeerBrokerInfos(null); } - info.setRedeliveryPolicy((org.activemq.command.RedeliveryPolicy) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setRedeliveryPolicy((org.apache.activemq.command.RedeliveryPolicy) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setBrokerName(readString(dataIn, bs)); } diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionIdMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java index e3ed6a4a2e..1a6f040e3f 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class ConnectionIdMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class ConnectionIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionInfoMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java index f05b9c5fb6..954525b927 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -63,16 +63,16 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { super.unmarshal(wireFormat, o, dataIn, bs); ConnectionInfo info = (ConnectionInfo)o; - info.setConnectionId((org.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setClientId(readString(dataIn, bs)); info.setPassword(readString(dataIn, bs)); info.setUserName(readString(dataIn, bs)); if( bs.readBoolean() ) { short size = dataIn.readShort(); - org.activemq.command.BrokerId value[] = new org.activemq.command.BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (org.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } else { diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerIdMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java index 61df92888d..5cf6057e47 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class ConsumerIdMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class ConsumerIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerInfoMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java index 2c300cb1b3..f2ecc01030 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -63,9 +63,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { super.unmarshal(wireFormat, o, dataIn, bs); ConsumerInfo info = (ConsumerInfo)o; - info.setConsumerId((org.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setBrowser(bs.readBoolean()); - info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setPrefetchSize(dataIn.readInt()); info.setDispatchAsync(bs.readBoolean()); info.setSelector(readString(dataIn, bs)); @@ -77,9 +77,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { if( bs.readBoolean() ) { short size = dataIn.readShort(); - org.activemq.command.BrokerId value[] = new org.activemq.command.BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (org.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } else { diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ControlCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ControlCommandMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java index ee9d391135..0033337741 100644 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ControlCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/DataArrayResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/openwire/v1/DataArrayResponseMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java index f544debd74..4b74f5f45f 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/DataArrayResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -66,9 +66,9 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { if( bs.readBoolean() ) { short size = dataIn.readShort(); - org.activemq.command.DataStructure value[] = new org.activemq.command.DataStructure[size]; + org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size]; for( int i=0; i < size; i++ ) { - value[i] = (org.activemq.command.DataStructure)unmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.DataStructure)unmarsalNestedObject(wireFormat,dataIn, bs); } info.setData(value); } else { diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/DataResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/openwire/v1/DataResponseMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java index 0f19cf6961..59956ad41c 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/DataResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -63,7 +63,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { super.unmarshal(wireFormat, o, dataIn, bs); DataResponse info = (DataResponse)o; - info.setData((org.activemq.command.DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setData((org.apache.activemq.command.DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs)); } diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/DestinationInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java similarity index 86% rename from activemq-core/src/main/java/org/activemq/openwire/v1/DestinationInfoMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java index 8e3764c349..a677638ffc 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/DestinationInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -63,16 +63,16 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { super.unmarshal(wireFormat, o, dataIn, bs); DestinationInfo info = (DestinationInfo)o; - info.setConnectionId((org.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setOperationType(dataIn.readByte()); info.setTimeout(unmarshalLong(wireFormat, dataIn, bs)); if( bs.readBoolean() ) { short size = dataIn.readShort(); - org.activemq.command.BrokerId value[] = new org.activemq.command.BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (org.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } else { diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ExceptionResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ExceptionResponseMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java index 3885e14863..f415ac9328 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ExceptionResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/FlushCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/FlushCommandMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java index 88c3b2ac3b..8558b383ec 100644 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/FlushCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/IntegerResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/openwire/v1/IntegerResponseMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java index e0fbb641d2..f1edb40583 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/IntegerResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalQueueAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java similarity index 86% rename from activemq-core/src/main/java/org/activemq/openwire/v1/JournalQueueAckMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java index dda6ad06b9..352e61a32a 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalQueueAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class JournalQueueAckMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class JournalQueueAckMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal @@ -63,8 +63,8 @@ public class JournalQueueAckMarshaller extends org.activemq.openwire.DataStreamM super.unmarshal(wireFormat, o, dataIn, bs); JournalQueueAck info = (JournalQueueAck)o; - info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs)); - info.setMessageAck((org.activemq.command.MessageAck) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setMessageAck((org.apache.activemq.command.MessageAck) unmarsalNestedObject(wireFormat, dataIn, bs)); } diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTopicAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java similarity index 86% rename from activemq-core/src/main/java/org/activemq/openwire/v1/JournalTopicAckMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java index 116e8d1c1b..b374bab0c1 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTopicAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class JournalTopicAckMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class JournalTopicAckMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal @@ -63,12 +63,12 @@ public class JournalTopicAckMarshaller extends org.activemq.openwire.DataStreamM super.unmarshal(wireFormat, o, dataIn, bs); JournalTopicAck info = (JournalTopicAck)o; - info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs)); - info.setMessageId((org.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setMessageSequenceId(unmarshalLong(wireFormat, dataIn, bs)); info.setSubscritionName(readString(dataIn, bs)); info.setClientId(readString(dataIn, bs)); - info.setTransactionId((org.activemq.command.TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs)); } diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTraceMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/openwire/v1/JournalTraceMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java index 9f76c3b2ee..8a3287f6e4 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTraceMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class JournalTraceMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class JournalTraceMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTransactionMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/openwire/v1/JournalTransactionMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java index 1c224910ab..e092d04721 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTransactionMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class JournalTransactionMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class JournalTransactionMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal @@ -63,7 +63,7 @@ public class JournalTransactionMarshaller extends org.activemq.openwire.DataStre super.unmarshal(wireFormat, o, dataIn, bs); JournalTransaction info = (JournalTransaction)o; - info.setTransactionId((org.activemq.command.TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setType(dataIn.readByte()); info.setWasPrepared(bs.readBoolean()); diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/KeepAliveInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/openwire/v1/KeepAliveInfoMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java index 4022a2b64d..83a8560570 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/KeepAliveInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class KeepAliveInfoMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class KeepAliveInfoMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/LocalTransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/openwire/v1/LocalTransactionIdMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java index b71c798560..79d6e0730d 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/LocalTransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -64,7 +64,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { LocalTransactionId info = (LocalTransactionId)o; info.setTransactionId(unmarshalLong(wireFormat, dataIn, bs)); - info.setConnectionId((org.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); } diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/MarshallerFactory.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/MarshallerFactory.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java index e74a8643a9..edc9cdb091 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/MarshallerFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; -import org.activemq.openwire.DataStreamMarshaller; -import org.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.DataStreamMarshaller; +import org.apache.activemq.openwire.OpenWireFormat; /** * MarshallerFactory for Open Wire Format. diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java similarity index 83% rename from activemq-core/src/main/java/org/activemq/openwire/v1/MessageAckMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java index 08cecad9b7..793dafa49c 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -63,12 +63,12 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { super.unmarshal(wireFormat, o, dataIn, bs); MessageAck info = (MessageAck)o; - info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); - info.setTransactionId((org.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs)); - info.setConsumerId((org.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setAckType(dataIn.readByte()); - info.setFirstMessageId((org.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs)); - info.setLastMessageId((org.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setFirstMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setLastMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setMessageCount(dataIn.readInt()); } diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageDispatchMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java similarity index 87% rename from activemq-core/src/main/java/org/activemq/openwire/v1/MessageDispatchMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java index 89d3674e34..f599aef49c 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageDispatchMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -63,9 +63,9 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { super.unmarshal(wireFormat, o, dataIn, bs); MessageDispatch info = (MessageDispatch)o; - info.setConsumerId((org.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); - info.setMessage((org.activemq.command.Message) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setMessage((org.apache.activemq.command.Message) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setRedeliveryCounter(dataIn.readInt()); } diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/openwire/v1/MessageIdMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java index 7a3c9d3467..a1771b7fbd 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class MessageIdMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class MessageIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal @@ -63,7 +63,7 @@ public class MessageIdMarshaller extends org.activemq.openwire.DataStreamMarshal super.unmarshal(wireFormat, o, dataIn, bs); MessageId info = (MessageId)o; - info.setProducerId((org.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setProducerId((org.apache.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setProducerSequenceId(unmarshalLong(wireFormat, dataIn, bs)); info.setBrokerSequenceId(unmarshalLong(wireFormat, dataIn, bs)); diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java similarity index 84% rename from activemq-core/src/main/java/org/activemq/openwire/v1/MessageMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java index acdb90fef5..1d29b6b868 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -51,19 +51,19 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { info.beforeUnmarshall(wireFormat); - info.setProducerId((org.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); - info.setTransactionId((org.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs)); - info.setOriginalDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); - info.setMessageId((org.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs)); - info.setOriginalTransactionId((org.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setProducerId((org.apache.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setOriginalTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setGroupID(readString(dataIn, bs)); info.setGroupSequence(dataIn.readInt()); info.setCorrelationId(readString(dataIn, bs)); info.setPersistent(bs.readBoolean()); info.setExpiration(unmarshalLong(wireFormat, dataIn, bs)); info.setPriority(dataIn.readByte()); - info.setReplyTo((org.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setReplyTo((org.apache.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setTimestamp(unmarshalLong(wireFormat, dataIn, bs)); info.setType(readString(dataIn, bs)); @@ -86,16 +86,16 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { info.setMarshalledProperties(null); } - info.setDataStructure((org.activemq.command.DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs)); - info.setTargetConsumerId((org.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDataStructure((org.apache.activemq.command.DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs)); + info.setTargetConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setCompressed(bs.readBoolean()); info.setRedeliveryCounter(dataIn.readInt()); if( bs.readBoolean() ) { short size = dataIn.readShort(); - org.activemq.command.BrokerId value[] = new org.activemq.command.BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (org.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } else { diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ProducerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ProducerIdMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java index 6babda3bb6..7713bd1837 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ProducerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class ProducerIdMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class ProducerIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ProducerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java similarity index 85% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ProducerInfoMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java index bf5a25e4e1..6dadb78f31 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ProducerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -63,14 +63,14 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { super.unmarshal(wireFormat, o, dataIn, bs); ProducerInfo info = (ProducerInfo)o; - info.setProducerId((org.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setProducerId((org.apache.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); if( bs.readBoolean() ) { short size = dataIn.readShort(); - org.activemq.command.BrokerId value[] = new org.activemq.command.BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (org.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } else { diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/RedeliveryPolicyMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RedeliveryPolicyMarshaller.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/openwire/v1/RedeliveryPolicyMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/RedeliveryPolicyMarshaller.java index 5d98ce1210..9a8e0827e5 100644 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/RedeliveryPolicyMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RedeliveryPolicyMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class RedeliveryPolicyMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class RedeliveryPolicyMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/RemoveInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/openwire/v1/RemoveInfoMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java index c601435442..08f75d241b 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/RemoveInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -63,7 +63,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { super.unmarshal(wireFormat, o, dataIn, bs); RemoveInfo info = (RemoveInfo)o; - info.setObjectId((org.activemq.command.DataStructure) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setObjectId((org.apache.activemq.command.DataStructure) unmarsalCachedObject(wireFormat, dataIn, bs)); } diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java index 7a2bdc49c6..842924b768 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -63,7 +63,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { super.unmarshal(wireFormat, o, dataIn, bs); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; - info.setConnectionId((org.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setSubcriptionName(readString(dataIn, bs)); info.setClientId(readString(dataIn, bs)); diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ResponseMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java index b574a74702..22c11a2fc4 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/SessionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/openwire/v1/SessionIdMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java index 2594725f24..a61502ab8b 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/SessionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class SessionIdMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class SessionIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/SessionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/openwire/v1/SessionInfoMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java index e2bfba79f4..3ffd0548b2 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/SessionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -63,7 +63,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { super.unmarshal(wireFormat, o, dataIn, bs); SessionInfo info = (SessionInfo)o; - info.setSessionId((org.activemq.command.SessionId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setSessionId((org.apache.activemq.command.SessionId) unmarsalCachedObject(wireFormat, dataIn, bs)); } diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ShutdownInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/openwire/v1/ShutdownInfoMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java index 614b83e264..f967b55e87 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/ShutdownInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/SubscriptionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/openwire/v1/SubscriptionInfoMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java index 4c8c245bbf..515f8a85e1 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/SubscriptionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class SubscriptionInfoMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class SubscriptionInfoMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal @@ -64,7 +64,7 @@ public class SubscriptionInfoMarshaller extends org.activemq.openwire.DataStream SubscriptionInfo info = (SubscriptionInfo)o; info.setClientId(readString(dataIn, bs)); - info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setSelector(readString(dataIn, bs)); info.setSubcriptionName(readString(dataIn, bs)); diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/TransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/openwire/v1/TransactionIdMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java index 759fd182f3..c6f1c9dddd 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/TransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public abstract class TransactionIdMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public abstract class TransactionIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Un-marshal an object instance from the data input stream diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/TransactionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/openwire/v1/TransactionInfoMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java index d7447176f5..d8beb67f0e 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/TransactionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -63,8 +63,8 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { super.unmarshal(wireFormat, o, dataIn, bs); TransactionInfo info = (TransactionInfo)o; - info.setConnectionId((org.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); - info.setTransactionId((org.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setType(dataIn.readByte()); } diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/WireFormatInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/openwire/v1/WireFormatInfoMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java index 00118d4240..b28c1abbc9 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/WireFormatInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** @@ -35,7 +35,7 @@ import org.activemq.command.*; * * @version $Revision$ */ -public class WireFormatInfoMarshaller extends org.activemq.openwire.DataStreamMarshaller { +public class WireFormatInfoMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller { /** * Return the type of Data Structure we marshal diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/XATransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/openwire/v1/XATransactionIdMarshaller.java rename to activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java index b465c6ee46..e1ad815eb7 100755 --- a/activemq-core/src/main/java/org/activemq/openwire/v1/XATransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire.v1; +package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.activemq.openwire.*; -import org.activemq.command.*; +import org.apache.activemq.command.*; +import org.apache.activemq.openwire.*; /** diff --git a/activemq-core/src/main/java/org/activemq/package.html b/activemq-core/src/main/java/org/apache/activemq/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/package.html rename to activemq-core/src/main/java/org/apache/activemq/package.html diff --git a/activemq-core/src/main/java/org/activemq/pool/ConnectionKey.java b/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionKey.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/pool/ConnectionKey.java rename to activemq-core/src/main/java/org/apache/activemq/pool/ConnectionKey.java index 548c15c444..15b7de7cbf 100644 --- a/activemq-core/src/main/java/org/activemq/pool/ConnectionKey.java +++ b/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionKey.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.pool; +package org.apache.activemq.pool; /** * A cache key for the connection details diff --git a/activemq-core/src/main/java/org/activemq/pool/ConnectionPool.java b/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionPool.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/pool/ConnectionPool.java rename to activemq-core/src/main/java/org/apache/activemq/pool/ConnectionPool.java index 70b4eb8fb8..98648f7b50 100644 --- a/activemq-core/src/main/java/org/activemq/pool/ConnectionPool.java +++ b/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionPool.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.pool; +package org.apache.activemq.pool; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; -import org.activemq.ActiveMQConnection; -import org.activemq.util.JMSExceptionSupport; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.util.JMSExceptionSupport; import javax.jms.JMSException; import javax.jms.Session; diff --git a/activemq-core/src/main/java/org/activemq/pool/PooledConnection.java b/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnection.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/pool/PooledConnection.java rename to activemq-core/src/main/java/org/apache/activemq/pool/PooledConnection.java index 6eeec486df..bc3a97197d 100755 --- a/activemq-core/src/main/java/org/activemq/pool/PooledConnection.java +++ b/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnection.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.pool; +package org.apache.activemq.pool; -import org.activemq.ActiveMQConnection; -import org.activemq.ActiveMQSession; -import org.activemq.AlreadyClosedException; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.ActiveMQSession; +import org.apache.activemq.AlreadyClosedException; import javax.jms.Connection; import javax.jms.ConnectionConsumer; diff --git a/activemq-core/src/main/java/org/activemq/pool/PooledConnectionFactory.java b/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/pool/PooledConnectionFactory.java rename to activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java index d4e9e557d8..352f379a1f 100644 --- a/activemq-core/src/main/java/org/activemq/pool/PooledConnectionFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.pool; +package org.apache.activemq.pool; -import org.activemq.ActiveMQConnection; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.Service; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.ServiceStopper; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.Service; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.ServiceStopper; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -89,7 +89,7 @@ public class PooledConnectionFactory implements ConnectionFactory, Service { } /** - * @see org.activemq.service.Service#start() + * @see org.apache.activemq.service.Service#start() */ public void start() { try { diff --git a/activemq-core/src/main/java/org/activemq/pool/PooledProducer.java b/activemq-core/src/main/java/org/apache/activemq/pool/PooledProducer.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/pool/PooledProducer.java rename to activemq-core/src/main/java/org/apache/activemq/pool/PooledProducer.java index f6bc92b466..c144519257 100644 --- a/activemq-core/src/main/java/org/activemq/pool/PooledProducer.java +++ b/activemq-core/src/main/java/org/apache/activemq/pool/PooledProducer.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.pool; +package org.apache.activemq.pool; -import org.activemq.ActiveMQMessageProducer; +import org.apache.activemq.ActiveMQMessageProducer; import javax.jms.Destination; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/pool/PooledQueueSender.java b/activemq-core/src/main/java/org/apache/activemq/pool/PooledQueueSender.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/pool/PooledQueueSender.java rename to activemq-core/src/main/java/org/apache/activemq/pool/PooledQueueSender.java index e67d034a1d..bd43621f25 100644 --- a/activemq-core/src/main/java/org/activemq/pool/PooledQueueSender.java +++ b/activemq-core/src/main/java/org/apache/activemq/pool/PooledQueueSender.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.pool; +package org.apache.activemq.pool; -import org.activemq.ActiveMQQueueSender; +import org.apache.activemq.ActiveMQQueueSender; import javax.jms.Destination; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/pool/PooledSession.java b/activemq-core/src/main/java/org/apache/activemq/pool/PooledSession.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/pool/PooledSession.java rename to activemq-core/src/main/java/org/apache/activemq/pool/PooledSession.java index 3b5a6d4767..9f2fa38b8f 100644 --- a/activemq-core/src/main/java/org/activemq/pool/PooledSession.java +++ b/activemq-core/src/main/java/org/apache/activemq/pool/PooledSession.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.pool; +package org.apache.activemq.pool; -import org.activemq.ActiveMQMessageProducer; -import org.activemq.ActiveMQQueueSender; -import org.activemq.ActiveMQSession; -import org.activemq.ActiveMQTopicPublisher; -import org.activemq.AlreadyClosedException; -import org.activemq.util.JMSExceptionSupport; +import org.apache.activemq.ActiveMQMessageProducer; +import org.apache.activemq.ActiveMQQueueSender; +import org.apache.activemq.ActiveMQSession; +import org.apache.activemq.ActiveMQTopicPublisher; +import org.apache.activemq.AlreadyClosedException; +import org.apache.activemq.util.JMSExceptionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.pool.ObjectPool; diff --git a/activemq-core/src/main/java/org/activemq/pool/PooledTopicPublisher.java b/activemq-core/src/main/java/org/apache/activemq/pool/PooledTopicPublisher.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/pool/PooledTopicPublisher.java rename to activemq-core/src/main/java/org/apache/activemq/pool/PooledTopicPublisher.java index 88db4aaf1e..9402e9a05e 100644 --- a/activemq-core/src/main/java/org/activemq/pool/PooledTopicPublisher.java +++ b/activemq-core/src/main/java/org/apache/activemq/pool/PooledTopicPublisher.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.pool; +package org.apache.activemq.pool; -import org.activemq.ActiveMQTopicPublisher; +import org.apache.activemq.ActiveMQTopicPublisher; import javax.jms.Destination; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/pool/SessionKey.java b/activemq-core/src/main/java/org/apache/activemq/pool/SessionKey.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/pool/SessionKey.java rename to activemq-core/src/main/java/org/apache/activemq/pool/SessionKey.java index 546bf86136..d7ca7f498c 100644 --- a/activemq-core/src/main/java/org/activemq/pool/SessionKey.java +++ b/activemq-core/src/main/java/org/apache/activemq/pool/SessionKey.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.pool; +package org.apache.activemq.pool; /** * A cache key for the session details diff --git a/activemq-core/src/main/java/org/activemq/pool/SessionPool.java b/activemq-core/src/main/java/org/apache/activemq/pool/SessionPool.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/pool/SessionPool.java rename to activemq-core/src/main/java/org/apache/activemq/pool/SessionPool.java index 1d9a5ab4a0..3c27647b64 100644 --- a/activemq-core/src/main/java/org/activemq/pool/SessionPool.java +++ b/activemq-core/src/main/java/org/apache/activemq/pool/SessionPool.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.pool; +package org.apache.activemq.pool; -import org.activemq.ActiveMQConnection; -import org.activemq.ActiveMQSession; -import org.activemq.AlreadyClosedException; -import org.activemq.util.JMSExceptionSupport; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.ActiveMQSession; +import org.apache.activemq.AlreadyClosedException; +import org.apache.activemq.util.JMSExceptionSupport; import org.apache.commons.pool.ObjectPool; import org.apache.commons.pool.PoolableObjectFactory; import org.apache.commons.pool.impl.GenericObjectPool; diff --git a/activemq-core/src/main/java/org/activemq/pool/package.html b/activemq-core/src/main/java/org/apache/activemq/pool/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/pool/package.html rename to activemq-core/src/main/java/org/apache/activemq/pool/package.html diff --git a/activemq-core/src/main/java/org/activemq/proxy/ProxyConnection.java b/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/proxy/ProxyConnection.java rename to activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java index 7af001f245..b37fa854f5 100644 --- a/activemq-core/src/main/java/org/activemq/proxy/ProxyConnection.java +++ b/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.proxy; +package org.apache.activemq.proxy; import java.io.IOException; -import org.activemq.Service; -import org.activemq.command.Command; -import org.activemq.command.ShutdownInfo; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportListener; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.ServiceStopper; +import org.apache.activemq.Service; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.ShutdownInfo; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportListener; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.ServiceStopper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/proxy/ProxyConnector.java b/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/proxy/ProxyConnector.java rename to activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java index 8117c7758f..069c491dde 100644 --- a/activemq-core/src/main/java/org/activemq/proxy/ProxyConnector.java +++ b/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.proxy; +package org.apache.activemq.proxy; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import org.activemq.Service; -import org.activemq.transport.CompositeTransport; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportAcceptListener; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportServer; +import org.apache.activemq.Service; +import org.apache.activemq.transport.CompositeTransport; +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.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/security/JaasAuthenticationBroker.java b/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/security/JaasAuthenticationBroker.java rename to activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java index 04c02b90d0..5d67533e4e 100644 --- a/activemq-core/src/main/java/org/activemq/security/JaasAuthenticationBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.security; +package org.apache.activemq.security; import java.util.Iterator; import java.util.Set; @@ -22,10 +22,10 @@ import java.util.Set; import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; -import org.activemq.broker.Broker; -import org.activemq.broker.BrokerFilter; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ConnectionInfo; +import org.apache.activemq.broker.Broker; +import org.apache.activemq.broker.BrokerFilter; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ConnectionInfo; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; diff --git a/activemq-core/src/main/java/org/activemq/security/JassCredentialCallback.java b/activemq-core/src/main/java/org/apache/activemq/security/JassCredentialCallback.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/security/JassCredentialCallback.java rename to activemq-core/src/main/java/org/apache/activemq/security/JassCredentialCallback.java index 05c5ff300d..e739cc4982 100644 --- a/activemq-core/src/main/java/org/activemq/security/JassCredentialCallback.java +++ b/activemq-core/src/main/java/org/apache/activemq/security/JassCredentialCallback.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.security; +package org.apache.activemq.security; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; diff --git a/activemq-core/src/main/java/org/activemq/security/SecurityAdminMBean.java b/activemq-core/src/main/java/org/apache/activemq/security/SecurityAdminMBean.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/security/SecurityAdminMBean.java rename to activemq-core/src/main/java/org/apache/activemq/security/SecurityAdminMBean.java index 8385421b2c..08b9cb4de4 100644 --- a/activemq-core/src/main/java/org/activemq/security/SecurityAdminMBean.java +++ b/activemq-core/src/main/java/org/apache/activemq/security/SecurityAdminMBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.security; +package org.apache.activemq.security; /** * An MBean for adding and removing users, roles diff --git a/activemq-core/src/main/java/org/activemq/security/SecurityContext.java b/activemq-core/src/main/java/org/apache/activemq/security/SecurityContext.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/security/SecurityContext.java rename to activemq-core/src/main/java/org/apache/activemq/security/SecurityContext.java index 63693535c1..9dd1201140 100644 --- a/activemq-core/src/main/java/org/activemq/security/SecurityContext.java +++ b/activemq-core/src/main/java/org/apache/activemq/security/SecurityContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.security; +package org.apache.activemq.security; import java.util.HashSet; import java.util.Set; diff --git a/activemq-core/src/main/java/org/activemq/security/SimpleAuthenticationBroker.java b/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/security/SimpleAuthenticationBroker.java rename to activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java index bf5b0664ae..ec10ffb586 100644 --- a/activemq-core/src/main/java/org/activemq/security/SimpleAuthenticationBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.security; +package org.apache.activemq.security; import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.activemq.broker.Broker; -import org.activemq.broker.BrokerFilter; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ConnectionInfo; +import org.apache.activemq.broker.Broker; +import org.apache.activemq.broker.BrokerFilter; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ConnectionInfo; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; diff --git a/activemq-core/src/main/java/org/activemq/security/SimpleAuthorizationBroker.java b/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthorizationBroker.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/security/SimpleAuthorizationBroker.java rename to activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthorizationBroker.java index da8a83740b..376bc801c2 100644 --- a/activemq-core/src/main/java/org/activemq/security/SimpleAuthorizationBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthorizationBroker.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.security; +package org.apache.activemq.security; -import org.activemq.broker.Broker; -import org.activemq.broker.BrokerFilter; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.Destination; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTempDestination; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.ProducerInfo; -import org.activemq.filter.BooleanExpression; -import org.activemq.filter.DestinationMap; -import org.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.broker.Broker; +import org.apache.activemq.broker.BrokerFilter; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.Destination; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTempDestination; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.filter.BooleanExpression; +import org.apache.activemq.filter.DestinationMap; +import org.apache.activemq.filter.MessageEvaluationContext; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/security/package.html b/activemq-core/src/main/java/org/apache/activemq/security/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/security/package.html rename to activemq-core/src/main/java/org/apache/activemq/security/package.html diff --git a/activemq-core/src/main/java/org/activemq/selector/ParseException.java b/activemq-core/src/main/java/org/apache/activemq/selector/ParseException.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/selector/ParseException.java rename to activemq-core/src/main/java/org/apache/activemq/selector/ParseException.java index 5363682306..d7cb23ddc9 100755 --- a/activemq-core/src/main/java/org/activemq/selector/ParseException.java +++ b/activemq-core/src/main/java/org/apache/activemq/selector/ParseException.java @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 2.1 */ -package org.activemq.selector; +package org.apache.activemq.selector; /** * This exception is thrown when parse errors are encountered. diff --git a/activemq-core/src/main/java/org/activemq/selector/SelectorParser.java b/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParser.java similarity index 69% rename from activemq-core/src/main/java/org/activemq/selector/SelectorParser.java rename to activemq-core/src/main/java/org/apache/activemq/selector/SelectorParser.java index 0469b62f17..5b8a85c03d 100755 --- a/activemq-core/src/main/java/org/activemq/selector/SelectorParser.java +++ b/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParser.java @@ -1,12 +1,12 @@ /* Generated By:JavaCC: Do not edit this line. SelectorParser.java */ -package org.activemq.selector; +package org.apache.activemq.selector; import java.io.*; import java.util.*; import javax.jms.InvalidSelectorException; -import org.activemq.filter.*; +import org.apache.activemq.filter.*; /** * JMS Selector Parser generated by JavaCC @@ -518,478 +518,592 @@ public class SelectorParser implements SelectorParserConstants { final private boolean jj_2_1(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; - try { return !jj_3_1(); } - catch(LookaheadSuccess ls) { return true; } + return !jj_3_1(); } final private boolean jj_2_2(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; - try { return !jj_3_2(); } - catch(LookaheadSuccess ls) { return true; } + return !jj_3_2(); } final private boolean jj_2_3(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; - try { return !jj_3_3(); } - catch(LookaheadSuccess ls) { return true; } + return !jj_3_3(); } final private boolean jj_2_4(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; - try { return !jj_3_4(); } - catch(LookaheadSuccess ls) { return true; } + return !jj_3_4(); } final private boolean jj_2_5(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; - try { return !jj_3_5(); } - catch(LookaheadSuccess ls) { return true; } + return !jj_3_5(); } final private boolean jj_2_6(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; - try { return !jj_3_6(); } - catch(LookaheadSuccess ls) { return true; } + return !jj_3_6(); } - final private boolean jj_3R_51() { + final private boolean jj_3R_53() { if (jj_scan_token(32)) return true; - if (jj_3R_43()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_45()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_27() { + final private boolean jj_3R_29() { if (jj_scan_token(ID)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_61() { + final private boolean jj_3R_63() { if (jj_scan_token(35)) return true; - if (jj_3R_21()) return true; - return false; - } - - final private boolean jj_3R_48() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_56()) { - jj_scanpos = xsp; - if (jj_3R_57()) return true; - } - return false; - } - - final private boolean jj_3R_38() { - if (jj_scan_token(OR)) return true; - if (jj_3R_37()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_23()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } final private boolean jj_3R_50() { - if (jj_scan_token(31)) return true; - if (jj_3R_43()) return true; - return false; - } - - final private boolean jj_3R_25() { - if (jj_scan_token(34)) return true; - if (jj_3R_28()) return true; - if (jj_scan_token(36)) return true; - return false; - } - - final private boolean jj_3R_24() { - if (jj_3R_27()) return true; - return false; - } - - final private boolean jj_3R_49() { - if (jj_scan_token(30)) return true; - if (jj_3R_43()) return true; - return false; - } - - final private boolean jj_3R_44() { Token xsp; xsp = jj_scanpos; - if (jj_3R_49()) { - jj_scanpos = xsp; - if (jj_3R_50()) { + if (jj_3R_58()) { jj_scanpos = xsp; + if (jj_3R_59()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_40() { + if (jj_scan_token(OR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_39()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_52() { + if (jj_scan_token(31)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_45()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_27() { + if (jj_scan_token(34)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_30()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(36)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_26() { + if (jj_3R_29()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_51() { + if (jj_scan_token(30)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_45()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_46() { + Token xsp; + xsp = jj_scanpos; if (jj_3R_51()) { jj_scanpos = xsp; if (jj_3R_52()) { jj_scanpos = xsp; if (jj_3R_53()) { jj_scanpos = xsp; - if (jj_3_2()) { - jj_scanpos = xsp; if (jj_3R_54()) { jj_scanpos = xsp; - if (jj_3_3()) { - jj_scanpos = xsp; if (jj_3R_55()) { jj_scanpos = xsp; + if (jj_3_2()) { + jj_scanpos = xsp; + if (jj_3R_56()) { + jj_scanpos = xsp; + if (jj_3_3()) { + jj_scanpos = xsp; + if (jj_3R_57()) { + jj_scanpos = xsp; if (jj_3_4()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_25() { + if (jj_3R_28()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_45() { + if (jj_3R_11()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_50()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } + return false; + } + + final private boolean jj_3R_30() { + if (jj_3R_39()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_40()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } - } - } - } - } - } - } - } + return false; + } + + final private boolean jj_3R_24() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_25()) { + jj_scanpos = xsp; + if (jj_3R_26()) { + jj_scanpos = xsp; + if (jj_3R_27()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_19() { + if (jj_3R_24()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } final private boolean jj_3R_23() { - if (jj_3R_26()) return true; + if (jj_scan_token(STRING_LITERAL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_62() { + if (jj_scan_token(35)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_23()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_18() { + if (jj_scan_token(XQUERY)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_23()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } final private boolean jj_3R_43() { - if (jj_3R_9()) return true; + if (jj_3R_45()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_48()) { jj_scanpos = xsp; break; } + if (jj_3R_46()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - final private boolean jj_3R_28() { - if (jj_3R_37()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_38()) { jj_scanpos = xsp; break; } - } - return false; - } - - final private boolean jj_3R_22() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_23()) { - jj_scanpos = xsp; - if (jj_3R_24()) { - jj_scanpos = xsp; - if (jj_3R_25()) return true; - } - } - return false; - } - - final private boolean jj_3R_17() { - if (jj_3R_22()) return true; - return false; - } - - final private boolean jj_3R_21() { - if (jj_scan_token(STRING_LITERAL)) return true; - return false; - } - - final private boolean jj_3R_60() { - if (jj_scan_token(35)) return true; - if (jj_3R_21()) return true; - return false; - } - - final private boolean jj_3R_16() { - if (jj_scan_token(XQUERY)) return true; - if (jj_3R_21()) return true; - return false; - } - - final private boolean jj_3R_41() { - if (jj_3R_43()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_44()) { jj_scanpos = xsp; break; } - } - return false; - } - - final private boolean jj_3R_59() { + final private boolean jj_3R_61() { if (jj_scan_token(ESCAPE)) return true; - if (jj_3R_21()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_23()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } final private boolean jj_3_4() { if (jj_scan_token(NOT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(IN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(34)) return true; - if (jj_3R_21()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_23()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_61()) { jj_scanpos = xsp; break; } + if (jj_3R_63()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } if (jj_scan_token(36)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } final private boolean jj_3_6() { if (jj_scan_token(37)) return true; - if (jj_3R_10()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_12()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_15() { + final private boolean jj_3R_17() { if (jj_scan_token(XPATH)) return true; - if (jj_3R_21()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_23()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_38() { + if (jj_scan_token(NULL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_16() { + if (jj_scan_token(NOT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_12()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } final private boolean jj_3R_14() { - if (jj_scan_token(NOT)) return true; - if (jj_3R_10()) return true; - return false; - } - - final private boolean jj_3R_36() { - if (jj_scan_token(NULL)) return true; - return false; - } - - final private boolean jj_3R_12() { if (jj_scan_token(37)) return true; - if (jj_3R_10()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_12()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_55() { + final private boolean jj_3R_57() { if (jj_scan_token(IN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(34)) return true; - if (jj_3R_21()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_23()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_60()) { jj_scanpos = xsp; break; } + if (jj_3R_62()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } if (jj_scan_token(36)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_47() { + final private boolean jj_3R_49() { if (jj_scan_token(IS)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(NOT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(NULL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_13() { + final private boolean jj_3R_15() { if (jj_scan_token(38)) return true; - if (jj_3R_10()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_12()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_35() { + final private boolean jj_3R_37() { if (jj_scan_token(FALSE)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } final private boolean jj_3_1() { if (jj_scan_token(IS)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(NULL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_10() { + final private boolean jj_3R_12() { Token xsp; xsp = jj_scanpos; - if (jj_3R_12()) { - jj_scanpos = xsp; - if (jj_3R_13()) { - jj_scanpos = xsp; if (jj_3R_14()) { jj_scanpos = xsp; if (jj_3R_15()) { jj_scanpos = xsp; if (jj_3R_16()) { jj_scanpos = xsp; - if (jj_3R_17()) return true; - } - } - } - } - } + if (jj_3R_17()) { + jj_scanpos = xsp; + if (jj_3R_18()) { + jj_scanpos = xsp; + if (jj_3R_19()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_34() { + final private boolean jj_3R_36() { if (jj_scan_token(TRUE)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_46() { + final private boolean jj_3R_48() { if (jj_scan_token(29)) return true; - if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_43()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } final private boolean jj_3_3() { if (jj_scan_token(NOT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(BETWEEN)) return true; - if (jj_3R_43()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_45()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(AND)) return true; - if (jj_3R_43()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_45()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_45() { + final private boolean jj_3R_47() { if (jj_scan_token(28)) return true; - if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_43()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_42() { + final private boolean jj_3R_44() { Token xsp; xsp = jj_scanpos; - if (jj_3R_45()) { + if (jj_3R_47()) { jj_scanpos = xsp; - if (jj_3R_46()) { + if (jj_3R_48()) { jj_scanpos = xsp; if (jj_3_1()) { jj_scanpos = xsp; - if (jj_3R_47()) return true; - } - } - } + if (jj_3R_49()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_33() { + final private boolean jj_3R_35() { if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_54() { + final private boolean jj_3R_56() { if (jj_scan_token(BETWEEN)) return true; - if (jj_3R_43()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_45()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(AND)) return true; - if (jj_3R_43()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_45()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_58() { + final private boolean jj_3R_60() { if (jj_scan_token(ESCAPE)) return true; - if (jj_3R_21()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_23()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_32() { + final private boolean jj_3R_34() { if (jj_scan_token(OCTAL_LITERAL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_20() { + final private boolean jj_3R_22() { if (jj_scan_token(41)) return true; - if (jj_3R_10()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_12()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_39() { - if (jj_3R_41()) return true; + final private boolean jj_3R_41() { + if (jj_3R_43()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_42()) { jj_scanpos = xsp; break; } + if (jj_3R_44()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } final private boolean jj_3_2() { if (jj_scan_token(NOT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(LIKE)) return true; - if (jj_3R_21()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_23()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_59()) jj_scanpos = xsp; + if (jj_3R_61()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_53() { + final private boolean jj_3R_55() { if (jj_scan_token(LIKE)) return true; - if (jj_3R_21()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_23()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_58()) jj_scanpos = xsp; + if (jj_3R_60()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_31() { + final private boolean jj_3R_33() { if (jj_scan_token(HEX_LITERAL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_19() { + final private boolean jj_3R_21() { if (jj_scan_token(40)) return true; - if (jj_3R_10()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_12()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_18() { + final private boolean jj_3R_13() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_20()) { + jj_scanpos = xsp; + if (jj_3R_21()) { + jj_scanpos = xsp; + if (jj_3R_22()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_20() { if (jj_scan_token(39)) return true; - if (jj_3R_10()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_12()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_42() { + if (jj_scan_token(AND)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_32() { + if (jj_scan_token(DECIMAL_LITERAL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } final private boolean jj_3R_11() { + if (jj_3R_12()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; - xsp = jj_scanpos; - if (jj_3R_18()) { - jj_scanpos = xsp; - if (jj_3R_19()) { - jj_scanpos = xsp; - if (jj_3R_20()) return true; - } + while (true) { + xsp = jj_scanpos; + if (jj_3R_13()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - final private boolean jj_3R_40() { - if (jj_scan_token(AND)) return true; - if (jj_3R_39()) return true; + final private boolean jj_3R_10() { + if (jj_scan_token(38)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_30() { - if (jj_scan_token(DECIMAL_LITERAL)) return true; + final private boolean jj_3R_31() { + if (jj_3R_23()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } final private boolean jj_3R_9() { - if (jj_3R_10()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_11()) { jj_scanpos = xsp; break; } - } + if (jj_scan_token(37)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_29() { - if (jj_3R_21()) return true; - return false; - } - - final private boolean jj_3R_57() { + final private boolean jj_3R_59() { if (jj_scan_token(38)) return true; - if (jj_3R_9()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_11()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_37() { - if (jj_3R_39()) return true; + final private boolean jj_3R_39() { + if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_40()) { jj_scanpos = xsp; break; } + if (jj_3R_42()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } @@ -997,21 +1111,19 @@ public class SelectorParser implements SelectorParserConstants { final private boolean jj_3_5() { Token xsp; xsp = jj_scanpos; - if (jj_scan_token(37)) { + if (jj_3R_9()) { jj_scanpos = xsp; - if (jj_scan_token(38)) return true; - } - if (jj_3R_9()) return true; + if (jj_3R_10()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_11()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_26() { + final private boolean jj_3R_28() { Token xsp; xsp = jj_scanpos; - if (jj_3R_29()) { - jj_scanpos = xsp; - if (jj_3R_30()) { - jj_scanpos = xsp; if (jj_3R_31()) { jj_scanpos = xsp; if (jj_3R_32()) { @@ -1022,26 +1134,35 @@ public class SelectorParser implements SelectorParserConstants { jj_scanpos = xsp; if (jj_3R_35()) { jj_scanpos = xsp; - if (jj_3R_36()) return true; - } - } - } - } - } - } - } + if (jj_3R_36()) { + jj_scanpos = xsp; + if (jj_3R_37()) { + jj_scanpos = xsp; + if (jj_3R_38()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_52() { + final private boolean jj_3R_54() { if (jj_scan_token(33)) return true; - if (jj_3R_43()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_45()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - final private boolean jj_3R_56() { + final private boolean jj_3R_58() { if (jj_scan_token(37)) return true; - if (jj_3R_9()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_11()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -1106,8 +1227,6 @@ public class SelectorParser implements SelectorParserConstants { throw generateParseException(); } - static private final class LookaheadSuccess extends java.lang.Error { } - final private LookaheadSuccess jj_ls = new LookaheadSuccess(); final private boolean jj_scan_token(int kind) { if (jj_scanpos == jj_lastpos) { jj_la--; @@ -1119,9 +1238,7 @@ public class SelectorParser implements SelectorParserConstants { } else { jj_scanpos = jj_scanpos.next; } - if (jj_scanpos.kind != kind) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls; - return false; + return (jj_scanpos.kind != kind); } final public Token getNextToken() { @@ -1147,7 +1264,7 @@ public class SelectorParser implements SelectorParserConstants { return (jj_ntk = jj_nt.kind); } - public ParseException generateParseException() { + final public ParseException generateParseException() { Token errortok = token.next; int line = errortok.beginLine, column = errortok.beginColumn; String mess = (errortok.kind == 0) ? tokenImage[0] : errortok.image; diff --git a/activemq-core/src/main/java/org/activemq/selector/SelectorParserConstants.java b/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserConstants.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/selector/SelectorParserConstants.java rename to activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserConstants.java index a1cb94ebde..6542976f20 100755 --- a/activemq-core/src/main/java/org/activemq/selector/SelectorParserConstants.java +++ b/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserConstants.java @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. SelectorParserConstants.java */ -package org.activemq.selector; +package org.apache.activemq.selector; public interface SelectorParserConstants { diff --git a/activemq-core/src/main/java/org/activemq/selector/SelectorParserTokenManager.java b/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserTokenManager.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/selector/SelectorParserTokenManager.java rename to activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserTokenManager.java index 0c0f08ce13..bd7670af8d 100755 --- a/activemq-core/src/main/java/org/activemq/selector/SelectorParserTokenManager.java +++ b/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserTokenManager.java @@ -1,9 +1,9 @@ /* Generated By:JavaCC: Do not edit this line. SelectorParserTokenManager.java */ -package org.activemq.selector; +package org.apache.activemq.selector; import java.io.*; import java.util.*; import javax.jms.InvalidSelectorException; -import org.activemq.filter.*; +import org.apache.activemq.filter.*; public class SelectorParserTokenManager implements SelectorParserConstants { @@ -904,7 +904,7 @@ static final long[] jjtoSkip = { static final long[] jjtoSpecial = { 0x3eL, }; -protected SimpleCharStream input_stream; +private SimpleCharStream input_stream; private final int[] jjrounds = new int[43]; private final int[] jjstateSet = new int[86]; protected char curChar; @@ -946,7 +946,7 @@ public void SwitchTo(int lexState) curLexState = lexState; } -protected Token jjFillToken() +private final Token jjFillToken() { Token t = Token.newToken(jjmatchedKind); t.kind = jjmatchedKind; @@ -966,7 +966,7 @@ int jjround; int jjmatchedPos; int jjmatchedKind; -public Token getNextToken() +public final Token getNextToken() { int kind; Token specialToken = null; diff --git a/activemq-core/src/main/java/org/activemq/selector/SimpleCharStream.java b/activemq-core/src/main/java/org/apache/activemq/selector/SimpleCharStream.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/selector/SimpleCharStream.java rename to activemq-core/src/main/java/org/apache/activemq/selector/SimpleCharStream.java index 77cd03950e..8d5be83bdf 100755 --- a/activemq-core/src/main/java/org/activemq/selector/SimpleCharStream.java +++ b/activemq-core/src/main/java/org/apache/activemq/selector/SimpleCharStream.java @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 2.1 */ -package org.activemq.selector; +package org.apache.activemq.selector; /** * An implementation of interface CharStream, where the stream is assumed to diff --git a/activemq-core/src/main/java/org/activemq/selector/Token.java b/activemq-core/src/main/java/org/apache/activemq/selector/Token.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/selector/Token.java rename to activemq-core/src/main/java/org/apache/activemq/selector/Token.java index 2158097424..5ca5b68492 100755 --- a/activemq-core/src/main/java/org/activemq/selector/Token.java +++ b/activemq-core/src/main/java/org/apache/activemq/selector/Token.java @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. Token.java Version 2.1 */ -package org.activemq.selector; +package org.apache.activemq.selector; /** * Describes the input token stream. diff --git a/activemq-core/src/main/java/org/activemq/selector/TokenMgrError.java b/activemq-core/src/main/java/org/apache/activemq/selector/TokenMgrError.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/selector/TokenMgrError.java rename to activemq-core/src/main/java/org/apache/activemq/selector/TokenMgrError.java index fbbf2cfa1f..8728d5d7da 100755 --- a/activemq-core/src/main/java/org/activemq/selector/TokenMgrError.java +++ b/activemq-core/src/main/java/org/apache/activemq/selector/TokenMgrError.java @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 2.1 */ -package org.activemq.selector; +package org.apache.activemq.selector; public class TokenMgrError extends Error { diff --git a/activemq-core/src/main/java/org/activemq/selector/package.html b/activemq-core/src/main/java/org/apache/activemq/selector/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/selector/package.html rename to activemq-core/src/main/java/org/apache/activemq/selector/package.html diff --git a/activemq-core/src/main/java/org/activemq/state/CommandVisitor.java b/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java similarity index 72% rename from activemq-core/src/main/java/org/activemq/state/CommandVisitor.java rename to activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java index 1922cab800..b72ec9b614 100755 --- a/activemq-core/src/main/java/org/activemq/state/CommandVisitor.java +++ b/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java @@ -14,27 +14,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.state; +package org.apache.activemq.state; -import org.activemq.command.BrokerInfo; -import org.activemq.command.ConnectionId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerId; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.DestinationInfo; -import org.activemq.command.FlushCommand; -import org.activemq.command.KeepAliveInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.ProducerId; -import org.activemq.command.ProducerInfo; -import org.activemq.command.RemoveSubscriptionInfo; -import org.activemq.command.Response; -import org.activemq.command.SessionId; -import org.activemq.command.SessionInfo; -import org.activemq.command.ShutdownInfo; -import org.activemq.command.TransactionInfo; -import org.activemq.command.WireFormatInfo; +import org.apache.activemq.command.BrokerInfo; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.DestinationInfo; +import org.apache.activemq.command.FlushCommand; +import org.apache.activemq.command.KeepAliveInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.ProducerId; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.RemoveSubscriptionInfo; +import org.apache.activemq.command.Response; +import org.apache.activemq.command.SessionId; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.command.ShutdownInfo; +import org.apache.activemq.command.TransactionInfo; +import org.apache.activemq.command.WireFormatInfo; public interface CommandVisitor { diff --git a/activemq-core/src/main/java/org/activemq/state/ConnectionState.java b/activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/state/ConnectionState.java rename to activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java index 701e6cd4e0..e24ff4c093 100755 --- a/activemq-core/src/main/java/org/activemq/state/ConnectionState.java +++ b/activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.state; +package org.apache.activemq.state; import java.util.ArrayList; import java.util.Collection; @@ -23,10 +23,10 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.SessionId; -import org.activemq.command.SessionInfo; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.SessionId; +import org.apache.activemq.command.SessionInfo; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/state/ConnectionStateTracker.java b/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/state/ConnectionStateTracker.java rename to activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java index bc5a78829b..7542ac4773 100755 --- a/activemq-core/src/main/java/org/activemq/state/ConnectionStateTracker.java +++ b/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java @@ -14,33 +14,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.state; +package org.apache.activemq.state; import java.io.IOException; import java.util.Iterator; -import org.activemq.command.BrokerInfo; -import org.activemq.command.Command; -import org.activemq.command.ConnectionId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerId; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.DestinationInfo; -import org.activemq.command.FlushCommand; -import org.activemq.command.KeepAliveInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.ProducerId; -import org.activemq.command.ProducerInfo; -import org.activemq.command.RemoveSubscriptionInfo; -import org.activemq.command.Response; -import org.activemq.command.SessionId; -import org.activemq.command.SessionInfo; -import org.activemq.command.ShutdownInfo; -import org.activemq.command.TransactionInfo; -import org.activemq.command.WireFormatInfo; -import org.activemq.transport.Transport; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.command.BrokerInfo; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.DestinationInfo; +import org.apache.activemq.command.FlushCommand; +import org.apache.activemq.command.KeepAliveInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.ProducerId; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.RemoveSubscriptionInfo; +import org.apache.activemq.command.Response; +import org.apache.activemq.command.SessionId; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.command.ShutdownInfo; +import org.apache.activemq.command.TransactionInfo; +import org.apache.activemq.command.WireFormatInfo; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.util.IOExceptionSupport; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/state/ConsumerState.java b/activemq-core/src/main/java/org/apache/activemq/state/ConsumerState.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/state/ConsumerState.java rename to activemq-core/src/main/java/org/apache/activemq/state/ConsumerState.java index b9f1aed4bb..66492b64d2 100755 --- a/activemq-core/src/main/java/org/activemq/state/ConsumerState.java +++ b/activemq-core/src/main/java/org/apache/activemq/state/ConsumerState.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.activemq.state; +package org.apache.activemq.state; -import org.activemq.command.ConsumerInfo; +import org.apache.activemq.command.ConsumerInfo; public class ConsumerState { final ConsumerInfo info; diff --git a/activemq-core/src/main/java/org/activemq/state/ProducerState.java b/activemq-core/src/main/java/org/apache/activemq/state/ProducerState.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/state/ProducerState.java rename to activemq-core/src/main/java/org/apache/activemq/state/ProducerState.java index 1947280a10..04d37fffca 100755 --- a/activemq-core/src/main/java/org/activemq/state/ProducerState.java +++ b/activemq-core/src/main/java/org/apache/activemq/state/ProducerState.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.activemq.state; +package org.apache.activemq.state; -import org.activemq.command.ProducerInfo; +import org.apache.activemq.command.ProducerInfo; public class ProducerState { final ProducerInfo info; diff --git a/activemq-core/src/main/java/org/activemq/state/SessionState.java b/activemq-core/src/main/java/org/apache/activemq/state/SessionState.java similarity index 88% rename from activemq-core/src/main/java/org/activemq/state/SessionState.java rename to activemq-core/src/main/java/org/apache/activemq/state/SessionState.java index df4482f388..2d0e82bc52 100755 --- a/activemq-core/src/main/java/org/activemq/state/SessionState.java +++ b/activemq-core/src/main/java/org/apache/activemq/state/SessionState.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.activemq.state; +package org.apache.activemq.state; import java.util.Collection; import java.util.Set; -import org.activemq.command.ConsumerId; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.ProducerId; -import org.activemq.command.ProducerInfo; -import org.activemq.command.SessionInfo; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.ProducerId; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.SessionInfo; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/store/DefaultPersistenceAdapterFactory.java b/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/store/DefaultPersistenceAdapterFactory.java rename to activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java index e5db51a286..06e0db67a9 100755 --- a/activemq-core/src/main/java/org/activemq/store/DefaultPersistenceAdapterFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; import java.io.File; import java.io.IOException; import org.activeio.journal.Journal; import org.activeio.journal.active.JournalImpl; -import org.activemq.memory.UsageManager; -import org.activemq.store.jdbc.JDBCPersistenceAdapter; -import org.activemq.store.journal.JournalPersistenceAdapter; -import org.activemq.store.journal.QuickJournalPersistenceAdapter; -import org.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter; +import org.apache.activemq.store.journal.JournalPersistenceAdapter; +import org.apache.activemq.store.journal.QuickJournalPersistenceAdapter; +import org.apache.activemq.thread.TaskRunnerFactory; import org.apache.derby.jdbc.EmbeddedDataSource; import javax.sql.DataSource; diff --git a/activemq-core/src/main/java/org/activemq/store/MessageRecoveryListener.java b/activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/store/MessageRecoveryListener.java rename to activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java index bb293a6731..04876a2a2e 100755 --- a/activemq-core/src/main/java/org/activemq/store/MessageRecoveryListener.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; -import org.activemq.command.Message; +import org.apache.activemq.command.Message; /** * @version $Revision: 1.4 $ diff --git a/activemq-core/src/main/java/org/activemq/store/MessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/store/MessageStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java index 6da0fe4795..68253c8044 100755 --- a/activemq-core/src/main/java/org/activemq/store/MessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; import java.io.IOException; import org.activeio.Service; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageId; /** - * Represents a message store which is used by the persistent {@link org.activemq.service.MessageContainer} + * Represents a message store which is used by the persistent {@link org.apache.activemq.service.MessageContainer} * implementations * * @version $Revision: 1.5 $ diff --git a/activemq-core/src/main/java/org/activemq/store/PersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapter.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/store/PersistenceAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapter.java index 212661e913..a0178e6ccb 100755 --- a/activemq-core/src/main/java/org/activemq/store/PersistenceAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapter.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; -import org.activemq.Service; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; +import org.apache.activemq.Service; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; import java.io.IOException; import java.util.Set; @@ -32,7 +32,7 @@ import java.util.Set; public interface PersistenceAdapter extends Service { /** - * Returns a set of all the {@link org.activemq.command.ActiveMQDestination} + * Returns a set of all the {@link org.apache.activemq.command.ActiveMQDestination} * objects that the persistence store is aware exist. * * @return diff --git a/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactory.java b/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactory.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactory.java rename to activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactory.java index 3e66b8450a..3d246e3b8b 100755 --- a/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactoryBean.java b/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactoryBean.java rename to activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java index 514f857cd0..c61fa39af4 100644 --- a/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactoryBean.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; import org.springframework.beans.factory.FactoryBean; diff --git a/activemq-core/src/main/java/org/activemq/store/ProxyMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/store/ProxyMessageStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java index 3bceabe44b..f71295f87a 100755 --- a/activemq-core/src/main/java/org/activemq/store/ProxyMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; import java.io.IOException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageId; /** * A simple proxy that delegates to another MessageStore. diff --git a/activemq-core/src/main/java/org/activemq/store/ProxyTopicMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/store/ProxyTopicMessageStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java index 647cfc0873..2db2690f9b 100755 --- a/activemq-core/src/main/java/org/activemq/store/ProxyTopicMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; import java.io.IOException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; /** * A simple proxy that delegates to another MessageStore. diff --git a/activemq-core/src/main/java/org/activemq/store/TopicMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/store/TopicMessageStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java index e53eb85fc6..e03fb00c98 100755 --- a/activemq-core/src/main/java/org/activemq/store/TopicMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; import java.io.IOException; import javax.jms.JMSException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; /** * A MessageStore for durable topic subscriptions diff --git a/activemq-core/src/main/java/org/activemq/store/TransactionRecoveryListener.java b/activemq-core/src/main/java/org/apache/activemq/store/TransactionRecoveryListener.java similarity index 81% rename from activemq-core/src/main/java/org/activemq/store/TransactionRecoveryListener.java rename to activemq-core/src/main/java/org/apache/activemq/store/TransactionRecoveryListener.java index cbdfd71ddb..5bea58c5b4 100755 --- a/activemq-core/src/main/java/org/activemq/store/TransactionRecoveryListener.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/TransactionRecoveryListener.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.XATransactionId; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.XATransactionId; public interface TransactionRecoveryListener { public void recover(XATransactionId xid, Message[] addedMessages, MessageAck aks[]); diff --git a/activemq-core/src/main/java/org/activemq/store/TransactionStore.java b/activemq-core/src/main/java/org/apache/activemq/store/TransactionStore.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/store/TransactionStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/TransactionStore.java index f9fb6488d3..c1db0cda56 100755 --- a/activemq-core/src/main/java/org/activemq/store/TransactionStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/TransactionStore.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; import java.io.IOException; -import org.activemq.Service; -import org.activemq.command.TransactionId; +import org.apache.activemq.Service; +import org.apache.activemq.command.TransactionId; /** diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCAdapter.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/store/jdbc/JDBCAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCAdapter.java index 58b6e13ccd..c39d3c43f4 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCAdapter.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; import java.io.IOException; import java.sql.SQLException; import java.util.Set; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; /** * @version $Revision: 1.5 $ diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageRecoveryListener.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageRecoveryListener.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageRecoveryListener.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageRecoveryListener.java index 8382169931..799bd90594 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageRecoveryListener.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageRecoveryListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java index 93229a9f31..93ba295f2a 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; import java.io.IOException; import java.sql.SQLException; @@ -22,14 +22,14 @@ import java.sql.SQLException; import org.activeio.Packet; import org.activeio.command.WireFormat; import org.activeio.packet.ByteArrayPacket; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.MessageStore; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +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.util.IOExceptionSupport; /** * @version $Revision: 1.10 $ @@ -168,7 +168,7 @@ public class JDBCMessageStore implements MessageStore { } /** - * @see org.activemq.store.MessageStore#removeAllMessages(ConnectionContext) + * @see org.apache.activemq.store.MessageStore#removeAllMessages(ConnectionContext) */ public void removeAllMessages(ConnectionContext context) throws IOException { // Get a connection and remove the message from the DB diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/store/jdbc/JDBCPersistenceAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java index b899d1368e..2ad533305a 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCPersistenceAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; import java.io.IOException; import java.sql.SQLException; @@ -25,17 +25,17 @@ import javax.sql.DataSource; import org.activeio.FactoryFinder; import org.activeio.command.WireFormat; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.openwire.OpenWireFormat; -import org.activemq.store.MessageStore; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.TopicMessageStore; -import org.activemq.store.TransactionStore; -import org.activemq.store.jdbc.adapter.DefaultJDBCAdapter; -import org.activemq.store.memory.MemoryTransactionStore; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.store.TransactionStore; +import org.apache.activemq.store.jdbc.adapter.DefaultJDBCAdapter; +import org.apache.activemq.store.memory.MemoryTransactionStore; +import org.apache.activemq.util.IOExceptionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -59,7 +59,7 @@ import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; public class JDBCPersistenceAdapter implements PersistenceAdapter { private static final Log log = LogFactory.getLog(JDBCPersistenceAdapter.class); - private static FactoryFinder factoryFinder = new FactoryFinder("META-INF/services/org/activemq/store/jdbc/"); + private static FactoryFinder factoryFinder = new FactoryFinder("META-INF/services/org/apache/activemq/store/jdbc/"); private WireFormat wireFormat = new OpenWireFormat(false); private DataSource dataSource; diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCTopicMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java similarity index 88% rename from activemq-core/src/main/java/org/activemq/store/jdbc/JDBCTopicMessageStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java index 809c93a056..6dc8ce3dce 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCTopicMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; import java.io.IOException; import java.sql.SQLException; import org.activeio.command.WireFormat; import org.activeio.packet.ByteArrayPacket; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.Message; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.TopicMessageStore; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.util.IOExceptionSupport; /** * @version $Revision: 1.6 $ @@ -83,7 +83,7 @@ public class JDBCTopicMessageStore extends JDBCMessageStore implements TopicMess } /** - * @see org.activemq.store.TopicMessageStore#storeSubsciption(org.activemq.service.SubscriptionInfo, + * @see org.apache.activemq.store.TopicMessageStore#storeSubsciption(org.apache.activemq.service.SubscriptionInfo, * boolean) */ public void addSubsciption(String clientId, String subscriptionName, String selector, boolean retroactive) @@ -101,7 +101,7 @@ public class JDBCTopicMessageStore extends JDBCMessageStore implements TopicMess } /** - * @see org.activemq.store.TopicMessageStore#lookupSubscription(String, + * @see org.apache.activemq.store.TopicMessageStore#lookupSubscription(String, * String) */ public SubscriptionInfo lookupSubscription(String clientId, String subscriptionName) throws IOException { diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/StatementProvider.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/StatementProvider.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/store/jdbc/StatementProvider.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/StatementProvider.java index 0e2709e7d8..4592b944a3 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/StatementProvider.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/StatementProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; /** * Generates the SQL statements that are used by the JDBCAdapter. diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/TransactionContext.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/store/jdbc/TransactionContext.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java index 2dad1363d4..6659784aff 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/TransactionContext.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; import java.io.IOException; import java.sql.Connection; @@ -23,7 +23,7 @@ import java.sql.SQLException; import javax.sql.DataSource; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IOExceptionSupport; /** * Helps keep track of the current transaction/JDBC connection. diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/AxionJDBCAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/AxionJDBCAdapter.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/store/jdbc/adapter/AxionJDBCAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/AxionJDBCAdapter.java index 06291a5359..ddab75363a 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/AxionJDBCAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/AxionJDBCAdapter.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * Axion specific Adapter. diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/BlobJDBCAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BlobJDBCAdapter.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/store/jdbc/adapter/BlobJDBCAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BlobJDBCAdapter.java index 08855f2d32..81f388e5b0 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/BlobJDBCAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BlobJDBCAdapter.java @@ -16,7 +16,7 @@ * limitations under the License. * **/ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; import java.io.IOException; import java.io.InputStream; @@ -30,8 +30,8 @@ import java.sql.SQLException; import javax.jms.JMSException; import org.activeio.ByteArrayOutputStream; -import org.activemq.store.jdbc.StatementProvider; -import org.activemq.store.jdbc.TransactionContext; +import org.apache.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.TransactionContext; /** diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/BytesJDBCAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BytesJDBCAdapter.java similarity index 81% rename from activemq-core/src/main/java/org/activemq/store/jdbc/adapter/BytesJDBCAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BytesJDBCAdapter.java index 45b34603a7..ed2822de3f 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/BytesJDBCAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BytesJDBCAdapter.java @@ -16,13 +16,13 @@ * limitations under the License. * **/ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * This JDBCAdapter inserts and extracts BLOB data using the @@ -47,14 +47,14 @@ public class BytesJDBCAdapter extends DefaultJDBCAdapter { } /** - * @see org.activemq.store.jdbc.adapter.DefaultJDBCAdapter#getBinaryData(java.sql.ResultSet, int) + * @see org.apache.activemq.store.jdbc.adapter.DefaultJDBCAdapter#getBinaryData(java.sql.ResultSet, int) */ protected byte[] getBinaryData(ResultSet rs, int index) throws SQLException { return rs.getBytes(index); } /** - * @see org.activemq.store.jdbc.adapter.DefaultJDBCAdapter#setBinaryData(java.sql.PreparedStatement, int, byte[]) + * @see org.apache.activemq.store.jdbc.adapter.DefaultJDBCAdapter#setBinaryData(java.sql.PreparedStatement, int, byte[]) */ protected void setBinaryData(PreparedStatement s, int index, byte[] data) throws SQLException { s.setBytes(index, data); diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/CachingStatementProvider.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/CachingStatementProvider.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/store/jdbc/adapter/CachingStatementProvider.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/CachingStatementProvider.java index 60f4d5d009..3fa9dc1a9d 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/CachingStatementProvider.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/CachingStatementProvider.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * A StatementProvider filter that caches the responses diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java index c16ae6a6b4..1b957812fd 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; import java.io.IOException; import java.sql.PreparedStatement; @@ -24,13 +24,13 @@ import java.sql.Statement; import java.util.HashSet; import java.util.Set; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; -import org.activemq.store.jdbc.JDBCAdapter; -import org.activemq.store.jdbc.JDBCMessageRecoveryListener; -import org.activemq.store.jdbc.StatementProvider; -import org.activemq.store.jdbc.TransactionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; +import org.apache.activemq.store.jdbc.JDBCAdapter; +import org.apache.activemq.store.jdbc.JDBCMessageRecoveryListener; +import org.apache.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.TransactionContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -393,7 +393,7 @@ public class DefaultJDBCAdapter implements JDBCAdapter { } /** - * @see org.activemq.store.jdbc.JDBCAdapter#doSetSubscriberEntry(java.sql.Connection, java.lang.Object, org.activemq.service.SubscriptionInfo) + * @see org.apache.activemq.store.jdbc.JDBCAdapter#doSetSubscriberEntry(java.sql.Connection, java.lang.Object, org.apache.activemq.service.SubscriptionInfo) */ public void doSetSubscriberEntry(TransactionContext c, ActiveMQDestination destination, String clientId, String subscriptionName, String selector, boolean retroactive) throws SQLException, IOException { diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/DefaultStatementProvider.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultStatementProvider.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/store/jdbc/adapter/DefaultStatementProvider.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultStatementProvider.java index 04848b65c1..24681a9ddf 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/DefaultStatementProvider.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultStatementProvider.java @@ -16,9 +16,9 @@ * limitations under the License. * **/ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java index 6258fcad9a..628939826b 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java index 8aa5d489ed..2be750e564 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * Provides JDBCAdapter since that uses diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/InformixJDBCAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/InformixJDBCAdapter.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/store/jdbc/adapter/InformixJDBCAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/InformixJDBCAdapter.java index a8aaa23c24..673618dbc1 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/InformixJDBCAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/InformixJDBCAdapter.java @@ -15,9 +15,9 @@ * limitations under the License. * **/ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * JDBC Adapter for Informix database. diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/OracleJDBCAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/store/jdbc/adapter/OracleJDBCAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java index 214c3ad92a..2d9b68dcf0 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/OracleJDBCAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; import java.sql.Blob; import java.sql.ResultSet; import java.sql.SQLException; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * Implements all the default JDBC operations that are used diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java index 14c9f4e550..26b9d51218 100644 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java @@ -15,9 +15,9 @@ * limitations under the License. * **/ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * Implements all the default JDBC operations that are used diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/StreamJDBCAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/StreamJDBCAdapter.java similarity index 86% rename from activemq-core/src/main/java/org/activemq/store/jdbc/adapter/StreamJDBCAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/StreamJDBCAdapter.java index 70f202a30a..55c9ceb52b 100755 --- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/StreamJDBCAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/StreamJDBCAdapter.java @@ -16,7 +16,7 @@ * limitations under the License. * **/ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; import java.io.IOException; import java.io.InputStream; @@ -26,7 +26,7 @@ import java.sql.SQLException; import org.activeio.ByteArrayInputStream; import org.activeio.ByteArrayOutputStream; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * This JDBCAdapter inserts and extracts BLOB data using the @@ -50,7 +50,7 @@ public class StreamJDBCAdapter extends DefaultJDBCAdapter { } /** - * @see org.activemq.store.jdbc.adapter.DefaultJDBCAdapter#getBinaryData(java.sql.ResultSet, int) + * @see org.apache.activemq.store.jdbc.adapter.DefaultJDBCAdapter#getBinaryData(java.sql.ResultSet, int) */ protected byte[] getBinaryData(ResultSet rs, int index) throws SQLException { @@ -72,7 +72,7 @@ public class StreamJDBCAdapter extends DefaultJDBCAdapter { } /** - * @see org.activemq.store.jdbc.adapter.DefaultJDBCAdapter#setBinaryData(java.sql.PreparedStatement, int, byte[]) + * @see org.apache.activemq.store.jdbc.adapter.DefaultJDBCAdapter#setBinaryData(java.sql.PreparedStatement, int, byte[]) */ protected void setBinaryData(PreparedStatement s, int index, byte[] data) throws SQLException { s.setBinaryStream(index, new ByteArrayInputStream(data), data.length); diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/package.html b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/store/jdbc/adapter/package.html rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/package.html diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/package.html b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/store/jdbc/package.html rename to activemq-core/src/main/java/org/apache/activemq/store/jdbc/package.html diff --git a/activemq-core/src/main/java/org/activemq/store/journal/JournalMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/store/journal/JournalMessageStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java index 1fdc874454..a84cbfad0d 100755 --- a/activemq-core/src/main/java/org/activemq/store/journal/JournalMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.ArrayList; @@ -24,18 +24,18 @@ import java.util.Iterator; import java.util.LinkedHashMap; import org.activeio.journal.RecordLocation; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.JournalQueueAck; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.MessageStore; -import org.activemq.store.PersistenceAdapter; -import org.activemq.transaction.Synchronization; -import org.activemq.util.Callback; -import org.activemq.util.TransactionTemplate; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.JournalQueueAck; +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.PersistenceAdapter; +import org.apache.activemq.transaction.Synchronization; +import org.apache.activemq.util.Callback; +import org.apache.activemq.util.TransactionTemplate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -349,7 +349,7 @@ public class JournalMessageStore implements MessageStore { } /** - * @see org.activemq.store.MessageStore#removeAllMessages(ConnectionContext) + * @see org.apache.activemq.store.MessageStore#removeAllMessages(ConnectionContext) */ public void removeAllMessages(ConnectionContext context) throws IOException { peristenceAdapter.checkpoint(true, true); diff --git a/activemq-core/src/main/java/org/activemq/store/journal/JournalPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/store/journal/JournalPersistenceAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java index fff186f785..f3a3674700 100755 --- a/activemq-core/src/main/java/org/activemq/store/journal/JournalPersistenceAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.ArrayList; @@ -26,32 +26,32 @@ import org.activeio.journal.InvalidRecordLocationException; import org.activeio.journal.Journal; import org.activeio.journal.JournalEventListener; import org.activeio.journal.RecordLocation; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.DataStructure; -import org.activemq.command.JournalQueueAck; -import org.activemq.command.JournalTopicAck; -import org.activemq.command.JournalTrace; -import org.activemq.command.JournalTransaction; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.memory.UsageListener; -import org.activemq.memory.UsageManager; -import org.activemq.openwire.OpenWireFormat; -import org.activemq.store.MessageStore; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.TopicMessageStore; -import org.activemq.store.TransactionStore; -import org.activemq.store.jdbc.JDBCPersistenceAdapter; -import org.activemq.store.journal.JournalTransactionStore.Tx; -import org.activemq.store.journal.JournalTransactionStore.TxOperation; -import org.activemq.thread.Scheduler; -import org.activemq.thread.Task; -import org.activemq.thread.TaskRunner; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.DataStructure; +import org.apache.activemq.command.JournalQueueAck; +import org.apache.activemq.command.JournalTopicAck; +import org.apache.activemq.command.JournalTrace; +import org.apache.activemq.command.JournalTransaction; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.memory.UsageListener; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.store.TransactionStore; +import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter; +import org.apache.activemq.store.journal.JournalTransactionStore.Tx; +import org.apache.activemq.store.journal.JournalTransactionStore.TxOperation; +import org.apache.activemq.thread.Scheduler; +import org.apache.activemq.thread.Task; +import org.apache.activemq.thread.TaskRunner; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.util.IOExceptionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -261,7 +261,7 @@ public class JournalPersistenceAdapter implements PersistenceAdapter, JournalEve * The Journal give us a call back so that we can move old data out of the * journal. Taking a checkpoint does this for us. * - * @see org.activemq.journal.JournalEventListener#overflowNotification(org.activemq.journal.RecordLocation) + * @see org.apache.activemq.journal.JournalEventListener#overflowNotification(org.apache.activemq.journal.RecordLocation) */ public void overflowNotification(RecordLocation safeLocation) { checkpoint(false, true); diff --git a/activemq-core/src/main/java/org/activemq/store/journal/JournalTopicMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/store/journal/JournalTopicMessageStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java index cd6093b773..39d8df8c23 100755 --- a/activemq-core/src/main/java/org/activemq/store/journal/JournalTopicMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.HashMap; import java.util.Iterator; import org.activeio.journal.RecordLocation; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.JournalTopicAck; -import org.activemq.command.Message; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.TopicMessageStore; -import org.activemq.transaction.Synchronization; -import org.activemq.util.Callback; -import org.activemq.util.SubscriptionKey; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.JournalTopicAck; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.transaction.Synchronization; +import org.apache.activemq.util.Callback; +import org.apache.activemq.util.SubscriptionKey; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/store/journal/JournalTransactionStore.java b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTransactionStore.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/store/journal/JournalTransactionStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTransactionStore.java index b113d0a238..1ec7d4d2c1 100755 --- a/activemq-core/src/main/java/org/activemq/store/journal/JournalTransactionStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTransactionStore.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.ArrayList; @@ -24,14 +24,14 @@ import java.util.Iterator; import javax.transaction.xa.XAException; import org.activeio.journal.RecordLocation; -import org.activemq.command.JournalTopicAck; -import org.activemq.command.JournalTransaction; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.TransactionId; -import org.activemq.command.XATransactionId; -import org.activemq.store.TransactionRecoveryListener; -import org.activemq.store.TransactionStore; +import org.apache.activemq.command.JournalTopicAck; +import org.apache.activemq.command.JournalTransaction; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.XATransactionId; +import org.apache.activemq.store.TransactionRecoveryListener; +import org.apache.activemq.store.TransactionStore; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; @@ -125,7 +125,7 @@ public class JournalTransactionStore implements TransactionStore { /** * @throws IOException - * @see org.activemq.store.TransactionStore#prepare(TransactionId) + * @see org.apache.activemq.store.TransactionStore#prepare(TransactionId) */ public void prepare(TransactionId txid) throws IOException { Tx tx = (Tx) inflightTransactions.remove(txid); @@ -137,7 +137,7 @@ public class JournalTransactionStore implements TransactionStore { /** * @throws IOException - * @see org.activemq.store.TransactionStore#prepare(TransactionId) + * @see org.apache.activemq.store.TransactionStore#prepare(TransactionId) */ public void replayPrepare(TransactionId txid) throws IOException { Tx tx = (Tx) inflightTransactions.remove(txid); @@ -157,7 +157,7 @@ public class JournalTransactionStore implements TransactionStore { /** * @throws XAException - * @see org.activemq.store.TransactionStore#commit(org.activemq.service.Transaction) + * @see org.apache.activemq.store.TransactionStore#commit(org.apache.activemq.service.Transaction) */ public void commit(TransactionId txid, boolean wasPrepared) throws IOException { Tx tx; @@ -181,7 +181,7 @@ public class JournalTransactionStore implements TransactionStore { /** * @throws XAException - * @see org.activemq.store.TransactionStore#commit(org.activemq.service.Transaction) + * @see org.apache.activemq.store.TransactionStore#commit(org.apache.activemq.service.Transaction) */ public Tx replayCommit(TransactionId txid, boolean wasPrepared) throws IOException { if (wasPrepared) { @@ -193,7 +193,7 @@ public class JournalTransactionStore implements TransactionStore { /** * @throws IOException - * @see org.activemq.store.TransactionStore#rollback(TransactionId) + * @see org.apache.activemq.store.TransactionStore#rollback(TransactionId) */ public void rollback(TransactionId txid) throws IOException { @@ -215,7 +215,7 @@ public class JournalTransactionStore implements TransactionStore { /** * @throws IOException - * @see org.activemq.store.TransactionStore#rollback(TransactionId) + * @see org.apache.activemq.store.TransactionStore#rollback(TransactionId) */ public void replayRollback(TransactionId txid) throws IOException { if (inflightTransactions.remove(txid) != null) diff --git a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalMessageData.java b/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageData.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/store/journal/QuickJournalMessageData.java rename to activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageData.java index 93a7f7d455..f92db4d0f1 100644 --- a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalMessageData.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageData.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import org.activeio.journal.RecordLocation; -import org.activemq.command.Message; -import org.activemq.command.MessageId; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; public class QuickJournalMessageData { public final MessageId messageId; diff --git a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/store/journal/QuickJournalMessageStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java index 459e8f03ac..0b24952e58 100755 --- a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java @@ -16,7 +16,7 @@ * limitations under the License. * **/ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.ArrayList; @@ -27,18 +27,18 @@ import java.util.LinkedHashMap; import org.activeio.journal.RecordLocation; import org.activeio.journal.active.Location; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.JournalQueueAck; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.MessageStore; -import org.activemq.store.PersistenceAdapter; -import org.activemq.transaction.Synchronization; -import org.activemq.util.Callback; -import org.activemq.util.TransactionTemplate; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.JournalQueueAck; +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.PersistenceAdapter; +import org.apache.activemq.transaction.Synchronization; +import org.apache.activemq.util.Callback; +import org.apache.activemq.util.TransactionTemplate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -381,7 +381,7 @@ public class QuickJournalMessageStore implements MessageStore { } /** - * @see org.activemq.store.MessageStore#removeAllMessages(ConnectionContext) + * @see org.apache.activemq.store.MessageStore#removeAllMessages(ConnectionContext) */ public void removeAllMessages(ConnectionContext context) throws IOException { peristenceAdapter.checkpoint(true, true); diff --git a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/store/journal/QuickJournalPersistenceAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java index 97e85d9c76..d1552be2ea 100755 --- a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalPersistenceAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.ArrayList; @@ -26,32 +26,32 @@ import org.activeio.journal.InvalidRecordLocationException; import org.activeio.journal.Journal; import org.activeio.journal.JournalEventListener; import org.activeio.journal.RecordLocation; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.DataStructure; -import org.activemq.command.JournalQueueAck; -import org.activemq.command.JournalTopicAck; -import org.activemq.command.JournalTrace; -import org.activemq.command.JournalTransaction; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.memory.UsageListener; -import org.activemq.memory.UsageManager; -import org.activemq.openwire.OpenWireFormat; -import org.activemq.store.MessageStore; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.TopicMessageStore; -import org.activemq.store.TransactionStore; -import org.activemq.store.jdbc.JDBCPersistenceAdapter; -import org.activemq.store.journal.QuickJournalTransactionStore.Tx; -import org.activemq.store.journal.QuickJournalTransactionStore.TxOperation; -import org.activemq.thread.Scheduler; -import org.activemq.thread.Task; -import org.activemq.thread.TaskRunner; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.DataStructure; +import org.apache.activemq.command.JournalQueueAck; +import org.apache.activemq.command.JournalTopicAck; +import org.apache.activemq.command.JournalTrace; +import org.apache.activemq.command.JournalTransaction; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.memory.UsageListener; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.store.TransactionStore; +import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter; +import org.apache.activemq.store.journal.QuickJournalTransactionStore.Tx; +import org.apache.activemq.store.journal.QuickJournalTransactionStore.TxOperation; +import org.apache.activemq.thread.Scheduler; +import org.apache.activemq.thread.Task; +import org.apache.activemq.thread.TaskRunner; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.util.IOExceptionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -261,7 +261,7 @@ public class QuickJournalPersistenceAdapter implements PersistenceAdapter, Journ * The Journal give us a call back so that we can move old data out of the * journal. Taking a checkpoint does this for us. * - * @see org.activemq.journal.JournalEventListener#overflowNotification(org.activemq.journal.RecordLocation) + * @see org.apache.activemq.journal.JournalEventListener#overflowNotification(org.apache.activemq.journal.RecordLocation) */ public void overflowNotification(RecordLocation safeLocation) { checkpoint(false, true); diff --git a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTopicMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTopicMessageStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java index 71ad299cc0..1398f47ec3 100755 --- a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTopicMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.HashMap; import java.util.Iterator; import org.activeio.journal.RecordLocation; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.JournalTopicAck; -import org.activemq.command.Message; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.TopicMessageStore; -import org.activemq.transaction.Synchronization; -import org.activemq.util.Callback; -import org.activemq.util.SubscriptionKey; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.JournalTopicAck; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.transaction.Synchronization; +import org.apache.activemq.util.Callback; +import org.apache.activemq.util.SubscriptionKey; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTransactionStore.java b/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTransactionStore.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTransactionStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTransactionStore.java index 282d043643..cfbd733872 100755 --- a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTransactionStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTransactionStore.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.ArrayList; @@ -23,14 +23,14 @@ import java.util.Iterator; import javax.transaction.xa.XAException; import org.activeio.journal.RecordLocation; -import org.activemq.command.JournalTopicAck; -import org.activemq.command.JournalTransaction; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.TransactionId; -import org.activemq.command.XATransactionId; -import org.activemq.store.TransactionRecoveryListener; -import org.activemq.store.TransactionStore; +import org.apache.activemq.command.JournalTopicAck; +import org.apache.activemq.command.JournalTransaction; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.XATransactionId; +import org.apache.activemq.store.TransactionRecoveryListener; +import org.apache.activemq.store.TransactionStore; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; @@ -126,7 +126,7 @@ public class QuickJournalTransactionStore implements TransactionStore { /** * @throws IOException - * @see org.activemq.store.TransactionStore#prepare(TransactionId) + * @see org.apache.activemq.store.TransactionStore#prepare(TransactionId) */ public void prepare(TransactionId txid) throws IOException { Tx tx = (Tx) inflightTransactions.remove(txid); @@ -138,7 +138,7 @@ public class QuickJournalTransactionStore implements TransactionStore { /** * @throws IOException - * @see org.activemq.store.TransactionStore#prepare(TransactionId) + * @see org.apache.activemq.store.TransactionStore#prepare(TransactionId) */ public void replayPrepare(TransactionId txid) throws IOException { Tx tx = (Tx) inflightTransactions.remove(txid); @@ -158,7 +158,7 @@ public class QuickJournalTransactionStore implements TransactionStore { /** * @throws XAException - * @see org.activemq.store.TransactionStore#commit(org.activemq.service.Transaction) + * @see org.apache.activemq.store.TransactionStore#commit(org.apache.activemq.service.Transaction) */ public void commit(TransactionId txid, boolean wasPrepared) throws IOException { Tx tx; @@ -182,7 +182,7 @@ public class QuickJournalTransactionStore implements TransactionStore { /** * @throws XAException - * @see org.activemq.store.TransactionStore#commit(org.activemq.service.Transaction) + * @see org.apache.activemq.store.TransactionStore#commit(org.apache.activemq.service.Transaction) */ public Tx replayCommit(TransactionId txid, boolean wasPrepared) throws IOException { if (wasPrepared) { @@ -194,7 +194,7 @@ public class QuickJournalTransactionStore implements TransactionStore { /** * @throws IOException - * @see org.activemq.store.TransactionStore#rollback(TransactionId) + * @see org.apache.activemq.store.TransactionStore#rollback(TransactionId) */ public void rollback(TransactionId txid) throws IOException { @@ -216,7 +216,7 @@ public class QuickJournalTransactionStore implements TransactionStore { /** * @throws IOException - * @see org.activemq.store.TransactionStore#rollback(TransactionId) + * @see org.apache.activemq.store.TransactionStore#rollback(TransactionId) */ public void replayRollback(TransactionId txid) throws IOException { if (inflightTransactions.remove(txid) != null) diff --git a/activemq-core/src/main/java/org/activemq/store/journal/package.html b/activemq-core/src/main/java/org/apache/activemq/store/journal/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/store/journal/package.html rename to activemq-core/src/main/java/org/apache/activemq/store/journal/package.html diff --git a/activemq-core/src/main/java/org/activemq/store/memory/MemoryMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java similarity index 86% rename from activemq-core/src/main/java/org/activemq/store/memory/MemoryMessageStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java index dcd82c44aa..b94375fa0a 100755 --- a/activemq-core/src/main/java/org/activemq/store/memory/MemoryMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.memory; +package org.apache.activemq.store.memory; import java.io.IOException; import java.util.Collections; @@ -22,16 +22,16 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.MessageStore; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +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; /** - * An implementation of {@link org.activemq.store.MessageStore} which uses a + * An implementation of {@link org.apache.activemq.store.MessageStore} which uses a * * @version $Revision: 1.7 $ */ diff --git a/activemq-core/src/main/java/org/activemq/store/memory/MemoryPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/store/memory/MemoryPersistenceAdapter.java rename to activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java index 866204fbee..ba694b90ce 100755 --- a/activemq-core/src/main/java/org/activemq/store/memory/MemoryPersistenceAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.memory; +package org.apache.activemq.store.memory; import java.io.File; import java.io.IOException; @@ -22,13 +22,13 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.store.MessageStore; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.TopicMessageStore; -import org.activemq.store.TransactionStore; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.store.TransactionStore; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/store/memory/MemoryTopicMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java similarity index 87% rename from activemq-core/src/main/java/org/activemq/store/memory/MemoryTopicMessageStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java index 172b109f1a..f54b0078a2 100755 --- a/activemq-core/src/main/java/org/activemq/store/memory/MemoryTopicMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.memory; +package org.apache.activemq.store.memory; import java.io.IOException; import java.util.Collections; @@ -24,14 +24,14 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.TopicMessageStore; -import org.activemq.util.SubscriptionKey; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.util.SubscriptionKey; /** * @version $Revision: 1.5 $ @@ -83,7 +83,7 @@ public class MemoryTopicMessageStore extends MemoryMessageStore implements Topic } public void deleteSubscription(String clientId, String subscriptionName) { - org.activemq.util.SubscriptionKey key = new SubscriptionKey(clientId, subscriptionName); + org.apache.activemq.util.SubscriptionKey key = new SubscriptionKey(clientId, subscriptionName); ackDatabase.remove(key); subscriberDatabase.remove(key); } diff --git a/activemq-core/src/main/java/org/activemq/store/memory/MemoryTransactionStore.java b/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java similarity index 89% rename from activemq-core/src/main/java/org/activemq/store/memory/MemoryTransactionStore.java rename to activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java index be3d3b707d..a05a67019c 100755 --- a/activemq-core/src/main/java/org/activemq/store/memory/MemoryTransactionStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.memory; +package org.apache.activemq.store.memory; import java.io.IOException; import java.util.ArrayList; @@ -22,17 +22,17 @@ import java.util.Iterator; import javax.transaction.xa.XAException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.TransactionId; -import org.activemq.command.XATransactionId; -import org.activemq.store.MessageStore; -import org.activemq.store.ProxyMessageStore; -import org.activemq.store.ProxyTopicMessageStore; -import org.activemq.store.TopicMessageStore; -import org.activemq.store.TransactionRecoveryListener; -import org.activemq.store.TransactionStore; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.XATransactionId; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.ProxyMessageStore; +import org.apache.activemq.store.ProxyTopicMessageStore; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.store.TransactionRecoveryListener; +import org.apache.activemq.store.TransactionStore; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; @@ -134,7 +134,7 @@ public class MemoryTransactionStore implements TransactionStore { } /** - * @see org.activemq.store.TransactionStore#prepare(TransactionId) + * @see org.apache.activemq.store.TransactionStore#prepare(TransactionId) */ public void prepare(TransactionId txid) { Tx tx = (Tx) inflightTransactions.remove(txid); @@ -154,7 +154,7 @@ public class MemoryTransactionStore implements TransactionStore { /** * @throws XAException - * @see org.activemq.store.TransactionStore#commit(org.activemq.service.Transaction) + * @see org.apache.activemq.store.TransactionStore#commit(org.apache.activemq.service.Transaction) */ public void commit(TransactionId txid, boolean wasPrepared) throws IOException { @@ -172,7 +172,7 @@ public class MemoryTransactionStore implements TransactionStore { } /** - * @see org.activemq.store.TransactionStore#rollback(TransactionId) + * @see org.apache.activemq.store.TransactionStore#rollback(TransactionId) */ public void rollback(TransactionId txid) { preparedTransactions.remove(txid); diff --git a/activemq-core/src/main/java/org/activemq/store/memory/package.html b/activemq-core/src/main/java/org/apache/activemq/store/memory/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/store/memory/package.html rename to activemq-core/src/main/java/org/apache/activemq/store/memory/package.html diff --git a/activemq-core/src/main/java/org/activemq/store/package.html b/activemq-core/src/main/java/org/apache/activemq/store/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/store/package.html rename to activemq-core/src/main/java/org/apache/activemq/store/package.html diff --git a/activemq-core/src/main/java/org/activemq/thread/DefaultThreadPools.java b/activemq-core/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/thread/DefaultThreadPools.java rename to activemq-core/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java index 1c9e26c861..4daa35a942 100755 --- a/activemq-core/src/main/java/org/activemq/thread/DefaultThreadPools.java +++ b/activemq-core/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.thread; +package org.apache.activemq.thread; import edu.emory.mathcs.backport.java.util.concurrent.Executor; import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor; diff --git a/activemq-core/src/main/java/org/activemq/thread/Scheduler.java b/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/thread/Scheduler.java rename to activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java index f4ba77fc53..82c72ec4b1 100755 --- a/activemq-core/src/main/java/org/activemq/thread/Scheduler.java +++ b/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.thread; +package org.apache.activemq.thread; import java.util.HashMap; diff --git a/activemq-core/src/main/java/org/activemq/thread/SimpleTaskRunner.java b/activemq-core/src/main/java/org/apache/activemq/thread/SimpleTaskRunner.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/thread/SimpleTaskRunner.java rename to activemq-core/src/main/java/org/apache/activemq/thread/SimpleTaskRunner.java index 9060ab1321..0b65c73309 100644 --- a/activemq-core/src/main/java/org/activemq/thread/SimpleTaskRunner.java +++ b/activemq-core/src/main/java/org/apache/activemq/thread/SimpleTaskRunner.java @@ -33,7 +33,7 @@ * **/ -package org.activemq.thread; +package org.apache.activemq.thread; import edu.emory.mathcs.backport.java.util.concurrent.Executor; diff --git a/activemq-core/src/main/java/org/activemq/thread/Task.java b/activemq-core/src/main/java/org/apache/activemq/thread/Task.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/thread/Task.java rename to activemq-core/src/main/java/org/apache/activemq/thread/Task.java index 0eafd05789..cbfbd338f0 100755 --- a/activemq-core/src/main/java/org/activemq/thread/Task.java +++ b/activemq-core/src/main/java/org/apache/activemq/thread/Task.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.thread; +package org.apache.activemq.thread; /** * Represents a task that may take a few iterations to complete. diff --git a/activemq-core/src/main/java/org/activemq/thread/TaskRunner.java b/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunner.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/thread/TaskRunner.java rename to activemq-core/src/main/java/org/apache/activemq/thread/TaskRunner.java index 15b4656966..1f9df60b5d 100755 --- a/activemq-core/src/main/java/org/activemq/thread/TaskRunner.java +++ b/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunner.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.thread; +package org.apache.activemq.thread; /** * Allows you to request a thread execute the associated Task. diff --git a/activemq-core/src/main/java/org/activemq/thread/TaskRunnerFactory.java b/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/thread/TaskRunnerFactory.java rename to activemq-core/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java index c2eb5642c0..d92c1c908b 100755 --- a/activemq-core/src/main/java/org/activemq/thread/TaskRunnerFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.thread; +package org.apache.activemq.thread; import edu.emory.mathcs.backport.java.util.concurrent.Executor; import edu.emory.mathcs.backport.java.util.concurrent.SynchronousQueue; diff --git a/activemq-core/src/main/java/org/activemq/thread/Valve.java b/activemq-core/src/main/java/org/apache/activemq/thread/Valve.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/thread/Valve.java rename to activemq-core/src/main/java/org/apache/activemq/thread/Valve.java index 5d5c532d2c..7d33d86ba3 100755 --- a/activemq-core/src/main/java/org/activemq/thread/Valve.java +++ b/activemq-core/src/main/java/org/apache/activemq/thread/Valve.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.thread; +package org.apache.activemq.thread; /** * A Valve is a synchronization object used enable or disable the "flow" of concurrent diff --git a/activemq-core/src/main/java/org/activemq/transaction/LocalTransaction.java b/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/transaction/LocalTransaction.java rename to activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java index af5d396045..9e09027952 100755 --- a/activemq-core/src/main/java/org/activemq/transaction/LocalTransaction.java +++ b/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transaction; +package org.apache.activemq.transaction; import java.io.IOException; import javax.transaction.xa.XAException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.LocalTransactionId; -import org.activemq.command.TransactionId; -import org.activemq.store.TransactionStore; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.LocalTransactionId; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.store.TransactionStore; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/transaction/Synchronization.java b/activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transaction/Synchronization.java rename to activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java index e4d670e8c9..01e964fbf1 100755 --- a/activemq-core/src/main/java/org/activemq/transaction/Synchronization.java +++ b/activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transaction; +package org.apache.activemq.transaction; /** * diff --git a/activemq-core/src/main/java/org/activemq/transaction/Transaction.java b/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/transaction/Transaction.java rename to activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java index 695270167d..2a90daf04b 100755 --- a/activemq-core/src/main/java/org/activemq/transaction/Transaction.java +++ b/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transaction; +package org.apache.activemq.transaction; import java.io.IOException; import java.util.ArrayList; @@ -22,7 +22,7 @@ import java.util.Iterator; import javax.transaction.xa.XAException; -import org.activemq.command.TransactionId; +import org.apache.activemq.command.TransactionId; /** * Keeps track of all the actions the need to be done when diff --git a/activemq-core/src/main/java/org/activemq/transaction/XATransaction.java b/activemq-core/src/main/java/org/apache/activemq/transaction/XATransaction.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/transaction/XATransaction.java rename to activemq-core/src/main/java/org/apache/activemq/transaction/XATransaction.java index 94316bebc5..a3c66e9b26 100755 --- a/activemq-core/src/main/java/org/activemq/transaction/XATransaction.java +++ b/activemq-core/src/main/java/org/apache/activemq/transaction/XATransaction.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transaction; +package org.apache.activemq.transaction; import java.io.IOException; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; -import org.activemq.broker.TransactionBroker; -import org.activemq.command.TransactionId; -import org.activemq.command.XATransactionId; -import org.activemq.store.TransactionStore; +import org.apache.activemq.broker.TransactionBroker; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.XATransactionId; +import org.apache.activemq.store.TransactionStore; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/CompositeTransport.java b/activemq-core/src/main/java/org/apache/activemq/transport/CompositeTransport.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/CompositeTransport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/CompositeTransport.java index 793816ba65..64695c4baf 100644 --- a/activemq-core/src/main/java/org/activemq/transport/CompositeTransport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/CompositeTransport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.net.URI; diff --git a/activemq-core/src/main/java/org/activemq/transport/FutureResponse.java b/activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/transport/FutureResponse.java rename to activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java index 732c1ae2fe..cb0f096ae8 100755 --- a/activemq-core/src/main/java/org/activemq/transport/FutureResponse.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import edu.emory.mathcs.backport.java.util.concurrent.Callable; import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException; import edu.emory.mathcs.backport.java.util.concurrent.FutureTask; -import org.activemq.command.Response; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.command.Response; +import org.apache.activemq.util.IOExceptionSupport; import java.io.IOException; import java.io.InterruptedIOException; diff --git a/activemq-core/src/main/java/org/activemq/transport/InactivityIOException.java b/activemq-core/src/main/java/org/apache/activemq/transport/InactivityIOException.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/transport/InactivityIOException.java rename to activemq-core/src/main/java/org/apache/activemq/transport/InactivityIOException.java index cb5ee8df9f..d41ee2c4f4 100644 --- a/activemq-core/src/main/java/org/activemq/transport/InactivityIOException.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/InactivityIOException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/transport/InactivityMonitor.java b/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/transport/InactivityMonitor.java rename to activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java index 53023a8706..ffffb71f0b 100755 --- a/activemq-core/src/main/java/org/activemq/transport/InactivityMonitor.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.io.IOException; -import org.activemq.command.KeepAliveInfo; -import org.activemq.management.CountStatisticImpl; -import org.activemq.thread.Scheduler; +import org.apache.activemq.command.KeepAliveInfo; +import org.apache.activemq.management.CountStatisticImpl; +import org.apache.activemq.thread.Scheduler; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; diff --git a/activemq-core/src/main/java/org/activemq/transport/MarshallingTransportFilter.java b/activemq-core/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/transport/MarshallingTransportFilter.java rename to activemq-core/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java index 6f7c68ad14..f48f391e81 100755 --- a/activemq-core/src/main/java/org/activemq/transport/MarshallingTransportFilter.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.io.IOException; import org.activeio.command.WireFormat; -import org.activemq.command.Command; +import org.apache.activemq.command.Command; public class MarshallingTransportFilter extends TransportFilter { diff --git a/activemq-core/src/main/java/org/activemq/transport/MutexTransport.java b/activemq-core/src/main/java/org/apache/activemq/transport/MutexTransport.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/transport/MutexTransport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/MutexTransport.java index 26df06f615..07188ed6fe 100755 --- a/activemq-core/src/main/java/org/activemq/transport/MutexTransport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/MutexTransport.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.io.IOException; -import org.activemq.command.Command; -import org.activemq.command.Response; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; /** diff --git a/activemq-core/src/main/java/org/activemq/transport/ResponseCorrelator.java b/activemq-core/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/ResponseCorrelator.java rename to activemq-core/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java index e98477a892..c23fe83c94 100755 --- a/activemq-core/src/main/java/org/activemq/transport/ResponseCorrelator.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.io.IOException; -import org.activemq.command.Command; -import org.activemq.command.Response; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/Transport.java b/activemq-core/src/main/java/org/apache/activemq/transport/Transport.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/transport/Transport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/Transport.java index c9d15313fe..9103549dd4 100755 --- a/activemq-core/src/main/java/org/activemq/transport/Transport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/Transport.java @@ -16,11 +16,11 @@ * limitations under the License. * **/ -package org.activemq.transport; +package org.apache.activemq.transport; -import org.activemq.Service; -import org.activemq.command.Command; -import org.activemq.command.Response; +import org.apache.activemq.Service; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportAcceptListener.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/TransportAcceptListener.java rename to activemq-core/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java index e78cdccdf5..4ce5f9350a 100755 --- a/activemq-core/src/main/java/org/activemq/transport/TransportAcceptListener.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java @@ -16,7 +16,7 @@ * limitations under the License. * **/ -package org.activemq.transport; +package org.apache.activemq.transport; public interface TransportAcceptListener { diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/TransportFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java index 93a63816c6..d77a227a3b 100755 --- a/activemq-core/src/main/java/org/activemq/transport/TransportFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; import edu.emory.mathcs.backport.java.util.concurrent.Executor; @@ -22,9 +22,9 @@ import edu.emory.mathcs.backport.java.util.concurrent.Executor; import org.activeio.FactoryFinder; import org.activeio.command.WireFormat; import org.activeio.command.WireFormatFactory; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.URISupport; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.URISupport; import java.io.IOException; import java.net.MalformedURLException; @@ -46,8 +46,8 @@ public abstract class TransportFactory { return doCompositeConnect(location); } - static final private FactoryFinder transportFactoryFinder = new FactoryFinder("META-INF/services/org/activemq/transport/"); - static final private FactoryFinder wireFormatFactoryFinder = new FactoryFinder("META-INF/services/org/activemq/wireformat/"); + static final private FactoryFinder transportFactoryFinder = new FactoryFinder("META-INF/services/org/apache/activemq/transport/"); + static final private FactoryFinder wireFormatFactoryFinder = new FactoryFinder("META-INF/services/org/apache/activemq/wireformat/"); static final private ConcurrentHashMap transportFactorys = new ConcurrentHashMap(); diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportFilter.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportFilter.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/transport/TransportFilter.java rename to activemq-core/src/main/java/org/apache/activemq/transport/TransportFilter.java index d8dcc515d4..9235cf47fa 100755 --- a/activemq-core/src/main/java/org/activemq/transport/TransportFilter.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportFilter.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.io.IOException; -import org.activemq.command.Command; -import org.activemq.command.Response; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; /** @@ -46,7 +46,7 @@ public class TransportFilter implements Transport, TransportListener { /** - * @see org.activemq.Service#start() + * @see org.apache.activemq.Service#start() * @throws IOException if the next channel has not been set. */ public void start() throws Exception { @@ -58,7 +58,7 @@ public class TransportFilter implements Transport, TransportListener { } /** - * @see org.activemq.Service#stop() + * @see org.apache.activemq.Service#stop() */ public void stop() throws Exception { next.stop(); diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportListener.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportListener.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/transport/TransportListener.java rename to activemq-core/src/main/java/org/apache/activemq/transport/TransportListener.java index 57b8a2562d..1b1aebd93a 100755 --- a/activemq-core/src/main/java/org/activemq/transport/TransportListener.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportListener.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.io.IOException; -import org.activemq.command.Command; +import org.apache.activemq.command.Command; /** * An asynchronous listener of commands diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportLogger.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/transport/TransportLogger.java rename to activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java index c3148257d5..375c3fdc6a 100755 --- a/activemq-core/src/main/java/org/activemq/transport/TransportLogger.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.io.IOException; -import org.activemq.command.Command; +import org.apache.activemq.command.Command; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportServer.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportServer.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/transport/TransportServer.java rename to activemq-core/src/main/java/org/apache/activemq/transport/TransportServer.java index 8ee1ed55e2..af876bb917 100755 --- a/activemq-core/src/main/java/org/activemq/transport/TransportServer.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportServer.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.net.URI; -import org.activemq.Service; -import org.activemq.command.BrokerInfo; +import org.apache.activemq.Service; +import org.apache.activemq.command.BrokerInfo; /** diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportServerFilter.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerFilter.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/transport/TransportServerFilter.java rename to activemq-core/src/main/java/org/apache/activemq/transport/TransportServerFilter.java index 456e88d474..245e7b869e 100755 --- a/activemq-core/src/main/java/org/activemq/transport/TransportServerFilter.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerFilter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.net.URI; -import org.activemq.command.BrokerInfo; +import org.apache.activemq.command.BrokerInfo; public class TransportServerFilter implements TransportServer { diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportServerSupport.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerSupport.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/transport/TransportServerSupport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/TransportServerSupport.java index ba2891127c..5b24ce1316 100644 --- a/activemq-core/src/main/java/org/activemq/transport/TransportServerSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.net.URI; diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportServerThreadSupport.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/TransportServerThreadSupport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java index 24a2c077d8..fb09d86cd2 100644 --- a/activemq-core/src/main/java/org/activemq/transport/TransportServerThreadSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; -import org.activemq.ThreadPriorities; -import org.activemq.util.ServiceStopper; +import org.apache.activemq.ThreadPriorities; +import org.apache.activemq.util.ServiceStopper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportSupport.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/TransportSupport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java index 0e1d225bce..f4215fd3e7 100644 --- a/activemq-core/src/main/java/org/activemq/transport/TransportSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; -import org.activemq.command.Command; -import org.activemq.command.Response; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportThreadSupport.java b/activemq-core/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/transport/TransportThreadSupport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java index fcfc0e2e2b..708c53ec8b 100644 --- a/activemq-core/src/main/java/org/activemq/transport/TransportThreadSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; -import org.activemq.util.ServiceStopper; +import org.apache.activemq.util.ServiceStopper; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; diff --git a/activemq-core/src/main/java/org/activemq/transport/WireFormatNegotiator.java b/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/WireFormatNegotiator.java rename to activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java index 7efac2ec47..b30480e292 100755 --- a/activemq-core/src/main/java/org/activemq/transport/WireFormatNegotiator.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.io.IOException; import java.io.InterruptedIOException; import org.activeio.command.WireFormat; -import org.activemq.command.Command; -import org.activemq.command.WireFormatInfo; -import org.activemq.openwire.OpenWireFormat; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.WireFormatInfo; +import org.apache.activemq.openwire.OpenWireFormat; import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch; diff --git a/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransport.java b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java index 933c26f76b..e2bf8f9e6e 100755 --- a/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.activeio; +package org.apache.activemq.transport.activeio; import java.io.IOException; import java.net.SocketException; import org.activeio.command.AsyncCommandChannel; import org.activeio.net.SocketMetadata; -import org.activemq.command.Command; -import org.activemq.command.Response; -import org.activemq.command.WireFormatInfo; -import org.activemq.management.CountStatisticImpl; -import org.activemq.transport.FutureResponse; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportListener; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; +import org.apache.activemq.command.WireFormatInfo; +import org.apache.activemq.management.CountStatisticImpl; +import org.apache.activemq.transport.FutureResponse; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportListener; /** * An implementation of the {@link Transport} interface using ActiveIO diff --git a/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportFactory.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportFactory.java index 6e57fbd790..436c43f3c8 100755 --- a/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.activeio; +package org.apache.activemq.transport.activeio; import java.io.IOException; import java.net.URI; @@ -29,17 +29,17 @@ import org.activeio.adapter.SyncToAsyncChannel; import org.activeio.command.AsyncChannelToAsyncCommandChannel; import org.activeio.command.WireFormat; import org.activeio.net.SocketMetadata; -import org.activemq.transport.InactivityMonitor; -import org.activemq.transport.MutexTransport; -import org.activemq.transport.ResponseCorrelator; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportLogger; -import org.activemq.transport.TransportServer; -import org.activemq.transport.WireFormatNegotiator; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.URISupport; +import org.apache.activemq.transport.InactivityMonitor; +import org.apache.activemq.transport.MutexTransport; +import org.apache.activemq.transport.ResponseCorrelator; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportLogger; +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; import edu.emory.mathcs.backport.java.util.concurrent.Executor; diff --git a/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportServer.java b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportServer.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportServer.java rename to activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportServer.java index 5ef4bbc788..5e27910737 100755 --- a/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportServer.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportServer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.activeio; +package org.apache.activemq.transport.activeio; import java.io.IOException; import java.net.URI; @@ -26,11 +26,11 @@ import org.activeio.Channel; import org.activeio.ChannelFactory; import org.activeio.command.WireFormat; import org.activeio.command.WireFormatFactory; -import org.activemq.ThreadPriorities; -import org.activemq.command.BrokerInfo; -import org.activemq.openwire.OpenWireFormatFactory; -import org.activemq.transport.TransportAcceptListener; -import org.activemq.transport.TransportServer; +import org.apache.activemq.ThreadPriorities; +import org.apache.activemq.command.BrokerInfo; +import org.apache.activemq.openwire.OpenWireFormatFactory; +import org.apache.activemq.transport.TransportAcceptListener; +import org.apache.activemq.transport.TransportServer; import edu.emory.mathcs.backport.java.util.concurrent.Executor; import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor; diff --git a/activemq-core/src/main/java/org/activemq/transport/activeio/ActivityMonitor.java b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActivityMonitor.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/transport/activeio/ActivityMonitor.java rename to activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActivityMonitor.java index 36dea4f707..408cb49962 100755 --- a/activemq-core/src/main/java/org/activemq/transport/activeio/ActivityMonitor.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActivityMonitor.java @@ -16,14 +16,14 @@ * limitations under the License. * **/ -package org.activemq.transport.activeio; +package org.apache.activemq.transport.activeio; import java.io.IOException; import org.activeio.AsyncChannel; import org.activeio.FilterAsyncChannel; import org.activeio.Packet; -import org.activemq.management.CountStatisticImpl; +import org.apache.activemq.management.CountStatisticImpl; /** * Used to make sure that commands are arriving periodically from the peer of the transport. diff --git a/activemq-core/src/main/java/org/activemq/transport/activeio/PacketAggregatingAsyncChannel.java b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/PacketAggregatingAsyncChannel.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/activeio/PacketAggregatingAsyncChannel.java rename to activemq-core/src/main/java/org/apache/activemq/transport/activeio/PacketAggregatingAsyncChannel.java index a449fc1dbe..925eb656a0 100644 --- a/activemq-core/src/main/java/org/activemq/transport/activeio/PacketAggregatingAsyncChannel.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/PacketAggregatingAsyncChannel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.activeio; +package org.apache.activemq.transport.activeio; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/transport/activeio/package.html b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/transport/activeio/package.html rename to activemq-core/src/main/java/org/apache/activemq/transport/activeio/package.html diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgent.java b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgent.java rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java index 9acce015fb..7a61802315 100755 --- a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgent.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.discovery; +package org.apache.activemq.transport.discovery; import java.io.IOException; import javax.jms.JMSException; -import org.activemq.Service; -import org.activemq.command.DiscoveryEvent; +import org.apache.activemq.Service; +import org.apache.activemq.command.DiscoveryEvent; /** * An agent used to discover other instances of a service. diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgentFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgentFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java index afbc71249d..58c5dbc205 100755 --- a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgentFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.discovery; +package org.apache.activemq.transport.discovery; import java.io.IOException; import java.net.URI; import org.activeio.FactoryFinder; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IOExceptionSupport; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; public abstract class DiscoveryAgentFactory { - static final private FactoryFinder discoveryAgentFinder = new FactoryFinder("META-INF/services/org/activemq/transport/discoveryagent/"); + static final private FactoryFinder discoveryAgentFinder = new FactoryFinder("META-INF/services/org/apache/activemq/transport/discoveryagent/"); static final private ConcurrentHashMap discoveryAgentFactorys = new ConcurrentHashMap(); /** diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryListener.java b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryListener.java rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java index 7fd6361fbb..a9802830e8 100755 --- a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryListener.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java @@ -16,9 +16,9 @@ * limitations under the License. * **/ -package org.activemq.transport.discovery; +package org.apache.activemq.transport.discovery; -import org.activemq.command.DiscoveryEvent; +import org.apache.activemq.command.DiscoveryEvent; /** * A listener of services being added or removed from a network diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryTransport.java b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryTransport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java index 57432ef13a..e97e06daa4 100755 --- a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryTransport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java @@ -16,15 +16,15 @@ * limitations under the License. * **/ -package org.activemq.transport.discovery; +package org.apache.activemq.transport.discovery; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import org.activemq.command.DiscoveryEvent; -import org.activemq.transport.CompositeTransport; -import org.activemq.transport.TransportFilter; +import org.apache.activemq.command.DiscoveryEvent; +import org.apache.activemq.transport.CompositeTransport; +import org.apache.activemq.transport.TransportFilter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryTransportFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransportFactory.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryTransportFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransportFactory.java index 7e86b82cac..8871bc39bb 100755 --- a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryTransportFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransportFactory.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.discovery; +package org.apache.activemq.transport.discovery; import java.io.IOException; import java.net.URI; import java.util.HashMap; import java.util.Map; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportServer; -import org.activemq.transport.failover.FailoverTransportFactory; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.URISupport.CompositeData; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportServer; +import org.apache.activemq.transport.failover.FailoverTransportFactory; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.URISupport.CompositeData; /** * @version $Revision$ diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java index e461587c90..13e6fef3fc 100755 --- a/activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.discovery.multicast; +package org.apache.activemq.transport.discovery.multicast; import java.io.IOException; import java.net.DatagramPacket; @@ -26,9 +26,10 @@ import java.net.SocketTimeoutException; import java.net.URI; import java.util.Iterator; import java.util.Map; -import org.activemq.command.DiscoveryEvent; -import org.activemq.transport.discovery.DiscoveryAgent; -import org.activemq.transport.discovery.DiscoveryListener; + +import org.apache.activemq.command.DiscoveryEvent; +import org.apache.activemq.transport.discovery.DiscoveryAgent; +import org.apache.activemq.transport.discovery.DiscoveryListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java similarity index 78% rename from activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java index 60a3e4e300..2d91ccc166 100755 --- a/activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.discovery.multicast; +package org.apache.activemq.transport.discovery.multicast; import java.io.IOException; import java.net.URI; import java.util.Map; -import org.activemq.transport.discovery.DiscoveryAgent; -import org.activemq.transport.discovery.DiscoveryAgentFactory; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.URISupport; +import org.apache.activemq.transport.discovery.DiscoveryAgent; +import org.apache.activemq.transport.discovery.DiscoveryAgentFactory; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.URISupport; public class MulticastDiscoveryAgentFactory extends DiscoveryAgentFactory { diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/package.html b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/transport/discovery/package.html rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/package.html diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/JmDNSFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/JmDNSFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java index a412cd57f3..4ce2bedb6d 100644 --- a/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/JmDNSFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.discovery.rendezvous; +package org.apache.activemq.transport.discovery.rendezvous; import java.io.IOException; import java.net.InetAddress; diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java index 37aac92c81..7cde8d7d0e 100755 --- a/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.discovery.rendezvous; +package org.apache.activemq.transport.discovery.rendezvous; import java.io.IOException; import java.net.InetAddress; @@ -28,11 +28,11 @@ import javax.jmdns.ServiceEvent; import javax.jmdns.ServiceInfo; import javax.jmdns.ServiceListener; -import org.activemq.command.DiscoveryEvent; -import org.activemq.transport.discovery.DiscoveryAgent; -import org.activemq.transport.discovery.DiscoveryListener; -import org.activemq.util.JMSExceptionSupport; -import org.activemq.util.MapHelper; +import org.apache.activemq.command.DiscoveryEvent; +import org.apache.activemq.transport.discovery.DiscoveryAgent; +import org.apache.activemq.transport.discovery.DiscoveryListener; +import org.apache.activemq.util.JMSExceptionSupport; +import org.apache.activemq.util.MapHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java similarity index 78% rename from activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java index d10c8bca9a..c9f58c8fda 100755 --- a/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.discovery.rendezvous; +package org.apache.activemq.transport.discovery.rendezvous; import java.io.IOException; import java.net.URI; import java.util.Map; -import org.activemq.transport.discovery.DiscoveryAgent; -import org.activemq.transport.discovery.DiscoveryAgentFactory; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.URISupport; +import org.apache.activemq.transport.discovery.DiscoveryAgent; +import org.apache.activemq.transport.discovery.DiscoveryAgentFactory; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.URISupport; public class RendezvousDiscoveryAgentFactory extends DiscoveryAgentFactory { diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/package.html b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/package.html rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/package.html diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java index ed3cfd46a7..390187d5e4 100755 --- a/activemq-core/src/main/java/org/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.discovery.simple; +package org.apache.activemq.transport.discovery.simple; import java.io.IOException; import java.net.URI; -import org.activemq.command.DiscoveryEvent; -import org.activemq.transport.discovery.DiscoveryAgent; -import org.activemq.transport.discovery.DiscoveryListener; +import org.apache.activemq.command.DiscoveryEvent; +import org.apache.activemq.transport.discovery.DiscoveryAgent; +import org.apache.activemq.transport.discovery.DiscoveryListener; /** * A simple DiscoveryAgent that allows static configuration of the discovered services. diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java similarity index 79% rename from activemq-core/src/main/java/org/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java index 6fefc05098..f3910dfc3d 100755 --- a/activemq-core/src/main/java/org/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgentFactory.java @@ -16,18 +16,18 @@ * limitations under the License. * **/ -package org.activemq.transport.discovery.simple; +package org.apache.activemq.transport.discovery.simple; import java.io.IOException; import java.net.URI; import java.util.Map; -import org.activemq.transport.discovery.DiscoveryAgent; -import org.activemq.transport.discovery.DiscoveryAgentFactory; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.URISupport; -import org.activemq.util.URISupport.CompositeData; +import org.apache.activemq.transport.discovery.DiscoveryAgent; +import org.apache.activemq.transport.discovery.DiscoveryAgentFactory; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.URISupport; +import org.apache.activemq.util.URISupport.CompositeData; public class SimpleDiscoveryAgentFactory extends DiscoveryAgentFactory { diff --git a/activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransport.java b/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java index 8a85376d39..7abf2b80f6 100755 --- a/activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.failover; +package org.apache.activemq.transport.failover; import java.io.IOException; import java.io.InterruptedIOException; @@ -23,19 +23,19 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.Random; -import org.activemq.command.Command; -import org.activemq.command.Response; -import org.activemq.state.ConnectionStateTracker; -import org.activemq.thread.DefaultThreadPools; -import org.activemq.thread.Task; -import org.activemq.thread.TaskRunner; -import org.activemq.transport.CompositeTransport; -import org.activemq.transport.FutureResponse; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportListener; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.ServiceSupport; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; +import org.apache.activemq.state.ConnectionStateTracker; +import org.apache.activemq.thread.DefaultThreadPools; +import org.apache.activemq.thread.Task; +import org.apache.activemq.thread.TaskRunner; +import org.apache.activemq.transport.CompositeTransport; +import org.apache.activemq.transport.FutureResponse; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportListener; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.ServiceSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransportFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java similarity index 84% rename from activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransportFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java index 7b255551f5..cc19861e8c 100755 --- a/activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransportFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.failover; +package org.apache.activemq.transport.failover; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.Map; -import org.activemq.transport.MutexTransport; -import org.activemq.transport.ResponseCorrelator; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportServer; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.URISupport; -import org.activemq.util.URISupport.CompositeData; +import org.apache.activemq.transport.MutexTransport; +import org.apache.activemq.transport.ResponseCorrelator; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportServer; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.URISupport; +import org.apache.activemq.util.URISupport.CompositeData; public class FailoverTransportFactory extends TransportFactory { diff --git a/activemq-core/src/main/java/org/activemq/transport/failover/package.html b/activemq-core/src/main/java/org/apache/activemq/transport/failover/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/transport/failover/package.html rename to activemq-core/src/main/java/org/apache/activemq/transport/failover/package.html diff --git a/activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransport.java b/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java index 163220691b..18d54ca907 100755 --- a/activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.fanout; +package org.apache.activemq.transport.fanout; import java.io.IOException; import java.io.InterruptedIOException; @@ -22,21 +22,21 @@ import java.net.URI; import java.util.ArrayList; import java.util.Iterator; -import org.activemq.command.Command; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.Response; -import org.activemq.state.ConnectionStateTracker; -import org.activemq.thread.DefaultThreadPools; -import org.activemq.thread.Task; -import org.activemq.thread.TaskRunner; -import org.activemq.transport.CompositeTransport; -import org.activemq.transport.FutureResponse; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportListener; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.ServiceSupport; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.Response; +import org.apache.activemq.state.ConnectionStateTracker; +import org.apache.activemq.thread.DefaultThreadPools; +import org.apache.activemq.thread.Task; +import org.apache.activemq.thread.TaskRunner; +import org.apache.activemq.transport.CompositeTransport; +import org.apache.activemq.transport.FutureResponse; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportListener; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.ServiceSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransportFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java similarity index 80% rename from activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransportFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java index 4c605fdee8..045c3774a2 100755 --- a/activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransportFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.fanout; +package org.apache.activemq.transport.fanout; import java.io.IOException; import java.net.URI; @@ -22,17 +22,17 @@ import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; -import org.activemq.transport.MutexTransport; -import org.activemq.transport.ResponseCorrelator; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportServer; -import org.activemq.transport.discovery.DiscoveryAgent; -import org.activemq.transport.discovery.DiscoveryAgentFactory; -import org.activemq.transport.discovery.DiscoveryTransport; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.URISupport; -import org.activemq.util.URISupport.CompositeData; +import org.apache.activemq.transport.MutexTransport; +import org.apache.activemq.transport.ResponseCorrelator; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportServer; +import org.apache.activemq.transport.discovery.DiscoveryAgent; +import org.apache.activemq.transport.discovery.DiscoveryAgentFactory; +import org.apache.activemq.transport.discovery.DiscoveryTransport; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.URISupport; +import org.apache.activemq.util.URISupport.CompositeData; public class FanoutTransportFactory extends TransportFactory { diff --git a/activemq-core/src/main/java/org/activemq/transport/fanout/package.html b/activemq-core/src/main/java/org/apache/activemq/transport/fanout/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/transport/fanout/package.html rename to activemq-core/src/main/java/org/apache/activemq/transport/fanout/package.html diff --git a/activemq-core/src/main/java/org/activemq/transport/mock/MockTransport.java b/activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransport.java similarity index 87% rename from activemq-core/src/main/java/org/activemq/transport/mock/MockTransport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransport.java index 14abd77934..1612e9a74d 100644 --- a/activemq-core/src/main/java/org/activemq/transport/mock/MockTransport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransport.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.mock; +package org.apache.activemq.transport.mock; import java.io.IOException; -import org.activemq.command.Command; -import org.activemq.command.Response; -import org.activemq.transport.FutureResponse; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFilter; -import org.activemq.transport.TransportListener; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; +import org.apache.activemq.transport.FutureResponse; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFilter; +import org.apache.activemq.transport.TransportListener; /** @@ -50,7 +50,7 @@ public class MockTransport implements Transport, TransportListener { /** - * @see org.activemq.Service#start() + * @see org.apache.activemq.Service#start() * @throws IOException if the next channel has not been set. */ public void start() throws Exception { @@ -62,7 +62,7 @@ public class MockTransport implements Transport, TransportListener { } /** - * @see org.activemq.Service#stop() + * @see org.apache.activemq.Service#stop() */ public void stop() throws Exception { next.stop(); diff --git a/activemq-core/src/main/java/org/activemq/transport/mock/MockTransportFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransportFactory.java similarity index 81% rename from activemq-core/src/main/java/org/activemq/transport/mock/MockTransportFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransportFactory.java index 82059a016f..c39127eb1c 100755 --- a/activemq-core/src/main/java/org/activemq/transport/mock/MockTransportFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransportFactory.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.mock; +package org.apache.activemq.transport.mock; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import org.activemq.transport.MutexTransport; -import org.activemq.transport.ResponseCorrelator; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportServer; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.URISupport; -import org.activemq.util.URISupport.CompositeData; +import org.apache.activemq.transport.MutexTransport; +import org.apache.activemq.transport.ResponseCorrelator; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportServer; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.URISupport; +import org.apache.activemq.util.URISupport.CompositeData; public class MockTransportFactory extends TransportFactory { diff --git a/activemq-core/src/main/java/org/activemq/transport/package.html b/activemq-core/src/main/java/org/apache/activemq/transport/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/transport/package.html rename to activemq-core/src/main/java/org/apache/activemq/transport/package.html diff --git a/activemq-core/src/main/java/org/activemq/transport/peer/PeerTransportFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java similarity index 87% rename from activemq-core/src/main/java/org/activemq/transport/peer/PeerTransportFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java index 58ee40bd22..11cda94df4 100755 --- a/activemq-core/src/main/java/org/activemq/transport/peer/PeerTransportFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.peer; +package org.apache.activemq.transport.peer; import java.io.IOException; import java.net.URI; @@ -22,17 +22,17 @@ import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; -import org.activemq.broker.BrokerService; -import org.activemq.broker.TransportConnector; -import org.activemq.broker.BrokerFactory.BrokerFactoryHandler; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportServer; -import org.activemq.transport.vm.VMTransportFactory; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.IdGenerator; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.URISupport; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.broker.BrokerFactory.BrokerFactoryHandler; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportServer; +import org.apache.activemq.transport.vm.VMTransportFactory; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IdGenerator; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.URISupport; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/transport/peer/package.html b/activemq-core/src/main/java/org/apache/activemq/transport/peer/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/transport/peer/package.html rename to activemq-core/src/main/java/org/apache/activemq/transport/peer/package.html diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Abort.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Abort.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/transport/stomp/Abort.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/Abort.java index 5ad67725e7..1269c91110 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/Abort.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Abort.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; -import org.activemq.command.TransactionId; -import org.activemq.command.TransactionInfo; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.TransactionInfo; import java.io.DataInput; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Ack.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Ack.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/transport/stomp/Ack.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/Ack.java index 2cfa8b44dc..5886be5fcb 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/Ack.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Ack.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; import java.io.DataInput; import java.io.IOException; import java.net.ProtocolException; import java.util.Properties; -import org.activemq.command.MessageAck; -import org.activemq.command.TransactionId; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.TransactionId; class Ack implements StompCommand { private final StompWireFormat format; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/AsyncHelper.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/AsyncHelper.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/transport/stomp/AsyncHelper.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/AsyncHelper.java index 7c1b1be612..7899fe50c2 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/AsyncHelper.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/AsyncHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; class AsyncHelper { public static Object tryUntilNotInterrupted(HelperWithReturn helper) { diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Begin.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Begin.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/transport/stomp/Begin.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/Begin.java index ec3e2216e7..b1a0d30f4c 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/Begin.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Begin.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; -import org.activemq.command.TransactionId; -import org.activemq.command.TransactionInfo; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.TransactionInfo; import java.io.DataInput; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Command.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Command.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/transport/stomp/Command.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/Command.java index 221564d330..1926866d2c 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/Command.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Command.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/CommandEnvelope.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/CommandEnvelope.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/transport/stomp/CommandEnvelope.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/CommandEnvelope.java index 7e64d7ab0a..39b4f76cf6 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/CommandEnvelope.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/CommandEnvelope.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; -import org.activemq.command.Command; +import org.apache.activemq.command.Command; import java.util.Properties; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/CommandParser.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/CommandParser.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/transport/stomp/CommandParser.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/CommandParser.java index 4298382b41..24fcd51c76 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/CommandParser.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/CommandParser.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; -import org.activemq.command.Command; -import org.activemq.command.Response; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Commit.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Commit.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/transport/stomp/Commit.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/Commit.java index 5a3c7a4f98..3565db739d 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/Commit.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Commit.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; -import org.activemq.command.TransactionId; -import org.activemq.command.TransactionInfo; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.TransactionInfo; import java.io.DataInput; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Connect.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Connect.java similarity index 94% rename from activemq-core/src/main/java/org/activemq/transport/stomp/Connect.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/Connect.java index 8ab8a63d91..b277e581d6 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/Connect.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Connect.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.Properties; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ProducerInfo; -import org.activemq.command.Response; -import org.activemq.command.SessionInfo; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.Response; +import org.apache.activemq.command.SessionInfo; class Connect implements StompCommand { private HeaderParser headerParser = new HeaderParser(); diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/DestinationNamer.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/DestinationNamer.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/stomp/DestinationNamer.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/DestinationNamer.java index 514dbbde06..e3b636cf7a 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/DestinationNamer.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/DestinationNamer.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQDestination; import javax.jms.Destination; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Disconnect.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Disconnect.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/transport/stomp/Disconnect.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/Disconnect.java index 35bf6b1b3a..acf39e78d7 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/Disconnect.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Disconnect.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; -import org.activemq.command.ShutdownInfo; +import org.apache.activemq.command.ShutdownInfo; import java.io.DataInput; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/FrameBuilder.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameBuilder.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/transport/stomp/FrameBuilder.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameBuilder.java index 53607fd6d6..50e21818fe 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/FrameBuilder.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameBuilder.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; -import org.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQMessage; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/HeaderParser.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/HeaderParser.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/transport/stomp/HeaderParser.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/HeaderParser.java index e4e11e2f14..64b01bd219 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/HeaderParser.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/HeaderParser.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; import java.io.BufferedReader; import java.io.DataInput; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/ResponseListener.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ResponseListener.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/transport/stomp/ResponseListener.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/ResponseListener.java index 962ce4d38b..f6fb113de2 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/ResponseListener.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ResponseListener.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; -import org.activemq.command.Response; +import org.apache.activemq.command.Response; import java.io.DataOutput; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Send.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Send.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/transport/stomp/Send.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/Send.java index f7c4f691de..040a54e046 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/Send.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Send.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; import org.activeio.ByteSequence; -import org.activemq.command.ActiveMQBytesMessage; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ActiveMQTextMessage; -import org.activemq.command.TransactionId; +import org.apache.activemq.command.ActiveMQBytesMessage; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQTextMessage; +import org.apache.activemq.command.TransactionId; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Stomp.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Stomp.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/transport/stomp/Stomp.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/Stomp.java index 444b30600c..d35eb69fff 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/Stomp.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Stomp.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; public interface Stomp { String NULL = "\u0000"; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/StompCommand.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompCommand.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/transport/stomp/StompCommand.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompCommand.java index 55b26146d1..b0017c7889 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/StompCommand.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompCommand.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; import javax.jms.JMSException; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/StompTransportFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java similarity index 86% rename from activemq-core/src/main/java/org/activemq/transport/stomp/StompTransportFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java index 8d33ca80b9..9f071c8638 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/StompTransportFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportServer; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportServer; +import org.apache.activemq.util.IOExceptionSupport; /** * A Stomp transport factory diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormat.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormat.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java index c8b7418d26..eb8e2b3468 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormat.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; import java.io.DataInput; import java.io.DataInputStream; @@ -33,25 +33,25 @@ import org.activeio.Packet; import org.activeio.adapter.PacketInputStream; import org.activeio.command.WireFormat; import org.activeio.packet.ByteArrayPacket; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Command; -import org.activemq.command.CommandTypes; -import org.activemq.command.ConnectionId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerId; -import org.activemq.command.FlushCommand; -import org.activemq.command.LocalTransactionId; -import org.activemq.command.Message; -import org.activemq.command.MessageDispatch; -import org.activemq.command.MessageId; -import org.activemq.command.ProducerId; -import org.activemq.command.Response; -import org.activemq.command.SessionId; -import org.activemq.command.TransactionId; -import org.activemq.filter.DestinationMap; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.IdGenerator; -import org.activemq.util.LongSequenceGenerator; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.CommandTypes; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerId; +import org.apache.activemq.command.FlushCommand; +import org.apache.activemq.command.LocalTransactionId; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.ProducerId; +import org.apache.activemq.command.Response; +import org.apache.activemq.command.SessionId; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.filter.DestinationMap; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IdGenerator; +import org.apache.activemq.util.LongSequenceGenerator; import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormatFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormatFactory.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormatFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormatFactory.java index 7c43297374..c1cb76a0ec 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormatFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormatFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; import org.activeio.command.WireFormat; import org.activeio.command.WireFormatFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Subscribe.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Subscribe.java similarity index 91% rename from activemq-core/src/main/java/org/activemq/transport/stomp/Subscribe.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/Subscribe.java index 49f353ea1e..044ed76842 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/Subscribe.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Subscribe.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; import java.io.DataInput; import java.io.IOException; import java.util.Properties; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConsumerInfo; -import org.activemq.util.IntrospectionSupport; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.util.IntrospectionSupport; class Subscribe implements StompCommand { private HeaderParser headerParser = new HeaderParser(); diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Subscription.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Subscription.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/transport/stomp/Subscription.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/Subscription.java index 27fcdb72ab..f26778cce5 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/Subscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Subscription.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; import java.io.DataOutput; import java.io.IOException; @@ -23,14 +23,14 @@ import java.util.LinkedList; import javax.jms.JMSException; -import org.activemq.command.ActiveMQBytesMessage; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ActiveMQTextMessage; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageDispatch; -import org.activemq.command.RemoveInfo; +import org.apache.activemq.command.ActiveMQBytesMessage; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQTextMessage; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.command.RemoveInfo; public class Subscription { diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Unsubscribe.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Unsubscribe.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/stomp/Unsubscribe.java rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/Unsubscribe.java index c00d9df504..614e27b528 100644 --- a/activemq-core/src/main/java/org/activemq/transport/stomp/Unsubscribe.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Unsubscribe.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQDestination; import java.io.DataInput; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/package.html b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/transport/stomp/package.html rename to activemq-core/src/main/java/org/apache/activemq/transport/stomp/package.html diff --git a/activemq-core/src/main/java/org/activemq/transport/tcp/ResponseHolder.java b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/tcp/ResponseHolder.java rename to activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java index 6e2023391b..c0f626674f 100755 --- a/activemq-core/src/main/java/org/activemq/transport/tcp/ResponseHolder.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.tcp; +package org.apache.activemq.transport.tcp; -import org.activemq.command.Response; +import org.apache.activemq.command.Response; /** * ResponseHolder utility diff --git a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedInputStream.java b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedInputStream.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedInputStream.java rename to activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedInputStream.java index 5db0940f87..213d9353a7 100755 --- a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedInputStream.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedInputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.tcp; +package org.apache.activemq.transport.tcp; import java.io.FilterInputStream; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedOutputStream.java b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedOutputStream.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedOutputStream.java rename to activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedOutputStream.java index 225a5ab012..ab26bb1d0f 100755 --- a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedOutputStream.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedOutputStream.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.transport.tcp; +package org.apache.activemq.transport.tcp; import java.io.EOFException; import java.io.FilterOutputStream; diff --git a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransport.java b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java index 3fa30fe208..fa1518533c 100755 --- a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.tcp; +package org.apache.activemq.transport.tcp; import org.activeio.command.WireFormat; -import org.activemq.Service; -import org.activemq.command.Command; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportThreadSupport; -import org.activemq.util.ServiceStopper; +import org.apache.activemq.Service; +import org.apache.activemq.command.Command; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportThreadSupport; +import org.apache.activemq.util.ServiceStopper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java similarity index 85% rename from activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java index e79a2cb376..93b30649c8 100755 --- a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.tcp; +package org.apache.activemq.transport.tcp; import org.activeio.command.WireFormat; -import org.activemq.openwire.OpenWireFormat; -import org.activemq.transport.MutexTransport; -import org.activemq.transport.ResponseCorrelator; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportLogger; -import org.activemq.transport.TransportServer; -import org.activemq.transport.WireFormatNegotiator; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.URISupport; +import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.transport.MutexTransport; +import org.apache.activemq.transport.ResponseCorrelator; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportLogger; +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; import javax.net.ServerSocketFactory; import javax.net.SocketFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportServer.java b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportServer.java rename to activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java index d8c0ff26f6..e8e9e7575f 100755 --- a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportServer.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.tcp; +package org.apache.activemq.transport.tcp; import org.activeio.command.WireFormat; import org.activeio.command.WireFormatFactory; -import org.activemq.command.BrokerInfo; -import org.activemq.openwire.OpenWireFormatFactory; -import org.activemq.transport.TransportServerThreadSupport; -import org.activemq.util.ServiceStopper; +import org.apache.activemq.command.BrokerInfo; +import org.apache.activemq.openwire.OpenWireFormatFactory; +import org.apache.activemq.transport.TransportServerThreadSupport; +import org.apache.activemq.util.ServiceStopper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/tcp/package.html b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/transport/tcp/package.html rename to activemq-core/src/main/java/org/apache/activemq/transport/tcp/package.html diff --git a/activemq-core/src/main/java/org/activemq/transport/vm/VMTransport.java b/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransport.java similarity index 92% rename from activemq-core/src/main/java/org/activemq/transport/vm/VMTransport.java rename to activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransport.java index 5b38b83d22..10d234b50d 100755 --- a/activemq-core/src/main/java/org/activemq/transport/vm/VMTransport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.vm; +package org.apache.activemq.transport.vm; import java.io.IOException; import java.net.URI; @@ -23,11 +23,11 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import org.activemq.command.Command; -import org.activemq.command.Response; -import org.activemq.transport.FutureResponse; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportListener; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; +import org.apache.activemq.transport.FutureResponse; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/transport/vm/VMTransportFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java similarity index 88% rename from activemq-core/src/main/java/org/activemq/transport/vm/VMTransportFactory.java rename to activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java index abc6406bd4..870c1e06e1 100755 --- a/activemq-core/src/main/java/org/activemq/transport/vm/VMTransportFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.vm; +package org.apache.activemq.transport.vm; import java.io.IOException; import java.net.URI; @@ -22,20 +22,20 @@ import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; -import org.activemq.broker.BrokerFactory; -import org.activemq.broker.BrokerRegistry; -import org.activemq.broker.BrokerService; -import org.activemq.broker.TransportConnector; -import org.activemq.broker.BrokerFactory.BrokerFactoryHandler; -import org.activemq.transport.MarshallingTransportFilter; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportServer; -import org.activemq.util.IOExceptionSupport; -import org.activemq.util.IntrospectionSupport; -import org.activemq.util.ServiceSupport; -import org.activemq.util.URISupport; -import org.activemq.util.URISupport.CompositeData; +import org.apache.activemq.broker.BrokerFactory; +import org.apache.activemq.broker.BrokerRegistry; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.broker.BrokerFactory.BrokerFactoryHandler; +import org.apache.activemq.transport.MarshallingTransportFilter; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportServer; +import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IntrospectionSupport; +import org.apache.activemq.util.ServiceSupport; +import org.apache.activemq.util.URISupport; +import org.apache.activemq.util.URISupport.CompositeData; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; diff --git a/activemq-core/src/main/java/org/activemq/transport/vm/VMTransportServer.java b/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java similarity index 90% rename from activemq-core/src/main/java/org/activemq/transport/vm/VMTransportServer.java rename to activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java index f5a654f1b8..6296daf9ce 100755 --- a/activemq-core/src/main/java/org/activemq/transport/vm/VMTransportServer.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.vm; +package org.apache.activemq.transport.vm; import java.io.IOException; import java.net.URI; -import org.activemq.command.BrokerInfo; -import org.activemq.transport.MutexTransport; -import org.activemq.transport.ResponseCorrelator; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportAcceptListener; -import org.activemq.transport.TransportServer; +import org.apache.activemq.command.BrokerInfo; +import org.apache.activemq.transport.MutexTransport; +import org.apache.activemq.transport.ResponseCorrelator; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportAcceptListener; +import org.apache.activemq.transport.TransportServer; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger; diff --git a/activemq-core/src/main/java/org/activemq/transport/vm/package.html b/activemq-core/src/main/java/org/apache/activemq/transport/vm/package.html similarity index 100% rename from activemq-core/src/main/java/org/activemq/transport/vm/package.html rename to activemq-core/src/main/java/org/apache/activemq/transport/vm/package.html diff --git a/activemq-core/src/main/java/org/activemq/util/Callback.java b/activemq-core/src/main/java/org/apache/activemq/util/Callback.java similarity index 87% rename from activemq-core/src/main/java/org/activemq/util/Callback.java rename to activemq-core/src/main/java/org/apache/activemq/util/Callback.java index 596304f1f5..4aa2302d75 100755 --- a/activemq-core/src/main/java/org/activemq/util/Callback.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/Callback.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; /** * A simple callback object used by the - * {@link org.activemq.util.TransactionTemplate} - * and {@link org.activemq.util.ExceptionTemplate} + * {@link org.apache.activemq.util.TransactionTemplate} + * and {@link org.apache.activemq.util.ExceptionTemplate} objects to provide automatic transactional or exception handling blocks. * * @version $Revision: 1.2 $ diff --git a/activemq-core/src/main/java/org/activemq/util/ClassLoading.java b/activemq-core/src/main/java/org/apache/activemq/util/ClassLoading.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/util/ClassLoading.java rename to activemq-core/src/main/java/org/apache/activemq/util/ClassLoading.java index 161f433287..24a5c962be 100755 --- a/activemq-core/src/main/java/org/activemq/util/ClassLoading.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/ClassLoading.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import java.lang.reflect.Array; import java.util.HashMap; diff --git a/activemq-core/src/main/java/org/activemq/util/HexSupport.java b/activemq-core/src/main/java/org/apache/activemq/util/HexSupport.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/util/HexSupport.java rename to activemq-core/src/main/java/org/apache/activemq/util/HexSupport.java index 44b3639984..0fa50fbdb4 100755 --- a/activemq-core/src/main/java/org/activemq/util/HexSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/HexSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; /** * Used to convert to hex from byte arrays and back. diff --git a/activemq-core/src/main/java/org/activemq/util/IOExceptionSupport.java b/activemq-core/src/main/java/org/apache/activemq/util/IOExceptionSupport.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/util/IOExceptionSupport.java rename to activemq-core/src/main/java/org/apache/activemq/util/IOExceptionSupport.java index 8a43b4f818..fb7e6c2f7d 100755 --- a/activemq-core/src/main/java/org/activemq/util/IOExceptionSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/IOExceptionSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import java.io.IOException; diff --git a/activemq-core/src/main/java/org/activemq/util/IdGenerator.java b/activemq-core/src/main/java/org/apache/activemq/util/IdGenerator.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/util/IdGenerator.java rename to activemq-core/src/main/java/org/apache/activemq/util/IdGenerator.java index 5f03fdc921..8bf2215927 100755 --- a/activemq-core/src/main/java/org/activemq/util/IdGenerator.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/IdGenerator.java @@ -17,7 +17,7 @@ * **/ -package org.activemq.util; +package org.apache.activemq.util; import java.net.InetAddress; import java.net.ServerSocket; import java.util.logging.Level; diff --git a/activemq-core/src/main/java/org/activemq/util/IndentPrinter.java b/activemq-core/src/main/java/org/apache/activemq/util/IndentPrinter.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/util/IndentPrinter.java rename to activemq-core/src/main/java/org/apache/activemq/util/IndentPrinter.java index bf44fb7d46..d6f5021b05 100755 --- a/activemq-core/src/main/java/org/activemq/util/IndentPrinter.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/IndentPrinter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import java.io.PrintWriter; diff --git a/activemq-core/src/main/java/org/activemq/util/IntrospectionSupport.java b/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/util/IntrospectionSupport.java rename to activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java index 3e90464a70..64ef4f7e54 100755 --- a/activemq-core/src/main/java/org/activemq/util/IntrospectionSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java @@ -16,7 +16,7 @@ * limitations under the License. * **/ -package org.activemq.util; +package org.apache.activemq.util; import java.beans.PropertyEditor; import java.beans.PropertyEditorManager; diff --git a/activemq-core/src/main/java/org/activemq/util/JMSExceptionSupport.java b/activemq-core/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java similarity index 98% rename from activemq-core/src/main/java/org/activemq/util/JMSExceptionSupport.java rename to activemq-core/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java index d85379113a..44430bbbfc 100755 --- a/activemq-core/src/main/java/org/activemq/util/JMSExceptionSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import javax.jms.JMSException; import javax.jms.MessageEOFException; diff --git a/activemq-core/src/main/java/org/activemq/util/JMXSupport.java b/activemq-core/src/main/java/org/apache/activemq/util/JMXSupport.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/util/JMXSupport.java rename to activemq-core/src/main/java/org/apache/activemq/util/JMXSupport.java index c672967a8f..aa4f94e67b 100755 --- a/activemq-core/src/main/java/org/activemq/util/JMXSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/JMXSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import javax.management.ObjectName; diff --git a/activemq-core/src/main/java/org/activemq/util/LRUCache.java b/activemq-core/src/main/java/org/apache/activemq/util/LRUCache.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/util/LRUCache.java rename to activemq-core/src/main/java/org/apache/activemq/util/LRUCache.java index b320160467..29279f44d3 100755 --- a/activemq-core/src/main/java/org/activemq/util/LRUCache.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/LRUCache.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import java.util.LinkedHashMap; import java.util.Map; diff --git a/activemq-core/src/main/java/org/activemq/util/LongSequenceGenerator.java b/activemq-core/src/main/java/org/apache/activemq/util/LongSequenceGenerator.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/util/LongSequenceGenerator.java rename to activemq-core/src/main/java/org/apache/activemq/util/LongSequenceGenerator.java index e38657107c..30314f9c00 100755 --- a/activemq-core/src/main/java/org/activemq/util/LongSequenceGenerator.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/LongSequenceGenerator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; public class LongSequenceGenerator { diff --git a/activemq-core/src/main/java/org/activemq/util/MapHelper.java b/activemq-core/src/main/java/org/apache/activemq/util/MapHelper.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/util/MapHelper.java rename to activemq-core/src/main/java/org/apache/activemq/util/MapHelper.java index ff9f6bc0f8..c1d1e0b66e 100755 --- a/activemq-core/src/main/java/org/activemq/util/MapHelper.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/MapHelper.java @@ -16,7 +16,7 @@ * limitations under the License. * **/ -package org.activemq.util; +package org.apache.activemq.util; import java.util.Map; diff --git a/activemq-core/src/main/java/org/activemq/util/MarshallingSupport.java b/activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/util/MarshallingSupport.java rename to activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java index c4f62d6c86..879a5383d8 100755 --- a/activemq-core/src/main/java/org/activemq/util/MarshallingSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import java.io.DataInput; import java.io.DataInputStream; diff --git a/activemq-core/src/main/java/org/activemq/util/ServiceStopper.java b/activemq-core/src/main/java/org/apache/activemq/util/ServiceStopper.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/util/ServiceStopper.java rename to activemq-core/src/main/java/org/apache/activemq/util/ServiceStopper.java index 429837db9c..b701ff6abf 100644 --- a/activemq-core/src/main/java/org/activemq/util/ServiceStopper.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/ServiceStopper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; -import org.activemq.Service; +import org.apache.activemq.Service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/util/ServiceSupport.java b/activemq-core/src/main/java/org/apache/activemq/util/ServiceSupport.java similarity index 95% rename from activemq-core/src/main/java/org/activemq/util/ServiceSupport.java rename to activemq-core/src/main/java/org/apache/activemq/util/ServiceSupport.java index c05cef22a4..a4d20667d6 100644 --- a/activemq-core/src/main/java/org/activemq/util/ServiceSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/ServiceSupport.java @@ -16,9 +16,9 @@ * limitations under the License. * **/ -package org.activemq.util; +package org.apache.activemq.util; -import org.activemq.Service; +import org.apache.activemq.Service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/main/java/org/activemq/util/SubscriptionKey.java b/activemq-core/src/main/java/org/apache/activemq/util/SubscriptionKey.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/util/SubscriptionKey.java rename to activemq-core/src/main/java/org/apache/activemq/util/SubscriptionKey.java index a2af92af3d..f85a6280cd 100755 --- a/activemq-core/src/main/java/org/activemq/util/SubscriptionKey.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/SubscriptionKey.java @@ -17,7 +17,7 @@ * **/ -package org.activemq.util; +package org.apache.activemq.util; public class SubscriptionKey { public final String clientId; diff --git a/activemq-core/src/main/java/org/activemq/util/TransactionTemplate.java b/activemq-core/src/main/java/org/apache/activemq/util/TransactionTemplate.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/util/TransactionTemplate.java rename to activemq-core/src/main/java/org/apache/activemq/util/TransactionTemplate.java index 0f6eaba2ed..44d08cd85b 100755 --- a/activemq-core/src/main/java/org/activemq/util/TransactionTemplate.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/TransactionTemplate.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import java.io.IOException; -import org.activemq.broker.ConnectionContext; -import org.activemq.store.PersistenceAdapter; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.store.PersistenceAdapter; /** * A helper class for running code with a PersistenceAdapter diff --git a/activemq-core/src/main/java/org/activemq/util/TypeConversionSupport.java b/activemq-core/src/main/java/org/apache/activemq/util/TypeConversionSupport.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/util/TypeConversionSupport.java rename to activemq-core/src/main/java/org/apache/activemq/util/TypeConversionSupport.java index 38815a7783..dce818c7e9 100755 --- a/activemq-core/src/main/java/org/activemq/util/TypeConversionSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/TypeConversionSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import java.util.HashMap; diff --git a/activemq-core/src/main/java/org/activemq/util/URISupport.java b/activemq-core/src/main/java/org/apache/activemq/util/URISupport.java similarity index 99% rename from activemq-core/src/main/java/org/activemq/util/URISupport.java rename to activemq-core/src/main/java/org/apache/activemq/util/URISupport.java index 277de8c601..b2aa73d240 100755 --- a/activemq-core/src/main/java/org/activemq/util/URISupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/URISupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import java.io.UnsupportedEncodingException; import java.net.URI; diff --git a/activemq-core/src/main/java/org/activemq/util/WrappedException.java b/activemq-core/src/main/java/org/apache/activemq/util/WrappedException.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/util/WrappedException.java rename to activemq-core/src/main/java/org/apache/activemq/util/WrappedException.java index c19ac4ef8f..56fbb53634 100755 --- a/activemq-core/src/main/java/org/activemq/util/WrappedException.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/WrappedException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; public class WrappedException extends RuntimeException { private static final long serialVersionUID = 3257290240212217905L; diff --git a/activemq-core/src/main/java/org/activemq/xbean/BrokerFactoryBean.java b/activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java similarity index 97% rename from activemq-core/src/main/java/org/activemq/xbean/BrokerFactoryBean.java rename to activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java index 694bed17f5..be6e2b0d0f 100644 --- a/activemq-core/src/main/java/org/activemq/xbean/BrokerFactoryBean.java +++ b/activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.xbean; +package org.apache.activemq.xbean; -import org.activemq.broker.BrokerService; +import org.apache.activemq.broker.BrokerService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; diff --git a/activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerFactory.java b/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java similarity index 93% rename from activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerFactory.java rename to activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java index a4b1469aff..8abb5f5d40 100644 --- a/activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.xbean; +package org.apache.activemq.xbean; import java.beans.PropertyEditorManager; import java.net.URI; -import org.activemq.broker.BrokerService; -import org.activemq.broker.BrokerFactory.BrokerFactoryHandler; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.BrokerFactory.BrokerFactoryHandler; import org.springframework.beans.BeansException; import org.xbean.spring.context.ClassPathXmlApplicationContext; import org.xbean.spring.context.impl.URIEditor; diff --git a/activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerService.java b/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java similarity index 96% rename from activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerService.java rename to activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java index 5d71aa9a53..d74c352ea3 100644 --- a/activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerService.java +++ b/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.xbean; +package org.apache.activemq.xbean; -import org.activemq.broker.BrokerService; +import org.apache.activemq.broker.BrokerService; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/broker/broker b/activemq-core/src/main/resources/META-INF/services/org/activemq/broker/broker deleted file mode 100755 index a04fe5704a..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/broker/broker +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.broker.DefaultBrokerFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/broker/xbean b/activemq-core/src/main/resources/META-INF/services/org/activemq/broker/xbean deleted file mode 100755 index 70c2b4ca64..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/broker/xbean +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.xbean.XBeanBrokerFactory \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/apache_derby_embedded_jdbc_driver b/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/apache_derby_embedded_jdbc_driver deleted file mode 100755 index d203deee27..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/apache_derby_embedded_jdbc_driver +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.store.jdbc.adapter.DefaultJDBCAdapter \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/axion_jdbc_driver b/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/axion_jdbc_driver deleted file mode 100755 index 32a168edb2..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/axion_jdbc_driver +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.store.jdbc.adapter.AxionJDBCAdapter \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/hsql_database_engine_driver b/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/hsql_database_engine_driver deleted file mode 100755 index 5f82e58b8c..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/hsql_database_engine_driver +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.store.jdbc.adapter.HsqldbJDBCAdapter \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/i-net_sprinta_2000 b/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/i-net_sprinta_2000 deleted file mode 100755 index 4a5af08353..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/i-net_sprinta_2000 +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.store.jdbc.adapter.ImageBasedJDBCAdaptor \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/ibm_informix_jdbc_driver_for_ibm_informix_dynamic_server b/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/ibm_informix_jdbc_driver_for_ibm_informix_dynamic_server deleted file mode 100755 index 50693f5bda..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/ibm_informix_jdbc_driver_for_ibm_informix_dynamic_server +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.store.jdbc.adapter.InformixJDBCAdapter \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/jconnect__tm__for_jdbc__tm_ b/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/jconnect__tm__for_jdbc__tm_ deleted file mode 100755 index 4a5af08353..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/jconnect__tm__for_jdbc__tm_ +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.store.jdbc.adapter.ImageBasedJDBCAdaptor \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/jtds_type_4_jdbc_driver_for_ms_sql_server_and_sybase b/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/jtds_type_4_jdbc_driver_for_ms_sql_server_and_sybase deleted file mode 100755 index 4a5af08353..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/jtds_type_4_jdbc_driver_for_ms_sql_server_and_sybase +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.store.jdbc.adapter.ImageBasedJDBCAdaptor \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/oracle_jdbc_driver b/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/oracle_jdbc_driver deleted file mode 100755 index 0df864e4e2..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/oracle_jdbc_driver +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.store.jdbc.adapter.OracleJDBCAdapter \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/postgresql_native_driver b/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/postgresql_native_driver deleted file mode 100644 index 6c7ab8ec11..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/postgresql_native_driver +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.store.jdbc.adapter.PostgresqlJDBCAdapter \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/sqlserver b/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/sqlserver deleted file mode 100755 index 4a5af08353..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/store/jdbc/sqlserver +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.store.jdbc.adapter.ImageBasedJDBCAdaptor \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/.cvsignore b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/.cvsignore deleted file mode 100755 index e43b0f9889..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -.DS_Store diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/aio b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/aio deleted file mode 100755 index bf1f0caef9..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/aio +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.activeio.ActiveIOTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discovery b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discovery deleted file mode 100755 index da91bb5750..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discovery +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.discovery.DiscoveryTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/multicast b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/multicast deleted file mode 100755 index 77bc33d70c..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/multicast +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.discovery.multicast.MulticastDiscoveryAgentFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/rendezvous b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/rendezvous deleted file mode 100755 index 3777007d68..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/rendezvous +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.discovery.rendezvous.RendezvousDiscoveryAgentFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/simple b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/simple deleted file mode 100755 index 3dcbeb71b5..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/simple +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.discovery.simple.SimpleDiscoveryAgentFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/static b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/static deleted file mode 100755 index 3dcbeb71b5..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/discoveryagent/static +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.discovery.simple.SimpleDiscoveryAgentFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/failover b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/failover deleted file mode 100755 index 59a46490f0..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/failover +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.failover.FailoverTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/fanout b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/fanout deleted file mode 100755 index cfb9de8bd3..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/fanout +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.fanout.FanoutTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/jxta b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/jxta deleted file mode 100755 index bf1f0caef9..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/jxta +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.activeio.ActiveIOTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/mock b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/mock deleted file mode 100755 index 7434c70253..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/mock +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.mock.MockTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/nio b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/nio deleted file mode 100755 index bf1f0caef9..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/nio +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.activeio.ActiveIOTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/peer b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/peer deleted file mode 100644 index c03d680bde..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/peer +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.peer.PeerTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/ssl b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/ssl deleted file mode 100755 index bf1f0caef9..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/ssl +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.activeio.ActiveIOTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/stomp b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/stomp deleted file mode 100755 index 878cbf9ea3..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/stomp +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.stomp.StompTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/tcp b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/tcp deleted file mode 100755 index 6942310980..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/tcp +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.tcp.TcpTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/vm b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/vm deleted file mode 100755 index 06594a1bff..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/vm +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.vm.VMTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/vmpipe b/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/vmpipe deleted file mode 100755 index bf1f0caef9..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/transport/vmpipe +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.activeio.ActiveIOTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/wireformat/default b/activemq-core/src/main/resources/META-INF/services/org/activemq/wireformat/default deleted file mode 100755 index e7e8ac4dab..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/wireformat/default +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.openwire.OpenWireFormatFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/activemq/wireformat/stomp b/activemq-core/src/main/resources/META-INF/services/org/activemq/wireformat/stomp deleted file mode 100755 index 5d92a5f8da..0000000000 --- a/activemq-core/src/main/resources/META-INF/services/org/activemq/wireformat/stomp +++ /dev/null @@ -1 +0,0 @@ -class=org.activemq.transport.stomp.StompWireFormatFactory \ No newline at end of file diff --git a/activemq-core/src/test/java/org/activemq/ActiveMQConnectionFactoryTest.java b/activemq-core/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/ActiveMQConnectionFactoryTest.java rename to activemq-core/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java index e05f16428b..3d629761af 100755 --- a/activemq-core/src/test/java/org/activemq/ActiveMQConnectionFactoryTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.net.URI; import java.net.URISyntaxException; @@ -22,9 +22,10 @@ import java.net.URISyntaxException; import javax.jms.Connection; import javax.jms.JMSException; -import org.activemq.broker.BrokerRegistry; -import org.activemq.broker.BrokerService; -import org.activemq.broker.TransportConnector; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.BrokerRegistry; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.TransportConnector; public class ActiveMQConnectionFactoryTest extends CombinationTestSupport { diff --git a/activemq-core/src/test/java/org/activemq/AutoFailTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/AutoFailTestSupport.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/AutoFailTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/AutoFailTestSupport.java index 3d98d870ca..a1bd0b77bb 100644 --- a/activemq-core/src/test/java/org/activemq/AutoFailTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/AutoFailTestSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import junit.framework.TestCase; diff --git a/activemq-core/src/test/java/org/activemq/ClientTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/ClientTestSupport.java similarity index 84% rename from activemq-core/src/test/java/org/activemq/ClientTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/ClientTestSupport.java index cfdbe160d3..7e8a9a214e 100755 --- a/activemq-core/src/test/java/org/activemq/ClientTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/ClientTestSupport.java @@ -14,26 +14,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; -import org.activemq.broker.Broker; -import org.activemq.broker.BrokerFactory; -import org.activemq.broker.BrokerService; -import org.activemq.broker.StubConnection; -import org.activemq.broker.TransportConnector; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConnectionId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageDispatch; -import org.activemq.command.RemoveInfo; -import org.activemq.command.SessionInfo; -import org.activemq.transport.TransportFactory; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.Broker; +import org.apache.activemq.broker.BrokerFactory; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.StubConnection; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.command.RemoveInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.transport.TransportFactory; import javax.jms.JMSException; @@ -62,7 +63,7 @@ public class ClientTestSupport extends TestCase { String brokerId = broker.getBrokerName(); connector = new TransportConnector(broker.getBroker(), TransportFactory.bind(brokerId,new URI(this.brokerURL))) { // Hook into the connector so we can assert that the server accepted a connection. - protected org.activemq.broker.Connection createConnection(org.activemq.transport.Transport transport) throws IOException { + protected org.apache.activemq.broker.Connection createConnection(org.apache.activemq.transport.Transport transport) throws IOException { connected.set(true); return super.createConnection(transport); } diff --git a/activemq-core/src/test/java/org/activemq/CombinationTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/CombinationTestSupport.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/CombinationTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/CombinationTestSupport.java index 0e364a5508..c39f537e1d 100755 --- a/activemq-core/src/test/java/org/activemq/CombinationTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/CombinationTestSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/activemq-core/src/test/java/org/activemq/ConnectionCleanupTest.java b/activemq-core/src/test/java/org/apache/activemq/ConnectionCleanupTest.java similarity index 93% rename from activemq-core/src/test/java/org/activemq/ConnectionCleanupTest.java rename to activemq-core/src/test/java/org/apache/activemq/ConnectionCleanupTest.java index 6e3ddb420f..29161bc48e 100755 --- a/activemq-core/src/test/java/org/activemq/ConnectionCleanupTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/ConnectionCleanupTest.java @@ -14,11 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.JMSException; import javax.jms.Session; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.ActiveMQConnectionFactory; + import junit.framework.TestCase; /** diff --git a/activemq-core/src/test/java/org/activemq/ConsumerReceiveWithTimeoutTest.java b/activemq-core/src/test/java/org/apache/activemq/ConsumerReceiveWithTimeoutTest.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/ConsumerReceiveWithTimeoutTest.java rename to activemq-core/src/test/java/org/apache/activemq/ConsumerReceiveWithTimeoutTest.java index 50561f16ab..99dc870fa6 100644 --- a/activemq-core/src/test/java/org/activemq/ConsumerReceiveWithTimeoutTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/ConsumerReceiveWithTimeoutTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.JMSException; diff --git a/activemq-core/src/test/java/org/activemq/EmbeddedBrokerTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java similarity index 93% rename from activemq-core/src/test/java/org/activemq/EmbeddedBrokerTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java index 8f43451926..1fa1b992b0 100644 --- a/activemq-core/src/test/java/org/activemq/EmbeddedBrokerTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; -import org.activemq.broker.BrokerService; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.pool.PooledConnectionFactory; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.pool.PooledConnectionFactory; import org.springframework.jms.core.JmsTemplate; import javax.jms.Connection; diff --git a/activemq-core/src/test/java/org/activemq/JMSConsumerTest.java b/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/JMSConsumerTest.java rename to activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java index 713dd45bbc..b9d268396b 100755 --- a/activemq-core/src/test/java/org/activemq/JMSConsumerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.BytesMessage; import javax.jms.DeliveryMode; @@ -28,7 +28,9 @@ import javax.jms.Topic; import junit.framework.Test; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.ActiveMQMessageConsumer; +import org.apache.activemq.command.ActiveMQDestination; import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch; import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; diff --git a/activemq-core/src/test/java/org/activemq/JMSDurableTopicRedeliverTest.java b/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java similarity index 98% rename from activemq-core/src/test/java/org/activemq/JMSDurableTopicRedeliverTest.java rename to activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java index 4bf3c42efc..0f7c3d15c6 100755 --- a/activemq-core/src/test/java/org/activemq/JMSDurableTopicRedeliverTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Message; import javax.jms.Session; diff --git a/activemq-core/src/test/java/org/activemq/JMSExclusiveConsumerTest.java b/activemq-core/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java similarity index 98% rename from activemq-core/src/test/java/org/activemq/JMSExclusiveConsumerTest.java rename to activemq-core/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java index da478a57c4..c540aaf11d 100644 --- a/activemq-core/src/test/java/org/activemq/JMSExclusiveConsumerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.DeliveryMode; import javax.jms.Message; @@ -24,7 +24,7 @@ import javax.jms.Session; import junit.framework.Test; -import org.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQQueue; /** * Test cases used to test the JMS message exclusive consumers. diff --git a/activemq-core/src/test/java/org/activemq/JMSMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/JMSMessageTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/JMSMessageTest.java rename to activemq-core/src/test/java/org/apache/activemq/JMSMessageTest.java index cc6bdd5213..de8fa1548b 100755 --- a/activemq-core/src/test/java/org/activemq/JMSMessageTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JMSMessageTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.net.URISyntaxException; import java.util.Enumeration; @@ -37,7 +37,8 @@ import javax.jms.TextMessage; import junit.framework.Test; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.command.ActiveMQDestination; /** * Test cases used to test the JMS message consumer. diff --git a/activemq-core/src/test/java/org/activemq/JMSQueueRedeliverTest.java b/activemq-core/src/test/java/org/apache/activemq/JMSQueueRedeliverTest.java similarity index 96% rename from activemq-core/src/test/java/org/activemq/JMSQueueRedeliverTest.java rename to activemq-core/src/test/java/org/apache/activemq/JMSQueueRedeliverTest.java index 8c9e27b495..e0042b8d9a 100755 --- a/activemq-core/src/test/java/org/activemq/JMSQueueRedeliverTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JMSQueueRedeliverTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; /** * @version $Revision: 1.2 $ diff --git a/activemq-core/src/test/java/org/activemq/JMSUsecaseTest.java b/activemq-core/src/test/java/org/apache/activemq/JMSUsecaseTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/JMSUsecaseTest.java rename to activemq-core/src/test/java/org/apache/activemq/JMSUsecaseTest.java index 805cc7a547..2db564f627 100755 --- a/activemq-core/src/test/java/org/activemq/JMSUsecaseTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JMSUsecaseTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.util.Enumeration; @@ -29,8 +29,8 @@ import javax.jms.TextMessage; import junit.framework.Test; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMessage; public class JMSUsecaseTest extends JmsTestSupport { diff --git a/activemq-core/src/test/java/org/activemq/JmsAutoAckListenerTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsAutoAckListenerTest.java similarity index 98% rename from activemq-core/src/test/java/org/activemq/JmsAutoAckListenerTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsAutoAckListenerTest.java index abea9701dc..7049468df1 100755 --- a/activemq-core/src/test/java/org/activemq/JmsAutoAckListenerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsAutoAckListenerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.Message; diff --git a/activemq-core/src/test/java/org/activemq/JmsAutoAckTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsAutoAckTest.java similarity index 98% rename from activemq-core/src/test/java/org/activemq/JmsAutoAckTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsAutoAckTest.java index 01efbec0b4..69b803861a 100755 --- a/activemq-core/src/test/java/org/activemq/JmsAutoAckTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsAutoAckTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.JMSException; diff --git a/activemq-core/src/test/java/org/activemq/JmsBenchmark.java b/activemq-core/src/test/java/org/apache/activemq/JmsBenchmark.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/JmsBenchmark.java rename to activemq-core/src/test/java/org/apache/activemq/JmsBenchmark.java index 3c700b44d7..1dbc50df9c 100755 --- a/activemq-core/src/test/java/org/activemq/JmsBenchmark.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsBenchmark.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.io.IOException; import java.net.URI; @@ -33,11 +33,12 @@ import javax.jms.Session; import junit.framework.Test; -import org.activemq.broker.BrokerFactory; -import org.activemq.broker.BrokerService; -import org.activemq.broker.TransportConnector; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.BrokerFactory; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; import edu.emory.mathcs.backport.java.util.concurrent.Callable; import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch; diff --git a/activemq-core/src/test/java/org/activemq/JmsClientAckListenerTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsClientAckListenerTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/JmsClientAckListenerTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsClientAckListenerTest.java index 94a689edba..e32661d3db 100755 --- a/activemq-core/src/test/java/org/activemq/JmsClientAckListenerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsClientAckListenerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.Message; diff --git a/activemq-core/src/test/java/org/activemq/JmsClientAckTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsClientAckTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/JmsClientAckTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsClientAckTest.java index b0fb78d07b..a5863adab1 100755 --- a/activemq-core/src/test/java/org/activemq/JmsClientAckTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsClientAckTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.JMSException; diff --git a/activemq-core/src/test/java/org/activemq/JmsConnectionStartStopTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsConnectionStartStopTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/JmsConnectionStartStopTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsConnectionStartStopTest.java index 39815feb70..8bbc379059 100755 --- a/activemq-core/src/test/java/org/activemq/JmsConnectionStartStopTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsConnectionStartStopTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.JMSException; @@ -25,6 +25,8 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; +import org.apache.activemq.ActiveMQConnectionFactory; + /** * @version $Revision: 1.3 $ */ diff --git a/activemq-core/src/test/java/org/activemq/JmsCreateConsumerInOnMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsCreateConsumerInOnMessageTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/JmsCreateConsumerInOnMessageTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsCreateConsumerInOnMessageTest.java index 5f69488fc4..bf70890e93 100755 --- a/activemq-core/src/test/java/org/activemq/JmsCreateConsumerInOnMessageTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsCreateConsumerInOnMessageTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.Message; @@ -24,7 +24,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.Topic; -import org.activemq.TestSupport; +import org.apache.activemq.TestSupport; /** * @version $Revision: 1.2 $ diff --git a/activemq-core/src/test/java/org/activemq/JmsDurableQueueWildcardSendReceiveTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsDurableQueueWildcardSendReceiveTest.java similarity index 93% rename from activemq-core/src/test/java/org/activemq/JmsDurableQueueWildcardSendReceiveTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsDurableQueueWildcardSendReceiveTest.java index 1b5bf95a88..69cd0bb813 100755 --- a/activemq-core/src/test/java/org/activemq/JmsDurableQueueWildcardSendReceiveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsDurableQueueWildcardSendReceiveTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.DeliveryMode; -import org.activemq.test.JmsTopicSendReceiveTest; +import org.apache.activemq.test.JmsTopicSendReceiveTest; /** diff --git a/activemq-core/src/test/java/org/activemq/JmsDurableTopicSelectorTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicSelectorTest.java similarity index 96% rename from activemq-core/src/test/java/org/activemq/JmsDurableTopicSelectorTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicSelectorTest.java index 819c44aa61..2e1e36afab 100755 --- a/activemq-core/src/test/java/org/activemq/JmsDurableTopicSelectorTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicSelectorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; /** * @version $Revision: 1.2 $ diff --git a/activemq-core/src/test/java/org/activemq/JmsDurableTopicSendReceiveTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicSendReceiveTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/JmsDurableTopicSendReceiveTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicSendReceiveTest.java index 36062b06b3..3968d805e0 100755 --- a/activemq-core/src/test/java/org/activemq/JmsDurableTopicSendReceiveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicSendReceiveTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.Destination; @@ -25,7 +25,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import org.activemq.test.JmsTopicSendReceiveTest; +import org.apache.activemq.test.JmsTopicSendReceiveTest; /** * @version $Revision: 1.5 $ diff --git a/activemq-core/src/test/java/org/activemq/JmsDurableTopicTransactionTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicTransactionTest.java similarity index 93% rename from activemq-core/src/test/java/org/activemq/JmsDurableTopicTransactionTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicTransactionTest.java index dda567e938..f69e3c1825 100755 --- a/activemq-core/src/test/java/org/activemq/JmsDurableTopicTransactionTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicTransactionTest.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.DeliveryMode; -import org.activemq.test.JmsResourceProvider; + +import org.apache.activemq.test.JmsResourceProvider; /** * @version $Revision: 1.2 $ diff --git a/activemq-core/src/test/java/org/activemq/JmsDurableTopicWildcardSendReceiveTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicWildcardSendReceiveTest.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/JmsDurableTopicWildcardSendReceiveTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicWildcardSendReceiveTest.java index 9f6271eace..e7d35e28aa 100755 --- a/activemq-core/src/test/java/org/activemq/JmsDurableTopicWildcardSendReceiveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicWildcardSendReceiveTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.DeliveryMode; -import org.activemq.test.JmsTopicSendReceiveTest; +import org.apache.activemq.test.JmsTopicSendReceiveTest; /** diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueBrowserTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsQueueBrowserTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/JmsQueueBrowserTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsQueueBrowserTest.java index dda81d2a08..0b55c06adc 100755 --- a/activemq-core/src/test/java/org/activemq/JmsQueueBrowserTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsQueueBrowserTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.util.Enumeration; @@ -26,7 +26,7 @@ import javax.jms.QueueBrowser; import javax.jms.Session; import javax.jms.TextMessage; -import org.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQQueue; /** * @version $Revision: 1.4 $ diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueCompositeSendReceiveTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java similarity index 92% rename from activemq-core/src/test/java/org/activemq/JmsQueueCompositeSendReceiveTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java index ce46a11e65..caaac9f522 100755 --- a/activemq-core/src/test/java/org/activemq/JmsQueueCompositeSendReceiveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; -import org.activemq.test.JmsTopicSendReceiveTest; +import org.apache.activemq.test.JmsTopicSendReceiveTest; import javax.jms.DeliveryMode; import javax.jms.Destination; @@ -46,7 +46,7 @@ public class JmsQueueCompositeSendReceiveTest extends JmsTopicSendReceiveTest { * Returns the consumer subject. * * @return String - consumer subject - * @see org.activemq.test.TestSupport#getConsumerSubject() + * @see org.apache.activemq.test.TestSupport#getConsumerSubject() */ protected String getConsumerSubject() { return "FOO.BAR.HUMBUG"; @@ -56,7 +56,7 @@ public class JmsQueueCompositeSendReceiveTest extends JmsTopicSendReceiveTest { * Returns the producer subject. * * @return String - producer subject - * @see org.activemq.test.TestSupport#getProducerSubject() + * @see org.apache.activemq.test.TestSupport#getProducerSubject() */ protected String getProducerSubject() { return "FOO.BAR.HUMBUG,FOO.BAR.HUMBUG2"; diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueRequestReplyTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsQueueRequestReplyTest.java similarity index 96% rename from activemq-core/src/test/java/org/activemq/JmsQueueRequestReplyTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsQueueRequestReplyTest.java index 582f86986e..7b2f2dce17 100755 --- a/activemq-core/src/test/java/org/activemq/JmsQueueRequestReplyTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsQueueRequestReplyTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; /** * @version $Revision: 1.2 $ diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueSelectorTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsQueueSelectorTest.java similarity index 96% rename from activemq-core/src/test/java/org/activemq/JmsQueueSelectorTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsQueueSelectorTest.java index 956b7371d8..c6d0495f41 100755 --- a/activemq-core/src/test/java/org/activemq/JmsQueueSelectorTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsQueueSelectorTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq; +package org.apache.activemq; /** * @version $Revision: 1.2 $ diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTest.java similarity index 91% rename from activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTest.java index 7f22a894d9..a0cc437023 100755 --- a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; -import org.activemq.test.JmsTopicSendReceiveTest; +import org.apache.activemq.test.JmsTopicSendReceiveTest; /** diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java index a133ae39ba..7c0c332836 100644 --- a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import edu.emory.mathcs.backport.java.util.Queue; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentLinkedQueue; -import org.activemq.broker.BrokerService; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.BrokerService; /** diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsTest.java similarity index 90% rename from activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsTest.java index 94feea99d4..8f6451ad9d 100755 --- a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; -import org.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest; +import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest; /** * @version $Revision: 1.2 $ diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java index aeb7cfd5c8..16d4a2900b 100755 --- a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; /** * @version $Revision: 1.2 $ diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueTopicCompositeSendReceiveTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsQueueTopicCompositeSendReceiveTest.java similarity index 92% rename from activemq-core/src/test/java/org/activemq/JmsQueueTopicCompositeSendReceiveTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsQueueTopicCompositeSendReceiveTest.java index 4688d9564a..bdf0bd37cc 100755 --- a/activemq-core/src/test/java/org/activemq/JmsQueueTopicCompositeSendReceiveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsQueueTopicCompositeSendReceiveTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; -import org.activemq.test.JmsTopicSendReceiveTest; +import org.apache.activemq.test.JmsTopicSendReceiveTest; import javax.jms.DeliveryMode; import javax.jms.Destination; @@ -57,7 +57,7 @@ public class JmsQueueTopicCompositeSendReceiveTest extends JmsTopicSendReceiveTe * Returns the consumer subject. * * @return String - consumer subject - * @see org.activemq.test.TestSupport#getConsumerSubject() + * @see org.apache.activemq.test.TestSupport#getConsumerSubject() */ protected String getConsumerSubject() { return "FOO.BAR.HUMBUG"; @@ -67,7 +67,7 @@ public class JmsQueueTopicCompositeSendReceiveTest extends JmsTopicSendReceiveTe * Returns the producer subject. * * @return String - producer subject - * @see org.activemq.test.TestSupport#getProducerSubject() + * @see org.apache.activemq.test.TestSupport#getProducerSubject() */ protected String getProducerSubject() { return "queue://FOO.BAR.HUMBUG,topic://FOO.BAR.HUMBUG2"; diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueTransactionTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/JmsQueueTransactionTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java index 7857c09df2..7854f271af 100755 --- a/activemq-core/src/test/java/org/activemq/JmsQueueTransactionTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.util.ArrayList; import java.util.Enumeration; @@ -27,7 +27,7 @@ import javax.jms.QueueBrowser; import javax.jms.Session; import javax.jms.TextMessage; -import org.activemq.test.JmsResourceProvider; +import org.apache.activemq.test.JmsResourceProvider; /** @@ -39,7 +39,7 @@ public class JmsQueueTransactionTest extends JmsTransactionTestSupport { /** * - * @see org.activemq.JmsTransactionTestSupport#getJmsResourceProvider() + * @see org.apache.activemq.JmsTransactionTestSupport#getJmsResourceProvider() */ protected JmsResourceProvider getJmsResourceProvider() { JmsResourceProvider p = new JmsResourceProvider(); diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueWildcardSendReceiveTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/JmsQueueWildcardSendReceiveTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java index 7ce9de99d5..9287bfbb27 100755 --- a/activemq-core/src/test/java/org/activemq/JmsQueueWildcardSendReceiveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.DeliveryMode; import javax.jms.Session; @@ -25,8 +25,8 @@ import javax.jms.Destination; import javax.jms.JMSException; import javax.jms.MessageProducer; -import org.activemq.test.JmsTopicSendReceiveTest; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.test.JmsTopicSendReceiveTest; /** @@ -54,7 +54,7 @@ public class JmsQueueWildcardSendReceiveTest extends JmsTopicSendReceiveTest { * Returns the consumer subject. * * @return String - consumer subject - * @see org.activemq.test.TestSupport#getConsumerSubject() + * @see org.apache.activemq.test.TestSupport#getConsumerSubject() */ protected String getConsumerSubject(){ return "FOO.>"; @@ -64,7 +64,7 @@ public class JmsQueueWildcardSendReceiveTest extends JmsTopicSendReceiveTest { * Returns the producer subject. * * @return String - producer subject - * @see org.activemq.test.TestSupport#getProducerSubject() + * @see org.apache.activemq.test.TestSupport#getProducerSubject() */ protected String getProducerSubject(){ return "FOO.BAR.HUMBUG"; diff --git a/activemq-core/src/test/java/org/activemq/JmsRedeliveredTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsRedeliveredTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/JmsRedeliveredTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsRedeliveredTest.java index 98b84c24da..c16ca20a82 100755 --- a/activemq-core/src/test/java/org/activemq/JmsRedeliveredTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsRedeliveredTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -28,6 +28,8 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; +import org.apache.activemq.ActiveMQConnectionFactory; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/activemq-core/src/test/java/org/activemq/JmsSendReceiveTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/JmsSendReceiveTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java index 8a18edd6ff..9e338d7d8d 100755 --- a/activemq-core/src/test/java/org/activemq/JmsSendReceiveTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.DeliveryMode; import javax.jms.Destination; diff --git a/activemq-core/src/test/java/org/activemq/JmsSessionRecoverTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsSessionRecoverTest.java similarity index 98% rename from activemq-core/src/test/java/org/activemq/JmsSessionRecoverTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsSessionRecoverTest.java index 5eaaa8cf25..25ee880dd4 100755 --- a/activemq-core/src/test/java/org/activemq/JmsSessionRecoverTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsSessionRecoverTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -27,8 +27,9 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; import junit.framework.TestCase; import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch; diff --git a/activemq-core/src/test/java/org/activemq/JmsTempDestinationTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsTempDestinationTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/JmsTempDestinationTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTempDestinationTest.java index ad8f643ea7..67073c0723 100755 --- a/activemq-core/src/test/java/org/activemq/JmsTempDestinationTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTempDestinationTest.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.util.ArrayList; import javax.jms.*; +import org.apache.activemq.ActiveMQConnectionFactory; + import junit.framework.TestCase; /** diff --git a/activemq-core/src/test/java/org/activemq/JmsTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/JmsTestSupport.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/JmsTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTestSupport.java index ab8766b436..b77c7a58c0 100755 --- a/activemq-core/src/test/java/org/activemq/JmsTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTestSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.io.IOException; import java.net.URI; @@ -31,9 +31,11 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; -import org.activemq.broker.BrokerFactory; -import org.activemq.broker.BrokerService; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.BrokerFactory; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.command.ActiveMQDestination; /** * Test cases used to test the JMS message comsumer. diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicCompositeSendReceiveTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsTopicCompositeSendReceiveTest.java similarity index 92% rename from activemq-core/src/test/java/org/activemq/JmsTopicCompositeSendReceiveTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTopicCompositeSendReceiveTest.java index 30b42cd2bd..3e5422a4b2 100755 --- a/activemq-core/src/test/java/org/activemq/JmsTopicCompositeSendReceiveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTopicCompositeSendReceiveTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; -import org.activemq.test.JmsTopicSendReceiveTest; +import org.apache.activemq.test.JmsTopicSendReceiveTest; import javax.jms.DeliveryMode; import javax.jms.Destination; @@ -57,7 +57,7 @@ public class JmsTopicCompositeSendReceiveTest extends JmsTopicSendReceiveTest { * Returns the consumer subject. * * @return String - consumer subject - * @see org.activemq.test.TestSupport#getConsumerSubject() + * @see org.apache.activemq.test.TestSupport#getConsumerSubject() */ protected String getConsumerSubject() { return "FOO.BAR.HUMBUG"; @@ -67,7 +67,7 @@ public class JmsTopicCompositeSendReceiveTest extends JmsTopicSendReceiveTest { * Returns the producer subject. * * @return String - producer subject - * @see org.activemq.test.TestSupport#getProducerSubject() + * @see org.apache.activemq.test.TestSupport#getProducerSubject() */ protected String getProducerSubject() { return "FOO.BAR.HUMBUG,FOO.BAR.HUMBUG2"; diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicRedeliverTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsTopicRedeliverTest.java similarity index 96% rename from activemq-core/src/test/java/org/activemq/JmsTopicRedeliverTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTopicRedeliverTest.java index 0e143f4026..3753e56a67 100755 --- a/activemq-core/src/test/java/org/activemq/JmsTopicRedeliverTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTopicRedeliverTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.Destination; @@ -26,6 +26,8 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; +import org.apache.activemq.ActiveMQConnection; + /** * @version $Revision: 1.4 $ */ @@ -90,7 +92,7 @@ public class JmsTopicRedeliverTest extends TestSupport { * Returns the consumer subject. * * @return String - consumer subject - * @see org.activemq.test.TestSupport#getConsumerSubject() + * @see org.apache.activemq.test.TestSupport#getConsumerSubject() */ protected String getConsumerSubject() { return "TEST"; @@ -100,7 +102,7 @@ public class JmsTopicRedeliverTest extends TestSupport { * Returns the producer subject. * * @return String - producer subject - * @see org.activemq.test.TestSupport#getProducerSubject() + * @see org.apache.activemq.test.TestSupport#getProducerSubject() */ protected String getProducerSubject() { return "TEST"; diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicRequestReplyTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java similarity index 98% rename from activemq-core/src/test/java/org/activemq/JmsTopicRequestReplyTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java index e8b0676471..981e1555ba 100755 --- a/activemq-core/src/test/java/org/activemq/JmsTopicRequestReplyTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.util.List; import java.util.Vector; @@ -29,7 +29,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import org.activemq.test.TestSupport; +import org.apache.activemq.test.TestSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicSelectorTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsTopicSelectorTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/JmsTopicSelectorTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTopicSelectorTest.java index 5fe1c28a2d..e965d4e059 100755 --- a/activemq-core/src/test/java/org/activemq/JmsTopicSelectorTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTopicSelectorTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.DeliveryMode; diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveSubscriberTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveSubscriberTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveSubscriberTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveSubscriberTest.java index ca706e97e8..c70b9294d9 100755 --- a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveSubscriberTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveSubscriberTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.JMSException; import javax.jms.MessageConsumer; diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveTest.java index df0007517f..4ba78908a2 100755 --- a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.DeliveryMode; diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java index 5e924f845f..3c69616bb4 100755 --- a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.Connection; import javax.jms.DeliveryMode; import javax.jms.Session; +import org.apache.activemq.ActiveMQConnectionFactory; + /** * @version */ diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java similarity index 91% rename from activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java index d34231333a..a6e58b3493 100644 --- a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; + +import org.apache.activemq.ActiveMQConnectionFactory; /** * diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicSendSameMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendSameMessageTest.java similarity index 93% rename from activemq-core/src/test/java/org/activemq/JmsTopicSendSameMessageTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTopicSendSameMessageTest.java index 1538e43c3f..02930ef05e 100755 --- a/activemq-core/src/test/java/org/activemq/JmsTopicSendSameMessageTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendSameMessageTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.TextMessage; -import org.activemq.JmsTopicSendReceiveWithTwoConnectionsTest; +import org.apache.activemq.JmsTopicSendReceiveWithTwoConnectionsTest; /** * @version $Revision: 1.3 $ diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicTransactionTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsTopicTransactionTest.java similarity index 85% rename from activemq-core/src/test/java/org/activemq/JmsTopicTransactionTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTopicTransactionTest.java index a0b10f8008..60c7b51003 100755 --- a/activemq-core/src/test/java/org/activemq/JmsTopicTransactionTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTopicTransactionTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; -import org.activemq.test.JmsResourceProvider; +import org.apache.activemq.test.JmsResourceProvider; /** @@ -25,7 +25,7 @@ import org.activemq.test.JmsResourceProvider; public class JmsTopicTransactionTest extends JmsTransactionTestSupport { /** - * @see org.activemq.JmsTransactionTestSupport#getJmsResourceProvider() + * @see org.apache.activemq.JmsTransactionTestSupport#getJmsResourceProvider() */ protected JmsResourceProvider getJmsResourceProvider() { JmsResourceProvider p = new JmsResourceProvider(); diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicWildcardSendReceiveTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/JmsTopicWildcardSendReceiveTest.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java index 1494afda51..e97ba0c7a4 100755 --- a/activemq-core/src/test/java/org/activemq/JmsTopicWildcardSendReceiveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.DeliveryMode; import javax.jms.Session; @@ -25,8 +25,8 @@ import javax.jms.Destination; import javax.jms.JMSException; import javax.jms.MessageProducer; -import org.activemq.test.JmsTopicSendReceiveTest; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.test.JmsTopicSendReceiveTest; /** diff --git a/activemq-core/src/test/java/org/activemq/JmsTransactionTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java similarity index 98% rename from activemq-core/src/test/java/org/activemq/JmsTransactionTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java index 40c7584551..a891b436c6 100755 --- a/activemq-core/src/test/java/org/activemq/JmsTransactionTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; -import org.activemq.test.JmsResourceProvider; -import org.activemq.test.TestSupport; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.ActiveMQPrefetchPolicy; +import org.apache.activemq.test.JmsResourceProvider; +import org.apache.activemq.test.TestSupport; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/activemq-core/src/test/java/org/activemq/LargeMessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/LargeMessageTestSupport.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/LargeMessageTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/LargeMessageTestSupport.java index 3367cadec1..87dee3c4f9 100755 --- a/activemq-core/src/test/java/org/activemq/LargeMessageTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/LargeMessageTestSupport.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -29,10 +29,12 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.Topic; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.util.IdGenerator; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.util.IdGenerator; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger; diff --git a/activemq-core/src/test/java/org/activemq/LoadTestBurnIn.java b/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/LoadTestBurnIn.java rename to activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java index 72c4a29995..44b20721fa 100644 --- a/activemq-core/src/test/java/org/activemq/LoadTestBurnIn.java +++ b/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.io.IOException; import java.net.URI; @@ -33,10 +33,11 @@ import javax.jms.Topic; import junit.framework.Test; -import org.activemq.broker.BrokerFactory; -import org.activemq.broker.BrokerService; -import org.activemq.broker.TransportConnector; -import org.activemq.command.ActiveMQDestination; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.BrokerFactory; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.command.ActiveMQDestination; import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch; import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; @@ -75,7 +76,7 @@ public class LoadTestBurnIn extends JmsTestSupport { protected BrokerService createBroker() throws Exception { return BrokerFactory.createBroker(new URI("broker://(tcp://localhost:0)?useJmx=true")); -// return BrokerFactory.createBroker(new URI("xbean:org/activemq/broker/store/loadtester.xml")); +// return BrokerFactory.createBroker(new URI("xbean:org/apache/activemq/broker/store/loadtester.xml")); } protected ConnectionFactory createConnectionFactory() throws URISyntaxException, IOException { diff --git a/activemq-core/src/test/java/org/activemq/MessageTransformationTest.java b/activemq-core/src/test/java/org/apache/activemq/MessageTransformationTest.java similarity index 84% rename from activemq-core/src/test/java/org/activemq/MessageTransformationTest.java rename to activemq-core/src/test/java/org/apache/activemq/MessageTransformationTest.java index 2cb1ea7e56..24327124da 100755 --- a/activemq-core/src/test/java/org/activemq/MessageTransformationTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/MessageTransformationTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.BytesMessage; import javax.jms.MapMessage; @@ -29,17 +29,18 @@ import javax.jms.Topic; import junit.framework.TestCase; -import org.activemq.command.ActiveMQBytesMessage; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQMapMessage; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ActiveMQObjectMessage; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQStreamMessage; -import org.activemq.command.ActiveMQTempQueue; -import org.activemq.command.ActiveMQTempTopic; -import org.activemq.command.ActiveMQTextMessage; -import org.activemq.command.ActiveMQTopic; +import org.apache.activemq.ActiveMQMessageTransformation; +import org.apache.activemq.command.ActiveMQBytesMessage; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMapMessage; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQObjectMessage; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQStreamMessage; +import org.apache.activemq.command.ActiveMQTempQueue; +import org.apache.activemq.command.ActiveMQTempTopic; +import org.apache.activemq.command.ActiveMQTextMessage; +import org.apache.activemq.command.ActiveMQTopic; public class MessageTransformationTest extends TestCase { diff --git a/activemq-core/src/test/java/org/activemq/RedeliveryPolicyTest.java b/activemq-core/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/RedeliveryPolicyTest.java rename to activemq-core/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java index 0449422f1c..1ccd643f0c 100644 --- a/activemq-core/src/test/java/org/activemq/RedeliveryPolicyTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; @@ -23,8 +23,8 @@ import javax.jms.TextMessage; import junit.framework.Test; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.RedeliveryPolicy; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.RedeliveryPolicy; /** * Test cases used to test the JMS message exclusive consumers. diff --git a/activemq-core/src/test/java/org/activemq/SpringTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/SpringTestSupport.java similarity index 98% rename from activemq-core/src/test/java/org/activemq/SpringTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/SpringTestSupport.java index e2005b703d..fc32c46a03 100755 --- a/activemq-core/src/test/java/org/activemq/SpringTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/SpringTestSupport.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/test/java/org/activemq/TestSupport.java b/activemq-core/src/test/java/org/apache/activemq/TestSupport.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/TestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/TestSupport.java index bd82351d0d..9f4b494b64 100755 --- a/activemq-core/src/test/java/org/activemq/TestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/TestSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq; +package org.apache.activemq; import java.io.File; @@ -26,9 +26,10 @@ import javax.jms.TextMessage; import junit.framework.TestCase; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/test/java/org/activemq/advisory/ConsumerListenerTest.java b/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/advisory/ConsumerListenerTest.java rename to activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java index 2858747e5e..05cac9c144 100644 --- a/activemq-core/src/test/java/org/activemq/advisory/ConsumerListenerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java @@ -14,13 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.advisory; +package org.apache.activemq.advisory; import edu.emory.mathcs.backport.java.util.concurrent.ArrayBlockingQueue; import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue; import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; -import org.activemq.EmbeddedBrokerTestSupport; +import org.apache.activemq.EmbeddedBrokerTestSupport; +import org.apache.activemq.advisory.ConsumerEvent; +import org.apache.activemq.advisory.ConsumerEventSource; +import org.apache.activemq.advisory.ConsumerListener; import javax.jms.Connection; import javax.jms.JMSException; diff --git a/activemq-core/src/test/java/org/activemq/broker/BrokerBenchmark.java b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/broker/BrokerBenchmark.java rename to activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java index fa5de2ed41..363990d8c9 100755 --- a/activemq-core/src/test/java/org/activemq/broker/BrokerBenchmark.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import junit.framework.Test; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.ProducerInfo; -import org.activemq.command.SessionInfo; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.SessionInfo; import edu.emory.mathcs.backport.java.util.concurrent.Semaphore; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger; diff --git a/activemq-core/src/test/java/org/activemq/broker/BrokerRestartTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java similarity index 92% rename from activemq-core/src/test/java/org/activemq/broker/BrokerRestartTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java index 5af319b779..5d684e3159 100644 --- a/activemq-core/src/test/java/org/activemq/broker/BrokerRestartTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import java.io.IOException; import java.net.URISyntaxException; -import org.activemq.store.PersistenceAdapter; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.store.PersistenceAdapter; public class BrokerRestartTestSupport extends BrokerTestSupport { diff --git a/activemq-core/src/test/java/org/activemq/broker/BrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/broker/BrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java index 5f09c48b7e..c6a8b4b50e 100755 --- a/activemq-core/src/test/java/org/activemq/broker/BrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import javax.jms.DeliveryMode; import javax.jms.JMSException; import junit.framework.Test; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.DestinationInfo; -import org.activemq.command.LocalTransactionId; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.ProducerInfo; -import org.activemq.command.SessionInfo; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.DestinationInfo; +import org.apache.activemq.command.LocalTransactionId; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.SessionInfo; import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; diff --git a/activemq-core/src/test/java/org/activemq/broker/BrokerTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java similarity index 90% rename from activemq-core/src/test/java/org/activemq/broker/BrokerTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java index 079262c9e2..3cc653a04d 100755 --- a/activemq-core/src/test/java/org/activemq/broker/BrokerTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; @@ -29,27 +29,29 @@ import java.util.Iterator; import javax.jms.DeliveryMode; import javax.jms.MessageNotWriteableException; -import org.activemq.CombinationTestSupport; -import org.activemq.broker.region.RegionBroker; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQTextMessage; -import org.activemq.command.ConnectionId; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.DestinationInfo; -import org.activemq.command.LocalTransactionId; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageDispatch; -import org.activemq.command.MessageId; -import org.activemq.command.ProducerInfo; -import org.activemq.command.RemoveInfo; -import org.activemq.command.SessionInfo; -import org.activemq.command.TransactionId; -import org.activemq.command.TransactionInfo; -import org.activemq.command.XATransactionId; -import org.activemq.memory.UsageManager; -import org.activemq.store.PersistenceAdapter; +import org.apache.activemq.CombinationTestSupport; +import org.apache.activemq.broker.BrokerFactory; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.region.RegionBroker; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQTextMessage; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.DestinationInfo; +import org.apache.activemq.command.LocalTransactionId; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageDispatch; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.RemoveInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.TransactionInfo; +import org.apache.activemq.command.XATransactionId; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.PersistenceAdapter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/test/java/org/activemq/broker/MarshallingBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java similarity index 92% rename from activemq-core/src/test/java/org/activemq/broker/MarshallingBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java index 7330cf1d94..217f8a23f6 100755 --- a/activemq-core/src/test/java/org/activemq/broker/MarshallingBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import java.io.IOException; import junit.framework.Test; import org.activeio.command.WireFormat; -import org.activemq.command.Command; -import org.activemq.command.Response; -import org.activemq.openwire.OpenWireFormat; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; +import org.apache.activemq.openwire.OpenWireFormat; /** * Runs against the broker but marshals all request and response commands. diff --git a/activemq-core/src/test/java/org/activemq/broker/ProgressPrinter.java b/activemq-core/src/test/java/org/apache/activemq/broker/ProgressPrinter.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/broker/ProgressPrinter.java rename to activemq-core/src/test/java/org/apache/activemq/broker/ProgressPrinter.java index b07faddac5..88157ab6ff 100755 --- a/activemq-core/src/test/java/org/activemq/broker/ProgressPrinter.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/ProgressPrinter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; public class ProgressPrinter { diff --git a/activemq-core/src/test/java/org/activemq/broker/RecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java similarity index 96% rename from activemq-core/src/test/java/org/activemq/broker/RecoveryBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java index 9f2ad54370..c11bc3ebe4 100755 --- a/activemq-core/src/test/java/org/activemq/broker/RecoveryBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import javax.jms.DeliveryMode; import junit.framework.Test; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.LocalTransactionId; -import org.activemq.command.MessageAck; -import org.activemq.command.ProducerInfo; -import org.activemq.command.SessionInfo; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.LocalTransactionId; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.SessionInfo; /** * Used to simulate the recovery that occurs when a broker shuts down. diff --git a/activemq-core/src/test/java/org/activemq/broker/SpringTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/SpringTest.java similarity index 93% rename from activemq-core/src/test/java/org/activemq/broker/SpringTest.java rename to activemq-core/src/test/java/org/apache/activemq/broker/SpringTest.java index 0973b3eebf..a839a9ff6f 100755 --- a/activemq-core/src/test/java/org/activemq/broker/SpringTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/SpringTest.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import java.util.Iterator; import java.util.List; import junit.framework.TestCase; -import org.activemq.spring.SpringConsumer; -import org.activemq.spring.SpringProducer; +import org.apache.activemq.spring.SpringConsumer; +import org.apache.activemq.spring.SpringProducer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.support.AbstractApplicationContext; @@ -38,7 +38,7 @@ public class SpringTest extends TestCase { protected SpringProducer producer; public void testSenderWithSpringXml() throws Exception { - assertSenderConfig("org/activemq/broker/spring.xml"); + assertSenderConfig("org/apache/activemq/broker/spring.xml"); } /** * assert method that is used by all the test method to send and receive messages diff --git a/activemq-core/src/test/java/org/activemq/broker/StubConnection.java b/activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java similarity index 88% rename from activemq-core/src/test/java/org/activemq/broker/StubConnection.java rename to activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java index e225629694..8fece8e598 100755 --- a/activemq-core/src/test/java/org/activemq/broker/StubConnection.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java @@ -14,20 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import java.io.IOException; -import org.activemq.Service; -import org.activemq.command.Command; -import org.activemq.command.ExceptionResponse; -import org.activemq.command.Message; -import org.activemq.command.Response; -import org.activemq.command.ShutdownInfo; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportListener; -import org.activemq.util.ServiceSupport; +import org.apache.activemq.Service; +import org.apache.activemq.broker.AbstractConnection; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.Connection; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.ExceptionResponse; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.Response; +import org.apache.activemq.command.ShutdownInfo; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportListener; +import org.apache.activemq.util.ServiceSupport; import org.axiondb.engine.commands.ShutdownCommand; import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue; diff --git a/activemq-core/src/test/java/org/activemq/broker/XARecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java similarity index 93% rename from activemq-core/src/test/java/org/activemq/broker/XARecoveryBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java index 49445179ae..a628de18c5 100755 --- a/activemq-core/src/test/java/org/activemq/broker/XARecoveryBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker; +package org.apache.activemq.broker; import junit.framework.Test; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.DataArrayResponse; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.ProducerInfo; -import org.activemq.command.Response; -import org.activemq.command.SessionInfo; -import org.activemq.command.TransactionId; -import org.activemq.command.TransactionInfo; -import org.activemq.command.XATransactionId; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.DataArrayResponse; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.Response; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.TransactionInfo; +import org.apache.activemq.command.XATransactionId; /** * Used to simulate the recovery that occurs when a broker shuts down. diff --git a/activemq-core/src/test/java/org/activemq/broker/advisory/AdvisoryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/broker/advisory/AdvisoryBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java index 35dd4ba3b0..8698c16f9e 100755 --- a/activemq-core/src/test/java/org/activemq/broker/advisory/AdvisoryBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java @@ -16,21 +16,21 @@ * limitations under the License. * **/ -package org.activemq.broker.advisory; +package org.apache.activemq.broker.advisory; import junit.framework.Test; -import org.activemq.advisory.AdvisorySupport; -import org.activemq.broker.BrokerTestSupport; -import org.activemq.broker.StubConnection; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.ProducerInfo; -import org.activemq.command.RemoveInfo; -import org.activemq.command.SessionInfo; +import org.apache.activemq.advisory.AdvisorySupport; +import org.apache.activemq.broker.BrokerTestSupport; +import org.apache.activemq.broker.StubConnection; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.RemoveInfo; +import org.apache.activemq.command.SessionInfo; public class AdvisoryBrokerTest extends BrokerTestSupport { diff --git a/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/store/DefaultStoreBrokerTest.java similarity index 85% rename from activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/broker/store/DefaultStoreBrokerTest.java index 3d1313bc9d..bdeb4499a2 100755 --- a/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/store/DefaultStoreBrokerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.store; +package org.apache.activemq.broker.store; import java.io.File; import java.io.IOException; @@ -27,13 +27,13 @@ import javax.sql.DataSource; import junit.framework.Test; -import org.activemq.broker.BrokerFactory; -import org.activemq.broker.BrokerService; -import org.activemq.broker.BrokerTest; -import org.activemq.store.DefaultPersistenceAdapterFactory; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.jdbc.JDBCPersistenceAdapter; -import org.activemq.store.journal.JournalPersistenceAdapter; +import org.apache.activemq.broker.BrokerFactory; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.BrokerTest; +import org.apache.activemq.store.DefaultPersistenceAdapterFactory; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter; +import org.apache.activemq.store.journal.JournalPersistenceAdapter; /** * Once the wire format is completed we can test against real persistence storage. diff --git a/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java similarity index 87% rename from activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java index 05740c84fd..3cca0314ff 100755 --- a/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.store; +package org.apache.activemq.broker.store; import java.net.URI; import junit.framework.Test; -import org.activemq.broker.BrokerFactory; -import org.activemq.broker.BrokerService; -import org.activemq.broker.RecoveryBrokerTest; +import org.apache.activemq.broker.BrokerFactory; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.RecoveryBrokerTest; /** * Used to verify that recovery works correctly against diff --git a/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java similarity index 87% rename from activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java index 6d50c8b438..c0d3436a5f 100755 --- a/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.store; +package org.apache.activemq.broker.store; import java.net.URI; import junit.framework.Test; -import org.activemq.broker.BrokerFactory; -import org.activemq.broker.BrokerService; -import org.activemq.broker.XARecoveryBrokerTest; +import org.apache.activemq.broker.BrokerFactory; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.XARecoveryBrokerTest; /** * Used to verify that recovery works correctly against diff --git a/activemq-core/src/test/java/org/activemq/broker/store/LoadTester.java b/activemq-core/src/test/java/org/apache/activemq/broker/store/LoadTester.java similarity index 85% rename from activemq-core/src/test/java/org/activemq/broker/store/LoadTester.java rename to activemq-core/src/test/java/org/apache/activemq/broker/store/LoadTester.java index b2adeff8a9..2ee23ce5a6 100755 --- a/activemq-core/src/test/java/org/activemq/broker/store/LoadTester.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/store/LoadTester.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.store; +package org.apache.activemq.broker.store; import java.io.IOException; import java.net.URI; @@ -29,14 +29,14 @@ import javax.jms.Session; import junit.framework.Test; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.JmsTestSupport; -import org.activemq.broker.BrokerFactory; -import org.activemq.broker.BrokerService; -import org.activemq.broker.ProgressPrinter; -import org.activemq.broker.TransportConnector; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.JmsTestSupport; +import org.apache.activemq.broker.BrokerFactory; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.ProgressPrinter; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; /** * @@ -45,7 +45,7 @@ import org.activemq.command.ActiveMQQueue; public class LoadTester extends JmsTestSupport { protected BrokerService createBroker() throws Exception { - return BrokerFactory.createBroker(new URI("xbean:org/activemq/broker/store/loadtester.xml")); + return BrokerFactory.createBroker(new URI("xbean:org/apache/activemq/broker/store/loadtester.xml")); } protected ConnectionFactory createConnectionFactory() throws URISyntaxException, IOException { diff --git a/activemq-core/src/test/java/org/activemq/broker/store/QuickJournalRecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/store/QuickJournalRecoveryBrokerTest.java similarity index 91% rename from activemq-core/src/test/java/org/activemq/broker/store/QuickJournalRecoveryBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/broker/store/QuickJournalRecoveryBrokerTest.java index 010ef7ce74..72602156fd 100644 --- a/activemq-core/src/test/java/org/activemq/broker/store/QuickJournalRecoveryBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/store/QuickJournalRecoveryBrokerTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.store; +package org.apache.activemq.broker.store; import junit.framework.Test; -import org.activemq.broker.BrokerService; -import org.activemq.broker.RecoveryBrokerTest; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.RecoveryBrokerTest; /** * Used to verify that recovery works correctly against diff --git a/activemq-core/src/test/java/org/activemq/broker/store/QuickJournalXARecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/store/QuickJournalXARecoveryBrokerTest.java similarity index 91% rename from activemq-core/src/test/java/org/activemq/broker/store/QuickJournalXARecoveryBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/broker/store/QuickJournalXARecoveryBrokerTest.java index 5754081408..f616f9b061 100644 --- a/activemq-core/src/test/java/org/activemq/broker/store/QuickJournalXARecoveryBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/store/QuickJournalXARecoveryBrokerTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.broker.store; +package org.apache.activemq.broker.store; import junit.framework.Test; -import org.activemq.broker.BrokerService; -import org.activemq.broker.XARecoveryBrokerTest; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.XARecoveryBrokerTest; /** * Used to verify that recovery works correctly against diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQBytesMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQBytesMessageTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/command/ActiveMQBytesMessageTest.java rename to activemq-core/src/test/java/org/apache/activemq/command/ActiveMQBytesMessageTest.java index 489e017cfa..403de72a33 100755 --- a/activemq-core/src/test/java/org/activemq/command/ActiveMQBytesMessageTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQBytesMessageTest.java @@ -14,13 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import javax.jms.JMSException; import javax.jms.MessageFormatException; import javax.jms.MessageNotReadableException; import javax.jms.MessageNotWriteableException; +import org.apache.activemq.command.ActiveMQBytesMessage; +import org.apache.activemq.command.CommandTypes; + import junit.framework.TestCase; /** diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQDestinationTest.java b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQDestinationTest.java similarity index 88% rename from activemq-core/src/test/java/org/activemq/command/ActiveMQDestinationTest.java rename to activemq-core/src/test/java/org/apache/activemq/command/ActiveMQDestinationTest.java index 0e6e212e01..53ae693f35 100755 --- a/activemq-core/src/test/java/org/activemq/command/ActiveMQDestinationTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQDestinationTest.java @@ -14,11 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.IOException; import java.util.Map; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTempQueue; +import org.apache.activemq.command.ActiveMQTempTopic; +import org.apache.activemq.command.ActiveMQTopic; + import junit.framework.Test; public class ActiveMQDestinationTest extends DataStructureTestSupport { diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQMapMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMapMessageTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/command/ActiveMQMapMessageTest.java rename to activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMapMessageTest.java index d96ad15da2..88193867d7 100755 --- a/activemq-core/src/test/java/org/activemq/command/ActiveMQMapMessageTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMapMessageTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.IOException; import java.util.ArrayList; @@ -26,6 +26,8 @@ import javax.jms.MessageFormatException; import javax.jms.MessageNotReadableException; import javax.jms.MessageNotWriteableException; +import org.apache.activemq.command.ActiveMQMapMessage; + import junit.framework.TestCase; /** diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/command/ActiveMQMessageTest.java rename to activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java index 69a6b8bb5d..0d10949205 100755 --- a/activemq-core/src/test/java/org/activemq/command/ActiveMQMessageTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.IOException; import java.util.Enumeration; @@ -29,8 +29,15 @@ import junit.framework.TestCase; import org.activeio.ByteSequence; import org.activeio.command.WireFormat; -import org.activemq.openwire.OpenWireFormat; -import org.activemq.state.CommandVisitor; +import org.apache.activemq.command.ActiveMQBytesMessage; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQTempTopic; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.CommandTypes; +import org.apache.activemq.command.Response; +import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.state.CommandVisitor; /** * @version $Revision$ @@ -377,8 +384,8 @@ public class ActiveMQMessageTest extends TestCase { } public void testConvertProperties() throws Exception { - org.activemq.command.Message msg = new org.activemq.command.Message() { - public org.activemq.command.Message copy() { + org.apache.activemq.command.Message msg = new org.apache.activemq.command.Message() { + public org.apache.activemq.command.Message copy() { return null; } public void beforeMarshall(WireFormat wireFormat) throws IOException { @@ -774,7 +781,7 @@ public class ActiveMQMessageTest extends TestCase { String propertyName = "property"; Object obj = new Object(); try { - ((org.activemq.command.Message)msg).setProperty(propertyName, obj); //bypass object check + ((org.apache.activemq.command.Message)msg).setProperty(propertyName, obj); //bypass object check } catch (IOException e) { } try { diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQObjectMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQObjectMessageTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/command/ActiveMQObjectMessageTest.java rename to activemq-core/src/test/java/org/apache/activemq/command/ActiveMQObjectMessageTest.java index 195a26f9f2..8f986fd78d 100755 --- a/activemq-core/src/test/java/org/activemq/command/ActiveMQObjectMessageTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQObjectMessageTest.java @@ -14,13 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import junit.framework.TestCase; import javax.jms.JMSException; import javax.jms.MessageNotReadableException; import javax.jms.MessageNotWriteableException; + +import org.apache.activemq.command.ActiveMQObjectMessage; + import java.io.IOException; /** diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQStreamMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/command/ActiveMQStreamMessageTest.java rename to activemq-core/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java index 2fee34386d..cb1e6fa9a2 100755 --- a/activemq-core/src/test/java/org/activemq/command/ActiveMQStreamMessageTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.Serializable; @@ -23,6 +23,9 @@ import javax.jms.MessageFormatException; import javax.jms.MessageNotReadableException; import javax.jms.MessageNotWriteableException; +import org.apache.activemq.command.ActiveMQStreamMessage; +import org.apache.activemq.command.CommandTypes; + import junit.framework.TestCase; /** diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQTextMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/command/ActiveMQTextMessageTest.java rename to activemq-core/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java index 0e1af713ae..15f8b38542 100755 --- a/activemq-core/src/test/java/org/activemq/command/ActiveMQTextMessageTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import java.io.IOException; @@ -26,6 +26,9 @@ import junit.framework.TestCase; import junit.textui.TestRunner; import org.activeio.ByteSequence; +import org.apache.activemq.command.ActiveMQTextMessage; +import org.apache.activemq.command.CommandTypes; +import org.apache.activemq.command.Message; /** * @version $Revision$ diff --git a/activemq-core/src/test/java/org/activemq/command/DataStructureTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/command/DataStructureTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java index 9e2217e619..b2b97685b1 100755 --- a/activemq-core/src/test/java/org/activemq/command/DataStructureTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import org.activeio.Packet; import org.activeio.command.WireFormat; -import org.activemq.CombinationTestSupport; -import org.activemq.openwire.OpenWireFormat; +import org.apache.activemq.CombinationTestSupport; +import org.apache.activemq.command.Command; +import org.apache.activemq.openwire.OpenWireFormat; import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/activemq-core/src/test/java/org/activemq/command/MessageSendTest.java b/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java similarity index 88% rename from activemq-core/src/test/java/org/activemq/command/MessageSendTest.java rename to activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java index ee9e3aa2fe..e18386872a 100755 --- a/activemq-core/src/test/java/org/activemq/command/MessageSendTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java @@ -14,9 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import org.activeio.ByteSequence; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.ProducerId; +import org.apache.activemq.command.SessionId; import java.io.IOException; diff --git a/activemq-core/src/test/java/org/activemq/command/MessageTest.java b/activemq-core/src/test/java/org/apache/activemq/command/MessageTest.java similarity index 93% rename from activemq-core/src/test/java/org/activemq/command/MessageTest.java rename to activemq-core/src/test/java/org/apache/activemq/command/MessageTest.java index 843d4de0a7..b48ab63c71 100755 --- a/activemq-core/src/test/java/org/activemq/command/MessageTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/command/MessageTest.java @@ -14,10 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.command; +package org.apache.activemq.command; import org.activeio.command.WireFormat; -import org.activemq.openwire.OpenWireFormat; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.openwire.OpenWireFormat; import java.io.IOException; diff --git a/activemq-core/src/test/java/org/activemq/demo/SimpleConsumer.java b/activemq-core/src/test/java/org/apache/activemq/demo/SimpleConsumer.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/demo/SimpleConsumer.java rename to activemq-core/src/test/java/org/apache/activemq/demo/SimpleConsumer.java index 62cf9473c1..59e276ece9 100755 --- a/activemq-core/src/test/java/org/activemq/demo/SimpleConsumer.java +++ b/activemq-core/src/test/java/org/apache/activemq/demo/SimpleConsumer.java @@ -22,7 +22,7 @@ * with SimpleQueueSender. Specify a queue name on the command * line when you run the program. */ -package org.activemq.demo; +package org.apache.activemq.demo; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/activemq-core/src/test/java/org/activemq/demo/SimpleProducer.java b/activemq-core/src/test/java/org/apache/activemq/demo/SimpleProducer.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/demo/SimpleProducer.java rename to activemq-core/src/test/java/org/apache/activemq/demo/SimpleProducer.java index 864a4f6ae0..25dab6f93f 100755 --- a/activemq-core/src/test/java/org/activemq/demo/SimpleProducer.java +++ b/activemq-core/src/test/java/org/apache/activemq/demo/SimpleProducer.java @@ -24,7 +24,7 @@ * program. By default, the program sends one message. Specify * a number after the queue name to send that number of messages. */ -package org.activemq.demo; +package org.apache.activemq.demo; // START SNIPPET: demo diff --git a/activemq-core/src/test/java/org/activemq/demo/SimpleQueueReceiver.java b/activemq-core/src/test/java/org/apache/activemq/demo/SimpleQueueReceiver.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/demo/SimpleQueueReceiver.java rename to activemq-core/src/test/java/org/apache/activemq/demo/SimpleQueueReceiver.java index e1bfed7025..a572125068 100755 --- a/activemq-core/src/test/java/org/activemq/demo/SimpleQueueReceiver.java +++ b/activemq-core/src/test/java/org/apache/activemq/demo/SimpleQueueReceiver.java @@ -22,7 +22,7 @@ * with SimpleQueueSender. Specify a queue name on the command * line when you run the program. */ -package org.activemq.demo; +package org.apache.activemq.demo; import javax.jms.JMSException; import javax.jms.Message; diff --git a/activemq-core/src/test/java/org/activemq/demo/SimpleQueueSender.java b/activemq-core/src/test/java/org/apache/activemq/demo/SimpleQueueSender.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/demo/SimpleQueueSender.java rename to activemq-core/src/test/java/org/apache/activemq/demo/SimpleQueueSender.java index 1aa1491340..69f3680524 100755 --- a/activemq-core/src/test/java/org/activemq/demo/SimpleQueueSender.java +++ b/activemq-core/src/test/java/org/apache/activemq/demo/SimpleQueueSender.java @@ -24,7 +24,7 @@ * program. By default, the program sends one message. Specify * a number after the queue name to send that number of messages. */ -package org.activemq.demo; +package org.apache.activemq.demo; // START SNIPPET: demo diff --git a/activemq-core/src/test/java/org/activemq/filter/BadDummyPolicyConfigTest.java b/activemq-core/src/test/java/org/apache/activemq/filter/BadDummyPolicyConfigTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/filter/BadDummyPolicyConfigTest.java rename to activemq-core/src/test/java/org/apache/activemq/filter/BadDummyPolicyConfigTest.java index 84cfa4876a..c799eb1ec5 100644 --- a/activemq-core/src/test/java/org/activemq/filter/BadDummyPolicyConfigTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/filter/BadDummyPolicyConfigTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import junit.framework.TestCase; diff --git a/activemq-core/src/test/java/org/activemq/filter/DestinationMapTest.java b/activemq-core/src/test/java/org/apache/activemq/filter/DestinationMapTest.java similarity index 98% rename from activemq-core/src/test/java/org/activemq/filter/DestinationMapTest.java rename to activemq-core/src/test/java/org/apache/activemq/filter/DestinationMapTest.java index a492d1d6f2..23cc501150 100755 --- a/activemq-core/src/test/java/org/activemq/filter/DestinationMapTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/filter/DestinationMapTest.java @@ -15,11 +15,13 @@ * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import junit.framework.TestCase; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQTopic; + +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.filter.DestinationMap; import java.util.ArrayList; import java.util.Arrays; diff --git a/activemq-core/src/test/java/org/activemq/filter/DestinationPathTest.java b/activemq-core/src/test/java/org/apache/activemq/filter/DestinationPathTest.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/filter/DestinationPathTest.java rename to activemq-core/src/test/java/org/apache/activemq/filter/DestinationPathTest.java index 56246638f5..8116662b69 100755 --- a/activemq-core/src/test/java/org/activemq/filter/DestinationPathTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/filter/DestinationPathTest.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; + +import org.apache.activemq.filter.DestinationPath; import junit.framework.TestCase; diff --git a/activemq-core/src/test/java/org/activemq/filter/DummyPolicy.java b/activemq-core/src/test/java/org/apache/activemq/filter/DummyPolicy.java similarity index 91% rename from activemq-core/src/test/java/org/activemq/filter/DummyPolicy.java rename to activemq-core/src/test/java/org/apache/activemq/filter/DummyPolicy.java index 71db4d43a9..511d9abe70 100644 --- a/activemq-core/src/test/java/org/activemq/filter/DummyPolicy.java +++ b/activemq-core/src/test/java/org/apache/activemq/filter/DummyPolicy.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; import java.util.List; +import org.apache.activemq.filter.DestinationMap; + /** * Represents a destination based policy * diff --git a/activemq-core/src/test/java/org/activemq/filter/DummyPolicyEntry.java b/activemq-core/src/test/java/org/apache/activemq/filter/DummyPolicyEntry.java similarity index 92% rename from activemq-core/src/test/java/org/activemq/filter/DummyPolicyEntry.java rename to activemq-core/src/test/java/org/apache/activemq/filter/DummyPolicyEntry.java index ccd826066d..5f0690c6e9 100644 --- a/activemq-core/src/test/java/org/activemq/filter/DummyPolicyEntry.java +++ b/activemq-core/src/test/java/org/apache/activemq/filter/DummyPolicyEntry.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; + +import org.apache.activemq.filter.DestinationMapEntry; /** * diff --git a/activemq-core/src/test/java/org/activemq/filter/DummyPolicyTest.java b/activemq-core/src/test/java/org/apache/activemq/filter/DummyPolicyTest.java similarity index 84% rename from activemq-core/src/test/java/org/activemq/filter/DummyPolicyTest.java rename to activemq-core/src/test/java/org/apache/activemq/filter/DummyPolicyTest.java index 058ca0a5bf..74a908c50b 100644 --- a/activemq-core/src/test/java/org/activemq/filter/DummyPolicyTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/filter/DummyPolicyTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.filter; +package org.apache.activemq.filter; -import org.activemq.SpringTestSupport; -import org.activemq.command.ActiveMQTopic; +import org.apache.activemq.SpringTestSupport; +import org.apache.activemq.command.ActiveMQTopic; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -39,7 +39,7 @@ public class DummyPolicyTest extends SpringTestSupport { protected AbstractApplicationContext createApplicationContext() { // TODO Auto-generated method stub - return new ClassPathXmlApplicationContext("org/activemq/filter/dummyPolicy.xml"); + return new ClassPathXmlApplicationContext("org/apache/activemq/filter/dummyPolicy.xml"); } } diff --git a/activemq-core/src/test/java/org/activemq/jndi/ActiveMQInitialContextFactoryTest.java b/activemq-core/src/test/java/org/apache/activemq/jndi/ActiveMQInitialContextFactoryTest.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/jndi/ActiveMQInitialContextFactoryTest.java rename to activemq-core/src/test/java/org/apache/activemq/jndi/ActiveMQInitialContextFactoryTest.java index 1750922dc2..701d85b78d 100755 --- a/activemq-core/src/test/java/org/activemq/jndi/ActiveMQInitialContextFactoryTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/jndi/ActiveMQInitialContextFactoryTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jndi; +package org.apache.activemq.jndi; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; import javax.naming.*; diff --git a/activemq-core/src/test/java/org/activemq/jndi/CustomConnectionFactoryNameTest.java b/activemq-core/src/test/java/org/apache/activemq/jndi/CustomConnectionFactoryNameTest.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/jndi/CustomConnectionFactoryNameTest.java rename to activemq-core/src/test/java/org/apache/activemq/jndi/CustomConnectionFactoryNameTest.java index 168c07c010..c8ffcf11e7 100755 --- a/activemq-core/src/test/java/org/activemq/jndi/CustomConnectionFactoryNameTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/jndi/CustomConnectionFactoryNameTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jndi; +package org.apache.activemq.jndi; import javax.naming.NamingException; -import org.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.ActiveMQConnectionFactory; /** * Test case for AMQ-141 diff --git a/activemq-core/src/test/java/org/activemq/jndi/DestinationNameWithSlashTest.java b/activemq-core/src/test/java/org/apache/activemq/jndi/DestinationNameWithSlashTest.java similarity index 96% rename from activemq-core/src/test/java/org/activemq/jndi/DestinationNameWithSlashTest.java rename to activemq-core/src/test/java/org/apache/activemq/jndi/DestinationNameWithSlashTest.java index cf0e624f8e..4e53040d13 100755 --- a/activemq-core/src/test/java/org/activemq/jndi/DestinationNameWithSlashTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/jndi/DestinationNameWithSlashTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jndi; +package org.apache.activemq.jndi; /** diff --git a/activemq-core/src/test/java/org/activemq/jndi/InitialContextTest.java b/activemq-core/src/test/java/org/apache/activemq/jndi/InitialContextTest.java similarity index 91% rename from activemq-core/src/test/java/org/activemq/jndi/InitialContextTest.java rename to activemq-core/src/test/java/org/apache/activemq/jndi/InitialContextTest.java index 7884d6db6a..35658c8eb4 100755 --- a/activemq-core/src/test/java/org/activemq/jndi/InitialContextTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/jndi/InitialContextTest.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jndi; +package org.apache.activemq.jndi; import junit.framework.TestCase; -import org.activemq.ActiveMQConnectionFactory; + +import org.apache.activemq.ActiveMQConnectionFactory; import javax.naming.InitialContext; import javax.naming.Context; @@ -45,7 +46,7 @@ public class InitialContextTest extends TestCase { public void testUsingStandardJNDIKeys() throws Exception { Properties properties = new Properties(); - properties.put(Context.INITIAL_CONTEXT_FACTORY, "org.activemq.jndi.ActiveMQInitialContextFactory"); + properties.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory"); String expected = "tcp://localhost:65432"; properties.put(Context.PROVIDER_URL, expected); diff --git a/activemq-core/src/test/java/org/activemq/jndi/JNDITestSupport.java b/activemq-core/src/test/java/org/apache/activemq/jndi/JNDITestSupport.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/jndi/JNDITestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/jndi/JNDITestSupport.java index 9fa25170a8..22df03aa81 100755 --- a/activemq-core/src/test/java/org/activemq/jndi/JNDITestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/jndi/JNDITestSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jndi; +package org.apache.activemq.jndi; import junit.framework.TestCase; @@ -28,7 +28,8 @@ import javax.jms.Destination; import javax.jms.JMSException; import java.util.Hashtable; -import org.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.jndi.ActiveMQInitialContextFactory; /** * @version $Revision: 1.3 $ diff --git a/activemq-core/src/test/java/org/activemq/management/BoundaryStatisticTest.java b/activemq-core/src/test/java/org/apache/activemq/management/BoundaryStatisticTest.java similarity index 92% rename from activemq-core/src/test/java/org/activemq/management/BoundaryStatisticTest.java rename to activemq-core/src/test/java/org/apache/activemq/management/BoundaryStatisticTest.java index 2c1be4161b..937f70dd5a 100755 --- a/activemq-core/src/test/java/org/activemq/management/BoundaryStatisticTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/management/BoundaryStatisticTest.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; + +import org.apache.activemq.management.BoundaryStatisticImpl; public class BoundaryStatisticTest extends StatisticTestSupport { diff --git a/activemq-core/src/test/java/org/activemq/management/BoundedRangeStatisticTest.java b/activemq-core/src/test/java/org/apache/activemq/management/BoundedRangeStatisticTest.java similarity index 91% rename from activemq-core/src/test/java/org/activemq/management/BoundedRangeStatisticTest.java rename to activemq-core/src/test/java/org/apache/activemq/management/BoundedRangeStatisticTest.java index 4f20013b19..cd647eec42 100755 --- a/activemq-core/src/test/java/org/activemq/management/BoundedRangeStatisticTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/management/BoundedRangeStatisticTest.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; + +import org.apache.activemq.management.BoundedRangeStatisticImpl; /** diff --git a/activemq-core/src/test/java/org/activemq/management/CountStatisticTest.java b/activemq-core/src/test/java/org/apache/activemq/management/CountStatisticTest.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/management/CountStatisticTest.java rename to activemq-core/src/test/java/org/apache/activemq/management/CountStatisticTest.java index 2b16733cfa..f7424a8114 100755 --- a/activemq-core/src/test/java/org/activemq/management/CountStatisticTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/management/CountStatisticTest.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; + +import org.apache.activemq.management.CountStatisticImpl; public class CountStatisticTest extends StatisticTestSupport { diff --git a/activemq-core/src/test/java/org/activemq/management/RangeStatisticTest.java b/activemq-core/src/test/java/org/apache/activemq/management/RangeStatisticTest.java similarity index 96% rename from activemq-core/src/test/java/org/activemq/management/RangeStatisticTest.java rename to activemq-core/src/test/java/org/apache/activemq/management/RangeStatisticTest.java index 648a6dc4d7..80cffa4419 100755 --- a/activemq-core/src/test/java/org/activemq/management/RangeStatisticTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/management/RangeStatisticTest.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; + +import org.apache.activemq.management.RangeStatisticImpl; public class RangeStatisticTest extends StatisticTestSupport { diff --git a/activemq-core/src/test/java/org/activemq/management/StatisticTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/management/StatisticTestSupport.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/management/StatisticTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/management/StatisticTestSupport.java index b1af01205a..d431463712 100755 --- a/activemq-core/src/test/java/org/activemq/management/StatisticTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/management/StatisticTestSupport.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; + +import org.apache.activemq.management.StatisticImpl; import junit.framework.TestCase; diff --git a/activemq-core/src/test/java/org/activemq/management/TimeStatisticTest.java b/activemq-core/src/test/java/org/apache/activemq/management/TimeStatisticTest.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/management/TimeStatisticTest.java rename to activemq-core/src/test/java/org/apache/activemq/management/TimeStatisticTest.java index 33e0342393..b1e5931814 100755 --- a/activemq-core/src/test/java/org/activemq/management/TimeStatisticTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/management/TimeStatisticTest.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.management; +package org.apache.activemq.management; + +import org.apache.activemq.management.TimeStatisticImpl; public class TimeStatisticTest extends StatisticTestSupport { diff --git a/activemq-core/src/test/java/org/activemq/memory/buffer/DummyMessage.java b/activemq-core/src/test/java/org/apache/activemq/memory/buffer/DummyMessage.java similarity index 91% rename from activemq-core/src/test/java/org/activemq/memory/buffer/DummyMessage.java rename to activemq-core/src/test/java/org/apache/activemq/memory/buffer/DummyMessage.java index 608c8281e4..0c0cec6f2e 100644 --- a/activemq-core/src/test/java/org/activemq/memory/buffer/DummyMessage.java +++ b/activemq-core/src/test/java/org/apache/activemq/memory/buffer/DummyMessage.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory.buffer; +package org.apache.activemq.memory.buffer; -import org.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQMessage; /** * A message implementation which is useful for testing as we can spoof its size diff --git a/activemq-core/src/test/java/org/activemq/memory/buffer/MemoryBufferTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/memory/buffer/MemoryBufferTestSupport.java similarity index 90% rename from activemq-core/src/test/java/org/activemq/memory/buffer/MemoryBufferTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/memory/buffer/MemoryBufferTestSupport.java index 14f2422295..e576e00f40 100644 --- a/activemq-core/src/test/java/org/activemq/memory/buffer/MemoryBufferTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/memory/buffer/MemoryBufferTestSupport.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory.buffer; +package org.apache.activemq.memory.buffer; -import org.activemq.command.ActiveMQMessage; -import org.activemq.memory.buffer.MessageBuffer; -import org.activemq.memory.buffer.MessageQueue; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.memory.buffer.MessageBuffer; +import org.apache.activemq.memory.buffer.MessageQueue; import junit.framework.TestCase; diff --git a/activemq-core/src/test/java/org/activemq/memory/buffer/OrderBasedMemoryBufferTest.java b/activemq-core/src/test/java/org/apache/activemq/memory/buffer/OrderBasedMemoryBufferTest.java similarity index 92% rename from activemq-core/src/test/java/org/activemq/memory/buffer/OrderBasedMemoryBufferTest.java rename to activemq-core/src/test/java/org/apache/activemq/memory/buffer/OrderBasedMemoryBufferTest.java index c96a0f6cc4..baf89a7e50 100644 --- a/activemq-core/src/test/java/org/activemq/memory/buffer/OrderBasedMemoryBufferTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/memory/buffer/OrderBasedMemoryBufferTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory.buffer; +package org.apache.activemq.memory.buffer; -import org.activemq.memory.buffer.MessageBuffer; -import org.activemq.memory.buffer.OrderBasedMessageBuffer; +import org.apache.activemq.memory.buffer.MessageBuffer; +import org.apache.activemq.memory.buffer.OrderBasedMessageBuffer; /** * diff --git a/activemq-core/src/test/java/org/activemq/memory/buffer/SizeBasedMessageBufferTest.java b/activemq-core/src/test/java/org/apache/activemq/memory/buffer/SizeBasedMessageBufferTest.java similarity index 90% rename from activemq-core/src/test/java/org/activemq/memory/buffer/SizeBasedMessageBufferTest.java rename to activemq-core/src/test/java/org/apache/activemq/memory/buffer/SizeBasedMessageBufferTest.java index 437e976da4..fc801ff61e 100644 --- a/activemq-core/src/test/java/org/activemq/memory/buffer/SizeBasedMessageBufferTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/memory/buffer/SizeBasedMessageBufferTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.memory.buffer; +package org.apache.activemq.memory.buffer; -import org.activemq.memory.buffer.MessageBuffer; -import org.activemq.memory.buffer.SizeBasedMessageBuffer; +import org.apache.activemq.memory.buffer.MessageBuffer; +import org.apache.activemq.memory.buffer.SizeBasedMessageBuffer; /** * diff --git a/activemq-core/src/test/java/org/activemq/network/DemandForwardingBridgeTest.java b/activemq-core/src/test/java/org/apache/activemq/network/DemandForwardingBridgeTest.java similarity index 92% rename from activemq-core/src/test/java/org/activemq/network/DemandForwardingBridgeTest.java rename to activemq-core/src/test/java/org/apache/activemq/network/DemandForwardingBridgeTest.java index 5f87f05d5d..ec8679441c 100755 --- a/activemq-core/src/test/java/org/activemq/network/DemandForwardingBridgeTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/network/DemandForwardingBridgeTest.java @@ -14,17 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network; +package org.apache.activemq.network; import javax.jms.DeliveryMode; -import org.activemq.broker.StubConnection; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.ProducerInfo; -import org.activemq.command.SessionInfo; +import org.apache.activemq.broker.StubConnection; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.network.DemandForwardingBridge; import junit.framework.Test; diff --git a/activemq-core/src/test/java/org/activemq/network/ForwardingBridgeTest.java b/activemq-core/src/test/java/org/apache/activemq/network/ForwardingBridgeTest.java similarity index 88% rename from activemq-core/src/test/java/org/activemq/network/ForwardingBridgeTest.java rename to activemq-core/src/test/java/org/apache/activemq/network/ForwardingBridgeTest.java index 6a4b25c577..0950acdfc1 100755 --- a/activemq-core/src/test/java/org/activemq/network/ForwardingBridgeTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/network/ForwardingBridgeTest.java @@ -14,17 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network; +package org.apache.activemq.network; import javax.jms.DeliveryMode; -import org.activemq.broker.StubConnection; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.ProducerInfo; -import org.activemq.command.SessionInfo; +import org.apache.activemq.broker.StubConnection; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.network.ForwardingBridge; import junit.framework.Test; diff --git a/activemq-core/src/test/java/org/activemq/network/NetworkTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/network/NetworkTestSupport.java similarity index 90% rename from activemq-core/src/test/java/org/activemq/network/NetworkTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/network/NetworkTestSupport.java index 86dce26a15..7495c10516 100755 --- a/activemq-core/src/test/java/org/activemq/network/NetworkTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/network/NetworkTestSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network; +package org.apache.activemq.network; import java.io.IOException; import java.net.URI; @@ -22,16 +22,16 @@ import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Iterator; -import org.activemq.broker.BrokerRegistry; -import org.activemq.broker.BrokerService; -import org.activemq.broker.BrokerTestSupport; -import org.activemq.broker.StubConnection; -import org.activemq.broker.TransportConnector; -import org.activemq.memory.UsageManager; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.memory.MemoryPersistenceAdapter; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; +import org.apache.activemq.broker.BrokerRegistry; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.BrokerTestSupport; +import org.apache.activemq.broker.StubConnection; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.memory.MemoryPersistenceAdapter; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; public class NetworkTestSupport extends BrokerTestSupport { diff --git a/activemq-core/src/test/java/org/activemq/network/jms/QueueBridgeTest.java b/activemq-core/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java similarity index 81% rename from activemq-core/src/test/java/org/activemq/network/jms/QueueBridgeTest.java rename to activemq-core/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java index a58f7f3eba..0b3b1ef0e7 100755 --- a/activemq-core/src/test/java/org/activemq/network/jms/QueueBridgeTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; import java.net.URI; import java.util.ArrayList; @@ -22,18 +22,18 @@ import java.util.Iterator; import javax.jms.*; import junit.framework.TestCase; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.broker.BrokerRegistry; -import org.activemq.broker.BrokerService; -import org.activemq.broker.BrokerTestSupport; -import org.activemq.broker.StubConnection; -import org.activemq.broker.TransportConnector; -import org.activemq.broker.region.QueueRegion; -import org.activemq.memory.UsageManager; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.memory.MemoryPersistenceAdapter; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.BrokerRegistry; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.BrokerTestSupport; +import org.apache.activemq.broker.StubConnection; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.broker.region.QueueRegion; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.memory.MemoryPersistenceAdapter; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -51,7 +51,7 @@ public class QueueBridgeTest extends TestCase implements MessageListener { protected void setUp() throws Exception { super.setUp(); - context = new ClassPathXmlApplicationContext("org/activemq/network/jms/queue-config.xml"); + context = new ClassPathXmlApplicationContext("org/apache/activemq/network/jms/queue-config.xml"); ActiveMQConnectionFactory fac = (ActiveMQConnectionFactory) context.getBean("localFactory"); localConnection = fac.createQueueConnection(); localConnection.start(); diff --git a/activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeSpringTest.java b/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeSpringTest.java rename to activemq-core/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java index d2afb6b0ea..f83f53e270 100755 --- a/activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeSpringTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; import javax.jms.Destination; import javax.jms.JMSException; @@ -29,7 +29,8 @@ import javax.jms.TopicConnection; import javax.jms.TopicRequestor; import javax.jms.TopicSession; import junit.framework.TestCase; -import org.activemq.ActiveMQConnectionFactory; + +import org.apache.activemq.ActiveMQConnectionFactory; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -66,7 +67,7 @@ public class TopicBridgeSpringTest extends TestCase implements MessageListener { protected AbstractApplicationContext createApplicationContext() { - return new ClassPathXmlApplicationContext("org/activemq/network/jms/topic-spring.xml"); + return new ClassPathXmlApplicationContext("org/apache/activemq/network/jms/topic-spring.xml"); } diff --git a/activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeXBeanTest.java b/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicBridgeXBeanTest.java similarity index 86% rename from activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeXBeanTest.java rename to activemq-core/src/test/java/org/apache/activemq/network/jms/TopicBridgeXBeanTest.java index bebdc3150e..f437614066 100644 --- a/activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeXBeanTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicBridgeXBeanTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.network.jms; +package org.apache.activemq.network.jms; import org.springframework.context.support.AbstractApplicationContext; import org.xbean.spring.context.ClassPathXmlApplicationContext; @@ -26,7 +26,7 @@ import org.xbean.spring.context.ClassPathXmlApplicationContext; public class TopicBridgeXBeanTest extends TopicBridgeSpringTest { protected AbstractApplicationContext createApplicationContext() { - return new ClassPathXmlApplicationContext("org/activemq/network/jms/topic-config.xml"); + return new ClassPathXmlApplicationContext("org/apache/activemq/network/jms/topic-config.xml"); } } diff --git a/activemq-core/src/test/java/org/activemq/openwire/BrokerInfoData.java b/activemq-core/src/test/java/org/apache/activemq/openwire/BrokerInfoData.java similarity index 88% rename from activemq-core/src/test/java/org/activemq/openwire/BrokerInfoData.java rename to activemq-core/src/test/java/org/apache/activemq/openwire/BrokerInfoData.java index a4d3e73840..48eee3d112 100644 --- a/activemq-core/src/test/java/org/activemq/openwire/BrokerInfoData.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/BrokerInfoData.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire; +package org.apache.activemq.openwire; -import org.activemq.command.BrokerId; -import org.activemq.command.BrokerInfo; +import org.apache.activemq.command.BrokerId; +import org.apache.activemq.command.BrokerInfo; public class BrokerInfoData extends DataFileGenerator { diff --git a/activemq-core/src/test/java/org/activemq/openwire/DataFileGenerator.java b/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java similarity index 96% rename from activemq-core/src/test/java/org/activemq/openwire/DataFileGenerator.java rename to activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java index bcd1b7a7a0..b3772561c1 100644 --- a/activemq-core/src/test/java/org/activemq/openwire/DataFileGenerator.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire; +package org.apache.activemq.openwire; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -28,6 +28,8 @@ import java.net.URL; import java.util.ArrayList; import java.util.Iterator; +import org.apache.activemq.openwire.OpenWireFormat; + import junit.framework.Assert; abstract public class DataFileGenerator extends Assert { @@ -47,7 +49,7 @@ abstract public class DataFileGenerator extends Assert { } moduleBaseDir = basedir; controlDir = new File(moduleBaseDir, "src/test/resources/openwire-control"); - classFileDir = new File(moduleBaseDir, "src/test/java/org/activemq/openwire"); + classFileDir = new File(moduleBaseDir, "src/test/java/org/apache/activemq/openwire"); } public static void main(String[] args) throws Exception { @@ -70,7 +72,7 @@ abstract public class DataFileGenerator extends Assert { if( file.getName().endsWith("Data.java") ) { String cn = file.getName(); cn = cn.substring(0, cn.length() - ".java".length()); - Class clazz = DataFileGenerator.class.getClassLoader().loadClass("org.activemq.openwire."+cn); + Class clazz = DataFileGenerator.class.getClassLoader().loadClass("org.apache.activemq.openwire."+cn); l.add((DataFileGenerator) clazz.newInstance()); } } diff --git a/activemq-core/src/test/java/org/activemq/openwire/ItStillMarshallsTheSameTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/ItStillMarshallsTheSameTest.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/openwire/ItStillMarshallsTheSameTest.java rename to activemq-core/src/test/java/org/apache/activemq/openwire/ItStillMarshallsTheSameTest.java index 700415540f..b0fddca18a 100644 --- a/activemq-core/src/test/java/org/activemq/openwire/ItStillMarshallsTheSameTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/ItStillMarshallsTheSameTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire; +package org.apache.activemq.openwire; import junit.framework.TestCase; diff --git a/activemq-core/src/test/java/org/activemq/openwire/WireFormatInfoData.java b/activemq-core/src/test/java/org/apache/activemq/openwire/WireFormatInfoData.java similarity index 90% rename from activemq-core/src/test/java/org/activemq/openwire/WireFormatInfoData.java rename to activemq-core/src/test/java/org/apache/activemq/openwire/WireFormatInfoData.java index 57f359a4e0..3b03fdda55 100644 --- a/activemq-core/src/test/java/org/activemq/openwire/WireFormatInfoData.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/WireFormatInfoData.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.openwire; +package org.apache.activemq.openwire; -import org.activemq.command.WireFormatInfo; +import org.apache.activemq.command.WireFormatInfo; public class WireFormatInfoData extends DataFileGenerator { diff --git a/activemq-core/src/test/java/org/activemq/perf/PerfConsumer.java b/activemq-core/src/test/java/org/apache/activemq/perf/PerfConsumer.java similarity index 98% rename from activemq-core/src/test/java/org/activemq/perf/PerfConsumer.java rename to activemq-core/src/test/java/org/apache/activemq/perf/PerfConsumer.java index c5ebf31630..db872a19dc 100644 --- a/activemq-core/src/test/java/org/activemq/perf/PerfConsumer.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/PerfConsumer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.perf; +package org.apache.activemq.perf; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/activemq-core/src/test/java/org/activemq/perf/PerfProducer.java b/activemq-core/src/test/java/org/apache/activemq/perf/PerfProducer.java similarity index 98% rename from activemq-core/src/test/java/org/activemq/perf/PerfProducer.java rename to activemq-core/src/test/java/org/apache/activemq/perf/PerfProducer.java index d0273af55f..4a06b2f1bb 100644 --- a/activemq-core/src/test/java/org/activemq/perf/PerfProducer.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/PerfProducer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.perf; +package org.apache.activemq.perf; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/activemq-core/src/test/java/org/activemq/perf/PerfRate.java b/activemq-core/src/test/java/org/apache/activemq/perf/PerfRate.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/perf/PerfRate.java rename to activemq-core/src/test/java/org/apache/activemq/perf/PerfRate.java index 87e1565cf7..cae0c9c625 100644 --- a/activemq-core/src/test/java/org/activemq/perf/PerfRate.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/PerfRate.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.perf; +package org.apache.activemq.perf; /** * @version $Revision: 1.3 $ diff --git a/activemq-core/src/test/java/org/activemq/perf/SimpleDurableTopicTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/perf/SimpleDurableTopicTest.java rename to activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java index d3a2b42fd8..e5fb2765dc 100644 --- a/activemq-core/src/test/java/org/activemq/perf/SimpleDurableTopicTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.perf; +package org.apache.activemq.perf; import javax.jms.ConnectionFactory; import javax.jms.DeliveryMode; diff --git a/activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentQueueTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/SimpleNonPersistentQueueTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentQueueTest.java rename to activemq-core/src/test/java/org/apache/activemq/perf/SimpleNonPersistentQueueTest.java index c508b9a8de..05b928d5b7 100644 --- a/activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentQueueTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/SimpleNonPersistentQueueTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.perf; +package org.apache.activemq.perf; import javax.jms.ConnectionFactory; import javax.jms.DeliveryMode; diff --git a/activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentTopicTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/SimpleNonPersistentTopicTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentTopicTest.java rename to activemq-core/src/test/java/org/apache/activemq/perf/SimpleNonPersistentTopicTest.java index c533fea63b..e58dd219b4 100644 --- a/activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentTopicTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/SimpleNonPersistentTopicTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.perf; +package org.apache.activemq.perf; import javax.jms.ConnectionFactory; import javax.jms.DeliveryMode; diff --git a/activemq-core/src/test/java/org/activemq/perf/SimpleQueueTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/SimpleQueueTest.java similarity index 96% rename from activemq-core/src/test/java/org/activemq/perf/SimpleQueueTest.java rename to activemq-core/src/test/java/org/apache/activemq/perf/SimpleQueueTest.java index 91ba399c84..4ec9aa1964 100644 --- a/activemq-core/src/test/java/org/activemq/perf/SimpleQueueTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/SimpleQueueTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.perf; +package org.apache.activemq.perf; import javax.jms.Destination; import javax.jms.JMSException; diff --git a/activemq-core/src/test/java/org/activemq/perf/SimpleTopicTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/perf/SimpleTopicTest.java rename to activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java index cdd7035e7d..335d1add2f 100644 --- a/activemq-core/src/test/java/org/activemq/perf/SimpleTopicTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.perf; +package org.apache.activemq.perf; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -23,8 +23,9 @@ import javax.jms.Destination; import javax.jms.JMSException; import javax.jms.Session; import junit.framework.TestCase; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.broker.BrokerService; + +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.BrokerService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** diff --git a/activemq-core/src/test/java/org/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java b/activemq-core/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java similarity index 88% rename from activemq-core/src/test/java/org/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java rename to activemq-core/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java index a673e28196..a6ebd849f7 100755 --- a/activemq-core/src/test/java/org/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.pool; +package org.apache.activemq.pool; -import org.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest; +import org.apache.activemq.pool.PooledConnectionFactory; +import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest; import javax.jms.Connection; diff --git a/activemq-core/src/test/java/org/activemq/proxy/ProxyConnectorTest.java b/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyConnectorTest.java similarity index 90% rename from activemq-core/src/test/java/org/activemq/proxy/ProxyConnectorTest.java rename to activemq-core/src/test/java/org/apache/activemq/proxy/ProxyConnectorTest.java index 29fd77a7ad..1fc031b1e3 100755 --- a/activemq-core/src/test/java/org/activemq/proxy/ProxyConnectorTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyConnectorTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.proxy; +package org.apache.activemq.proxy; import javax.jms.DeliveryMode; -import org.activemq.broker.StubConnection; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.ProducerInfo; -import org.activemq.command.SessionInfo; +import org.apache.activemq.broker.StubConnection; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.SessionInfo; import junit.framework.Test; diff --git a/activemq-core/src/test/java/org/activemq/proxy/ProxyTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java similarity index 89% rename from activemq-core/src/test/java/org/activemq/proxy/ProxyTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java index 14da690ca3..993585ae11 100755 --- a/activemq-core/src/test/java/org/activemq/proxy/ProxyTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java @@ -14,20 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.proxy; +package org.apache.activemq.proxy; import java.net.URI; import java.util.ArrayList; import java.util.Iterator; -import org.activemq.broker.BrokerService; -import org.activemq.broker.BrokerTestSupport; -import org.activemq.broker.StubConnection; -import org.activemq.broker.TransportConnector; -import org.activemq.memory.UsageManager; -import org.activemq.store.PersistenceAdapter; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.BrokerTestSupport; +import org.apache.activemq.broker.StubConnection; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.proxy.ProxyConnector; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; public class ProxyTestSupport extends BrokerTestSupport { diff --git a/activemq-core/src/test/java/org/activemq/security/SimpleSecurityBrokerSystemTest.java b/activemq-core/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/security/SimpleSecurityBrokerSystemTest.java rename to activemq-core/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java index 4e3846ef23..46e583a10d 100644 --- a/activemq-core/src/test/java/org/activemq/security/SimpleSecurityBrokerSystemTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.security; +package org.apache.activemq.security; import java.io.IOException; import java.net.URL; @@ -31,14 +31,17 @@ import javax.jms.TextMessage; import junit.framework.Test; -import org.activemq.JmsTestSupport; -import org.activemq.broker.Broker; -import org.activemq.broker.BrokerService; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.filter.DestinationMap; import org.activemq.jaas.GroupPrincipal; +import org.apache.activemq.JmsTestSupport; +import org.apache.activemq.broker.Broker; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.filter.DestinationMap; +import org.apache.activemq.security.JaasAuthenticationBroker; +import org.apache.activemq.security.SimpleAuthenticationBroker; +import org.apache.activemq.security.SimpleAuthorizationBroker; /** * Tests that the broker allows/fails access to destinations based on the diff --git a/activemq-core/src/test/java/org/activemq/selector/SelectorParserTest.java b/activemq-core/src/test/java/org/apache/activemq/selector/SelectorParserTest.java similarity index 87% rename from activemq-core/src/test/java/org/activemq/selector/SelectorParserTest.java rename to activemq-core/src/test/java/org/apache/activemq/selector/SelectorParserTest.java index ce6ba1fbed..1dfd15211f 100755 --- a/activemq-core/src/test/java/org/activemq/selector/SelectorParserTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/selector/SelectorParserTest.java @@ -14,16 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.selector; +package org.apache.activemq.selector; import junit.framework.TestCase; -import org.activemq.filter.BooleanExpression; -import org.activemq.filter.ComparisonExpression; -import org.activemq.filter.Expression; -import org.activemq.filter.LogicExpression; -import org.activemq.filter.PropertyExpression; -import org.activemq.filter.XPathExpression; +import org.apache.activemq.filter.BooleanExpression; +import org.apache.activemq.filter.ComparisonExpression; +import org.apache.activemq.filter.Expression; +import org.apache.activemq.filter.LogicExpression; +import org.apache.activemq.filter.PropertyExpression; +import org.apache.activemq.filter.XPathExpression; +import org.apache.activemq.selector.SelectorParser; /** * @version $Revision: 1.2 $ diff --git a/activemq-core/src/test/java/org/activemq/selector/SelectorTest.java b/activemq-core/src/test/java/org/apache/activemq/selector/SelectorTest.java similarity index 96% rename from activemq-core/src/test/java/org/activemq/selector/SelectorTest.java rename to activemq-core/src/test/java/org/apache/activemq/selector/SelectorTest.java index e8df861108..8d50ceb00e 100755 --- a/activemq-core/src/test/java/org/activemq/selector/SelectorTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/selector/SelectorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.selector; +package org.apache.activemq.selector; import javax.jms.InvalidSelectorException; import javax.jms.JMSException; @@ -22,11 +22,12 @@ import javax.jms.Message; import junit.framework.TestCase; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ActiveMQTextMessage; -import org.activemq.command.ActiveMQTopic; -import org.activemq.filter.BooleanExpression; -import org.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQTextMessage; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.filter.BooleanExpression; +import org.apache.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.selector.SelectorParser; /** * @version $Revision: 1.7 $ @@ -321,7 +322,7 @@ public class SelectorTest extends TestCase { BooleanExpression selector = new SelectorParser().parse(text); assertTrue("Created a valid selector", selector != null); MessageEvaluationContext context = new MessageEvaluationContext(); - context.setMessageReference((org.activemq.command.Message)message); + context.setMessageReference((org.apache.activemq.command.Message)message); boolean value = selector.matches(context); assertEquals("Selector for: " + text, expected, value); } diff --git a/activemq-core/src/test/java/org/activemq/simple/Consumer.java b/activemq-core/src/test/java/org/apache/activemq/simple/Consumer.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/simple/Consumer.java rename to activemq-core/src/test/java/org/apache/activemq/simple/Consumer.java index eb58ca55e3..f1c3b42479 100755 --- a/activemq-core/src/test/java/org/activemq/simple/Consumer.java +++ b/activemq-core/src/test/java/org/apache/activemq/simple/Consumer.java @@ -24,7 +24,7 @@ * program. By default, the program sends one message. Specify * a number after the queue name to send that number of messages. */ -package org.activemq.simple; +package org.apache.activemq.simple; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -34,8 +34,8 @@ import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.Session; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.command.ActiveMQQueue; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.command.ActiveMQQueue; public class Consumer { diff --git a/activemq-core/src/test/java/org/activemq/simple/Producer.java b/activemq-core/src/test/java/org/apache/activemq/simple/Producer.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/simple/Producer.java rename to activemq-core/src/test/java/org/apache/activemq/simple/Producer.java index bab7cbf7bb..3dd703a74c 100755 --- a/activemq-core/src/test/java/org/activemq/simple/Producer.java +++ b/activemq-core/src/test/java/org/apache/activemq/simple/Producer.java @@ -23,7 +23,7 @@ * program. By default, the program sends one message. Specify * a number after the queue name to send that number of messages. */ -package org.activemq.simple; +package org.apache.activemq.simple; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -33,8 +33,8 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.command.ActiveMQQueue; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.command.ActiveMQQueue; public class Producer { diff --git a/activemq-core/src/test/java/org/activemq/spring/ConsumerBean.java b/activemq-core/src/test/java/org/apache/activemq/spring/ConsumerBean.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/spring/ConsumerBean.java rename to activemq-core/src/test/java/org/apache/activemq/spring/ConsumerBean.java index 8f54924869..5ebe8246a0 100755 --- a/activemq-core/src/test/java/org/activemq/spring/ConsumerBean.java +++ b/activemq-core/src/test/java/org/apache/activemq/spring/ConsumerBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.spring; +package org.apache.activemq.spring; import javax.jms.Message; import javax.jms.MessageListener; diff --git a/activemq-core/src/test/java/org/activemq/spring/SpringConsumer.java b/activemq-core/src/test/java/org/apache/activemq/spring/SpringConsumer.java similarity index 98% rename from activemq-core/src/test/java/org/activemq/spring/SpringConsumer.java rename to activemq-core/src/test/java/org/apache/activemq/spring/SpringConsumer.java index e688889016..7adce6c246 100755 --- a/activemq-core/src/test/java/org/activemq/spring/SpringConsumer.java +++ b/activemq-core/src/test/java/org/apache/activemq/spring/SpringConsumer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.spring; +package org.apache.activemq.spring; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/test/java/org/activemq/spring/SpringProducer.java b/activemq-core/src/test/java/org/apache/activemq/spring/SpringProducer.java similarity index 98% rename from activemq-core/src/test/java/org/activemq/spring/SpringProducer.java rename to activemq-core/src/test/java/org/apache/activemq/spring/SpringProducer.java index c551caac89..240d083030 100755 --- a/activemq-core/src/test/java/org/activemq/spring/SpringProducer.java +++ b/activemq-core/src/test/java/org/apache/activemq/spring/SpringProducer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.spring; +package org.apache.activemq.spring; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.core.MessageCreator; diff --git a/activemq-core/src/test/java/org/activemq/spring/SpringTest.java b/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/spring/SpringTest.java rename to activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java index ff9b5bada5..6f3d605d32 100755 --- a/activemq-core/src/test/java/org/activemq/spring/SpringTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.spring; +package org.apache.activemq.spring; import java.util.Iterator; import java.util.List; diff --git a/activemq-core/src/test/java/org/activemq/streams/JMSInputStreamTest.java b/activemq-core/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/streams/JMSInputStreamTest.java rename to activemq-core/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java index 6f96f24bf5..2badb53b54 100755 --- a/activemq-core/src/test/java/org/activemq/streams/JMSInputStreamTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.streams; +package org.apache.activemq.streams; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -22,10 +22,10 @@ import javax.jms.Destination; import junit.framework.Test; -import org.activemq.ActiveMQConnection; -import org.activemq.JmsTestSupport; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.JmsTestSupport; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; diff --git a/activemq-core/src/test/java/org/activemq/test/JmsResourceProvider.java b/activemq-core/src/test/java/org/apache/activemq/test/JmsResourceProvider.java similarity index 90% rename from activemq-core/src/test/java/org/activemq/test/JmsResourceProvider.java rename to activemq-core/src/test/java/org/apache/activemq/test/JmsResourceProvider.java index 65928588cd..5d9c904e0b 100755 --- a/activemq-core/src/test/java/org/activemq/test/JmsResourceProvider.java +++ b/activemq-core/src/test/java/org/apache/activemq/test/JmsResourceProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.test; +package org.apache.activemq.test; import javax.jms.Connection; import javax.jms.ConnectionConsumer; @@ -28,7 +28,7 @@ import javax.jms.Session; import javax.jms.DeliveryMode; import javax.jms.Topic; -import org.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.ActiveMQConnectionFactory; /** * @version $Revision: 1.4 $ @@ -46,7 +46,7 @@ public class JmsResourceProvider { /** * Creates a connection factory. * - * @see org.activemq.test.JmsResourceProvider#createConnectionFactory() + * @see org.apache.activemq.test.JmsResourceProvider#createConnectionFactory() */ public ConnectionFactory createConnectionFactory() throws Exception { return new ActiveMQConnectionFactory(serverUri); @@ -55,7 +55,7 @@ public class JmsResourceProvider { /** * Creates a connection. * - * @see org.activemq.test.JmsResourceProvider#createConnection(javax.jms.ConnectionFactory) + * @see org.apache.activemq.test.JmsResourceProvider#createConnection(javax.jms.ConnectionFactory) */ public Connection createConnection(ConnectionFactory cf) throws JMSException { Connection connection = cf.createConnection(); @@ -66,14 +66,14 @@ public class JmsResourceProvider { } /** - * @see org.activemq.test.JmsResourceProvider#createSession(javax.jms.Connection) + * @see org.apache.activemq.test.JmsResourceProvider#createSession(javax.jms.Connection) */ public Session createSession(Connection conn) throws JMSException { return conn.createSession(transacted, ackMode); } /** - * @see org.activemq.test.JmsResourceProvider#createConsumer(javax.jms.Session, + * @see org.apache.activemq.test.JmsResourceProvider#createConsumer(javax.jms.Session, * javax.jms.Destination) */ public MessageConsumer createConsumer(Session session, @@ -97,7 +97,7 @@ public class JmsResourceProvider { /** * Creates a producer. * - * @see org.activemq.test.JmsResourceProvider#createProducer(javax.jms.Session, + * @see org.apache.activemq.test.JmsResourceProvider#createProducer(javax.jms.Session, * javax.jms.Destination) */ public MessageProducer createProducer(Session session, @@ -110,7 +110,7 @@ public class JmsResourceProvider { /** * Creates a destination, which can either a topic or a queue. * - * @see org.activemq.test.JmsResourceProvider#createDestination(javax.jms.Session, + * @see org.apache.activemq.test.JmsResourceProvider#createDestination(javax.jms.Session, * java.lang.String) */ public Destination createDestination(Session session, String name) diff --git a/activemq-core/src/test/java/org/activemq/test/JmsSendReceiveTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/test/JmsSendReceiveTestSupport.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/test/JmsSendReceiveTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/test/JmsSendReceiveTestSupport.java index e55f510b0f..75bde21279 100755 --- a/activemq-core/src/test/java/org/activemq/test/JmsSendReceiveTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/test/JmsSendReceiveTestSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.test; +package org.apache.activemq.test; import javax.jms.DeliveryMode; import javax.jms.Destination; diff --git a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveTest.java b/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveTest.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveTest.java rename to activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveTest.java index ed9c49e572..14c89b8cf9 100755 --- a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.test; +package org.apache.activemq.test; import javax.jms.Connection; import javax.jms.DeliveryMode; diff --git a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java b/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java similarity index 93% rename from activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java rename to activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java index 17563b01bd..0e4af114ea 100644 --- a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.test; +package org.apache.activemq.test; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.broker.BrokerService; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.BrokerService; import javax.jms.JMSException; import javax.jms.Message; diff --git a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java similarity index 93% rename from activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java index 2af5e07cb4..5aed8b5d61 100644 --- a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.test; +package org.apache.activemq.test; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.broker.BrokerService; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.BrokerService; /** * @version $Revision: 1.3 $ diff --git a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java b/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java similarity index 96% rename from activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java rename to activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java index 8c1dace6db..3a238a7c83 100755 --- a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.test; +package org.apache.activemq.test; import javax.jms.Connection; import javax.jms.DeliveryMode; import javax.jms.Session; -import org.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.ActiveMQConnectionFactory; /** * @version $Revision: 1.3 $ @@ -116,7 +116,7 @@ public class JmsTopicSendReceiveWithTwoConnectionsTest extends JmsSendReceiveTes /** * Creates an ActiveMQConnectionFactory. * - * @see org.activemq.test.TestSupport#createConnectionFactory() + * @see org.apache.activemq.test.TestSupport#createConnectionFactory() */ protected ActiveMQConnectionFactory createConnectionFactory() throws Exception { return new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false"); diff --git a/activemq-core/src/test/java/org/activemq/test/TestSupport.java b/activemq-core/src/test/java/org/apache/activemq/test/TestSupport.java similarity index 96% rename from activemq-core/src/test/java/org/activemq/test/TestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/test/TestSupport.java index ce23210435..ec26dc1ac9 100755 --- a/activemq-core/src/test/java/org/activemq/test/TestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/test/TestSupport.java @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.test; +package org.apache.activemq.test; import junit.framework.TestCase; + +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.command.ActiveMQMessage; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; import javax.jms.Connection; import javax.jms.Destination; diff --git a/activemq-core/src/test/java/org/activemq/test/retroactive/DummyMessageQuery.java b/activemq-core/src/test/java/org/apache/activemq/test/retroactive/DummyMessageQuery.java similarity index 83% rename from activemq-core/src/test/java/org/activemq/test/retroactive/DummyMessageQuery.java rename to activemq-core/src/test/java/org/apache/activemq/test/retroactive/DummyMessageQuery.java index 199dff78fe..331cc11a75 100644 --- a/activemq-core/src/test/java/org/activemq/test/retroactive/DummyMessageQuery.java +++ b/activemq-core/src/test/java/org/apache/activemq/test/retroactive/DummyMessageQuery.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.test.retroactive; +package org.apache.activemq.test.retroactive; -import org.activemq.broker.region.policy.MessageQuery; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQTextMessage; -import org.activemq.command.Message; +import org.apache.activemq.broker.region.policy.MessageQuery; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQTextMessage; +import org.apache.activemq.command.Message; import javax.jms.MessageListener; diff --git a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java b/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java similarity index 85% rename from activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java rename to activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java index caf3878ce4..1d2582f3fe 100644 --- a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.test.retroactive; +package org.apache.activemq.test.retroactive; /** * @@ -22,6 +22,6 @@ package org.activemq.test.retroactive; */ public class RetroactiveConsumerTestWithDestinationBasedBufferTest extends RetroactiveConsumerTestWithSimpleMessageListTest { protected String getBrokerXml() { - return "org/activemq/test/retroactive/activemq-fixed-destination-buffer.xml"; + return "org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml"; } } diff --git a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java b/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java similarity index 89% rename from activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java rename to activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java index e56153d224..887ca9588a 100644 --- a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.test.retroactive; +package org.apache.activemq.test.retroactive; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.EmbeddedBrokerTestSupport; -import org.activemq.broker.BrokerService; -import org.activemq.util.MessageList; -import org.activemq.xbean.BrokerFactoryBean; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.EmbeddedBrokerTestSupport; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.util.MessageList; +import org.apache.activemq.xbean.BrokerFactoryBean; import org.springframework.core.io.ClassPathResource; import javax.jms.Connection; @@ -103,7 +103,7 @@ public class RetroactiveConsumerTestWithSimpleMessageListTest extends EmbeddedBr } protected String getBrokerXml() { - return "org/activemq/test/retroactive/activemq-fixed-buffer.xml"; + return "org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml"; } } diff --git a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java b/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java similarity index 86% rename from activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java rename to activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java index 4568bc83e1..a95785f091 100644 --- a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.test.retroactive; +package org.apache.activemq.test.retroactive; /** * @@ -22,6 +22,6 @@ package org.activemq.test.retroactive; */ public class RetroactiveConsumerTestWithTimePolicyTest extends RetroactiveConsumerTestWithSimpleMessageListTest { protected String getBrokerXml() { - return "org/activemq/test/retroactive/activemq-timed-policy.xml"; + return "org/apache/activemq/test/retroactive/activemq-timed-policy.xml"; } } diff --git a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java b/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java similarity index 89% rename from activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java rename to activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java index f423ecfaa8..3fab1c6fe9 100644 --- a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.test.retroactive; +package org.apache.activemq.test.retroactive; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.EmbeddedBrokerTestSupport; -import org.activemq.broker.BrokerService; -import org.activemq.util.MessageList; -import org.activemq.xbean.BrokerFactoryBean; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.EmbeddedBrokerTestSupport; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.util.MessageList; +import org.apache.activemq.xbean.BrokerFactoryBean; import org.springframework.core.io.ClassPathResource; import javax.jms.Connection; @@ -101,7 +101,7 @@ public class RetroactiveConsumerWithMessageQueryTest extends EmbeddedBrokerTestS } protected String getBrokerXml() { - return "org/activemq/test/retroactive/activemq-message-query.xml"; + return "org/apache/activemq/test/retroactive/activemq-message-query.xml"; } } diff --git a/activemq-core/src/test/java/org/activemq/thread/TaskRunnerTest.java b/activemq-core/src/test/java/org/apache/activemq/thread/TaskRunnerTest.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/thread/TaskRunnerTest.java rename to activemq-core/src/test/java/org/apache/activemq/thread/TaskRunnerTest.java index 9c4fc2460f..64591b44a6 100755 --- a/activemq-core/src/test/java/org/activemq/thread/TaskRunnerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/thread/TaskRunnerTest.java @@ -14,7 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.thread; +package org.apache.activemq.thread; + +import org.apache.activemq.thread.Task; +import org.apache.activemq.thread.TaskRunner; +import org.apache.activemq.thread.TaskRunnerFactory; import junit.framework.TestCase; import edu.emory.mathcs.backport.java.util.concurrent.BrokenBarrierException; diff --git a/activemq-core/src/test/java/org/activemq/transport/TransportBrokerTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java similarity index 87% rename from activemq-core/src/test/java/org/activemq/transport/TransportBrokerTestSupport.java rename to activemq-core/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java index 6e76af77fb..a397cc7459 100755 --- a/activemq-core/src/test/java/org/activemq/transport/TransportBrokerTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java @@ -14,17 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Iterator; -import org.activemq.broker.BrokerService; -import org.activemq.broker.BrokerTest; -import org.activemq.broker.StubConnection; -import org.activemq.broker.TransportConnector; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.BrokerTest; +import org.apache.activemq.broker.StubConnection; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; abstract public class TransportBrokerTestSupport extends BrokerTest { diff --git a/activemq-core/src/test/java/org/activemq/transport/activeio/NIOActiveIOTransportBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/activeio/NIOActiveIOTransportBrokerTest.java similarity index 91% rename from activemq-core/src/test/java/org/activemq/transport/activeio/NIOActiveIOTransportBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/transport/activeio/NIOActiveIOTransportBrokerTest.java index 96b7993541..1da9cb2b73 100644 --- a/activemq-core/src/test/java/org/activemq/transport/activeio/NIOActiveIOTransportBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/activeio/NIOActiveIOTransportBrokerTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.activeio; +package org.apache.activemq.transport.activeio; -import org.activemq.transport.TransportBrokerTestSupport; +import org.apache.activemq.transport.TransportBrokerTestSupport; import junit.framework.Test; diff --git a/activemq-core/src/test/java/org/activemq/transport/activeio/TCPActiveIOTransportBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/activeio/TCPActiveIOTransportBrokerTest.java similarity index 91% rename from activemq-core/src/test/java/org/activemq/transport/activeio/TCPActiveIOTransportBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/transport/activeio/TCPActiveIOTransportBrokerTest.java index f58c7714cb..7bee764b42 100755 --- a/activemq-core/src/test/java/org/activemq/transport/activeio/TCPActiveIOTransportBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/activeio/TCPActiveIOTransportBrokerTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.activeio; +package org.apache.activemq.transport.activeio; -import org.activemq.transport.TransportBrokerTestSupport; +import org.apache.activemq.transport.TransportBrokerTestSupport; import junit.framework.Test; diff --git a/activemq-core/src/test/java/org/activemq/transport/discovery/DiscoveryTransportBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java similarity index 88% rename from activemq-core/src/test/java/org/activemq/transport/discovery/DiscoveryTransportBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java index ed7d5351ce..6b37981553 100755 --- a/activemq-core/src/test/java/org/activemq/transport/discovery/DiscoveryTransportBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.discovery; +package org.apache.activemq.transport.discovery; import java.io.IOException; import java.net.URI; @@ -24,18 +24,18 @@ import javax.jms.DeliveryMode; import junit.framework.Test; -import org.activemq.broker.StubConnection; -import org.activemq.broker.TransportConnector; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.ProducerInfo; -import org.activemq.command.SessionInfo; -import org.activemq.network.NetworkTestSupport; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.failover.FailoverTransport; +import org.apache.activemq.broker.StubConnection; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.network.NetworkTestSupport; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.failover.FailoverTransport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/test/java/org/activemq/transport/failover/BadConnectionTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/failover/BadConnectionTest.java similarity index 89% rename from activemq-core/src/test/java/org/activemq/transport/failover/BadConnectionTest.java rename to activemq-core/src/test/java/org/apache/activemq/transport/failover/BadConnectionTest.java index 975bff8ce3..e55b61080d 100644 --- a/activemq-core/src/test/java/org/activemq/transport/failover/BadConnectionTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/failover/BadConnectionTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.failover; +package org.apache.activemq.transport.failover; -import org.activemq.command.ActiveMQMessage; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; import java.io.IOException; import java.net.URI; diff --git a/activemq-core/src/test/java/org/activemq/transport/failover/FailoverTransportBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java similarity index 87% rename from activemq-core/src/test/java/org/activemq/transport/failover/FailoverTransportBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java index 822d48d493..72c20698f8 100755 --- a/activemq-core/src/test/java/org/activemq/transport/failover/FailoverTransportBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.failover; +package org.apache.activemq.transport.failover; import java.net.URI; @@ -22,18 +22,19 @@ import javax.jms.DeliveryMode; import junit.framework.Test; -import org.activemq.broker.StubConnection; -import org.activemq.broker.TransportConnector; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.ProducerInfo; -import org.activemq.command.SessionInfo; -import org.activemq.network.NetworkTestSupport; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; +import org.apache.activemq.broker.StubConnection; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.network.NetworkTestSupport; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.failover.FailoverTransport; public class FailoverTransportBrokerTest extends NetworkTestSupport { diff --git a/activemq-core/src/test/java/org/activemq/transport/fanout/FanoutTransportBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java similarity index 91% rename from activemq-core/src/test/java/org/activemq/transport/fanout/FanoutTransportBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java index 86d9d817af..e3db27ca58 100755 --- a/activemq-core/src/test/java/org/activemq/transport/fanout/FanoutTransportBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.fanout; +package org.apache.activemq.transport.fanout; import java.io.IOException; import java.net.URI; @@ -23,20 +23,20 @@ import javax.jms.DeliveryMode; import junit.framework.Test; -import org.activemq.broker.StubConnection; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.Command; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.ProducerInfo; -import org.activemq.command.SessionInfo; -import org.activemq.network.NetworkTestSupport; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.transport.TransportFilter; -import org.activemq.transport.mock.MockTransport; +import org.apache.activemq.broker.StubConnection; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.network.NetworkTestSupport; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.transport.TransportFilter; +import org.apache.activemq.transport.mock.MockTransport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/test/java/org/activemq/transport/peer/PeerTransportTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java similarity index 93% rename from activemq-core/src/test/java/org/activemq/transport/peer/PeerTransportTest.java rename to activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java index a033e55c64..b556081c6b 100755 --- a/activemq-core/src/test/java/org/activemq/transport/peer/PeerTransportTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.activemq.transport.peer; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTextMessage; -import org.activemq.command.ActiveMQTopic; -import org.activemq.util.MessageList; +package org.apache.activemq.transport.peer; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTextMessage; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.util.MessageList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-core/src/test/java/org/activemq/transport/stomp/StompTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java similarity index 93% rename from activemq-core/src/test/java/org/activemq/transport/stomp/StompTest.java rename to activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java index 0694f3e83e..59e0cfb301 100644 --- a/activemq-core/src/test/java/org/activemq/transport/stomp/StompTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,11 +29,12 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.CombinationTestSupport; -import org.activemq.broker.BrokerService; -import org.activemq.broker.TransportConnector; -import org.activemq.command.ActiveMQQueue; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.CombinationTestSupport; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.transport.stomp.Stomp; public class StompTest extends CombinationTestSupport { diff --git a/activemq-core/src/test/java/org/activemq/transport/stomp/StompWireFormatTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompWireFormatTest.java similarity index 88% rename from activemq-core/src/test/java/org/activemq/transport/stomp/StompWireFormatTest.java rename to activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompWireFormatTest.java index 23fdd3bf69..deac604993 100644 --- a/activemq-core/src/test/java/org/activemq/transport/stomp/StompWireFormatTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompWireFormatTest.java @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.stomp; +package org.apache.activemq.transport.stomp; -import org.activemq.broker.BrokerService; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.Response; -import org.activemq.command.SessionInfo; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.Response; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.transport.stomp.Stomp; +import org.apache.activemq.transport.stomp.StompWireFormat; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/activemq-core/src/test/java/org/activemq/transport/tcp/TcpTransportBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java similarity index 91% rename from activemq-core/src/test/java/org/activemq/transport/tcp/TcpTransportBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java index 0c93996d9c..1c460eb4bc 100755 --- a/activemq-core/src/test/java/org/activemq/transport/tcp/TcpTransportBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.tcp; +package org.apache.activemq.transport.tcp; -import org.activemq.transport.TransportBrokerTestSupport; +import org.apache.activemq.transport.TransportBrokerTestSupport; import junit.framework.Test; diff --git a/activemq-core/src/test/java/org/activemq/transport/vm/VMTransportBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerTest.java similarity index 90% rename from activemq-core/src/test/java/org/activemq/transport/vm/VMTransportBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerTest.java index 1559d1581d..93ac325eb0 100755 --- a/activemq-core/src/test/java/org/activemq/transport/vm/VMTransportBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.vm; +package org.apache.activemq.transport.vm; -import org.activemq.transport.TransportBrokerTestSupport; +import org.apache.activemq.transport.TransportBrokerTestSupport; import junit.framework.Test; diff --git a/activemq-core/src/test/java/org/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java similarity index 83% rename from activemq-core/src/test/java/org/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java index dbead8f95a..952e555d09 100755 --- a/activemq-core/src/test/java/org/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport.vm; +package org.apache.activemq.transport.vm; import java.net.URI; import java.net.URISyntaxException; import javax.jms.DeliveryMode; -import org.activemq.broker.BrokerRegistry; -import org.activemq.broker.BrokerTestSupport; -import org.activemq.broker.StubConnection; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ConnectionInfo; -import org.activemq.command.ConsumerInfo; -import org.activemq.command.Message; -import org.activemq.command.ProducerInfo; -import org.activemq.command.SessionInfo; -import org.activemq.transport.Transport; -import org.activemq.transport.TransportFactory; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.broker.BrokerRegistry; +import org.apache.activemq.broker.BrokerTestSupport; +import org.apache.activemq.broker.StubConnection; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.ProducerInfo; +import org.apache.activemq.command.SessionInfo; +import org.apache.activemq.transport.Transport; +import org.apache.activemq.transport.TransportFactory; +import org.apache.activemq.util.IOExceptionSupport; /** * Used to see if the VM transport starts an embedded broker on demand. diff --git a/activemq-core/src/test/java/org/activemq/util/MessageList.java b/activemq-core/src/test/java/org/apache/activemq/util/MessageList.java similarity index 99% rename from activemq-core/src/test/java/org/activemq/util/MessageList.java rename to activemq-core/src/test/java/org/apache/activemq/util/MessageList.java index 9b6ac37155..0b2c644719 100644 --- a/activemq-core/src/test/java/org/activemq/util/MessageList.java +++ b/activemq-core/src/test/java/org/apache/activemq/util/MessageList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import java.util.ArrayList; import java.util.Iterator; diff --git a/activemq-core/src/test/java/org/activemq/util/ReflectionSupportTest.java b/activemq-core/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java similarity index 93% rename from activemq-core/src/test/java/org/activemq/util/ReflectionSupportTest.java rename to activemq-core/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java index e68445f041..329605face 100755 --- a/activemq-core/src/test/java/org/activemq/util/ReflectionSupportTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; +import org.apache.activemq.util.IntrospectionSupport; + import junit.framework.TestCase; public class ReflectionSupportTest extends TestCase { diff --git a/activemq-core/src/test/java/org/activemq/util/SimplePojo.java b/activemq-core/src/test/java/org/apache/activemq/util/SimplePojo.java similarity index 97% rename from activemq-core/src/test/java/org/activemq/util/SimplePojo.java rename to activemq-core/src/test/java/org/apache/activemq/util/SimplePojo.java index 55201037cf..430da74e1b 100755 --- a/activemq-core/src/test/java/org/activemq/util/SimplePojo.java +++ b/activemq-core/src/test/java/org/apache/activemq/util/SimplePojo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import java.net.URI; diff --git a/activemq-core/src/test/java/org/activemq/util/URISupportTest.java b/activemq-core/src/test/java/org/apache/activemq/util/URISupportTest.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/util/URISupportTest.java rename to activemq-core/src/test/java/org/apache/activemq/util/URISupportTest.java index e05b3490d2..2c2e1b647d 100644 --- a/activemq-core/src/test/java/org/activemq/util/URISupportTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/util/URISupportTest.java @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.util; +package org.apache.activemq.util; import java.net.URI; import java.net.URISyntaxException; import java.util.Map; -import org.activemq.util.URISupport.CompositeData; +import org.apache.activemq.util.URISupport; +import org.apache.activemq.util.URISupport.CompositeData; import junit.framework.TestCase; diff --git a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java b/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java similarity index 95% rename from activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java rename to activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java index b6a3b99635..397d495e4a 100644 --- a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.xbean; +package org.apache.activemq.xbean; /** * diff --git a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java similarity index 94% rename from activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java index 229ac6fed3..d3f3dba1c8 100644 --- a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.xbean; +package org.apache.activemq.xbean; -import org.activemq.EmbeddedBrokerTestSupport; +import org.apache.activemq.EmbeddedBrokerTestSupport; import javax.jms.Connection; diff --git a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java b/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java similarity index 90% rename from activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java rename to activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java index 9acb5eaa5c..7b4d75c27b 100644 --- a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.xbean; +package org.apache.activemq.xbean; -import org.activemq.ActiveMQConnectionFactory; -import org.activemq.broker.BrokerService; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.BrokerService; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -46,7 +46,7 @@ public class MultipleTestsWithSpringFactoryBeanTest extends TestCase { System.out.println("### starting up the test case: " + getName()); super.setUp(); - context = new ClassPathXmlApplicationContext("org/activemq/xbean/spring2.xml"); + context = new ClassPathXmlApplicationContext("org/apache/activemq/xbean/spring2.xml"); service = (BrokerService) context.getBean("broker"); // already started diff --git a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java b/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java similarity index 86% rename from activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java rename to activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java index 214b6e26b9..c109559807 100644 --- a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.xbean; +package org.apache.activemq.xbean; -import org.activemq.broker.BrokerService; +import org.apache.activemq.broker.BrokerService; import org.springframework.context.support.ClassPathXmlApplicationContext; /** @@ -27,7 +27,7 @@ public class MultipleTestsWithSpringXBeanFactoryBeanTest extends MultipleTestsWi private ClassPathXmlApplicationContext context; protected BrokerService createBroker() throws Exception { - context = new ClassPathXmlApplicationContext("org/activemq/xbean/spring2.xml"); + context = new ClassPathXmlApplicationContext("org/apache/activemq/xbean/spring2.xml"); return (BrokerService) context.getBean("broker"); } diff --git a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java b/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java similarity index 81% rename from activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java rename to activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java index f457ff738e..a30561c2f0 100644 --- a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.xbean; +package org.apache.activemq.xbean; -import org.activemq.broker.BrokerService; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.xbean.BrokerFactoryBean; import org.springframework.core.io.ClassPathResource; /** @@ -26,7 +27,7 @@ public class MultipleTestsWithXBeanFactoryBeanTest extends MultipleTestsWithEmbe protected BrokerService createBroker() throws Exception { BrokerFactoryBean factory = new BrokerFactoryBean(); - factory.setConfig(new ClassPathResource("org/activemq/xbean/activemq2.xml")); + factory.setConfig(new ClassPathResource("org/apache/activemq/xbean/activemq2.xml")); factory.afterPropertiesSet(); return factory.getBroker(); } diff --git a/activemq-core/src/test/java/org/activemq/xbean/XBeanConfigTest.java b/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java similarity index 80% rename from activemq-core/src/test/java/org/activemq/xbean/XBeanConfigTest.java rename to activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java index 8e9eb27d96..afac80c5db 100644 --- a/activemq-core/src/test/java/org/activemq/xbean/XBeanConfigTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java @@ -14,21 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.xbean; +package org.apache.activemq.xbean; -import org.activemq.broker.Broker; -import org.activemq.broker.BrokerService; -import org.activemq.broker.ConnectionContext; -import org.activemq.broker.region.Topic; -import org.activemq.broker.region.policy.DispatchPolicy; -import org.activemq.broker.region.policy.LastImageSubscriptionRecoveryPolicy; -import org.activemq.broker.region.policy.RoundRobinDispatchPolicy; -import org.activemq.broker.region.policy.StrictOrderDispatchPolicy; -import org.activemq.broker.region.policy.SubscriptionRecoveryPolicy; -import org.activemq.broker.region.policy.TimedSubscriptionRecoveryPolicy; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.ConnectionId; -import org.activemq.command.ConnectionInfo; +import org.apache.activemq.broker.Broker; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.broker.region.Topic; +import org.apache.activemq.broker.region.policy.DispatchPolicy; +import org.apache.activemq.broker.region.policy.LastImageSubscriptionRecoveryPolicy; +import org.apache.activemq.broker.region.policy.RoundRobinDispatchPolicy; +import org.apache.activemq.broker.region.policy.StrictOrderDispatchPolicy; +import org.apache.activemq.broker.region.policy.SubscriptionRecoveryPolicy; +import org.apache.activemq.broker.region.policy.TimedSubscriptionRecoveryPolicy; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.ConnectionId; +import org.apache.activemq.command.ConnectionInfo; +import org.apache.activemq.xbean.BrokerFactoryBean; import org.springframework.core.io.ClassPathResource; import junit.framework.TestCase; @@ -106,7 +107,7 @@ public class XBeanConfigTest extends TestCase { } protected BrokerService createBroker() throws Exception { - BrokerFactoryBean factory = new BrokerFactoryBean(new ClassPathResource("org/activemq/xbean/activemq-policy.xml")); + BrokerFactoryBean factory = new BrokerFactoryBean(new ClassPathResource("org/apache/activemq/xbean/activemq-policy.xml")); factory.afterPropertiesSet(); return factory.getBroker(); } diff --git a/activemq-core/src/test/java/org/activemq/xbean/XBeanXmlTest.java b/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanXmlTest.java similarity index 83% rename from activemq-core/src/test/java/org/activemq/xbean/XBeanXmlTest.java rename to activemq-core/src/test/java/org/apache/activemq/xbean/XBeanXmlTest.java index 4c2515d13a..ccf58c332f 100755 --- a/activemq-core/src/test/java/org/activemq/xbean/XBeanXmlTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanXmlTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.xbean; +package org.apache.activemq.xbean; -import org.activemq.broker.SpringTest; +import org.apache.activemq.broker.SpringTest; public class XBeanXmlTest extends SpringTest { public void testSenderWithSpringXml() throws Exception { - assertSenderConfig("org/activemq/xbean/spring.xml"); + assertSenderConfig("org/apache/activemq/xbean/spring.xml"); } } diff --git a/activemq-core/src/test/resources/jndi.properties b/activemq-core/src/test/resources/jndi.properties index 833cf79207..2e06b3f107 100755 --- a/activemq-core/src/test/resources/jndi.properties +++ b/activemq-core/src/test/resources/jndi.properties @@ -1,6 +1,6 @@ # START SNIPPET: jndi -java.naming.factory.initial = org.activemq.jndi.ActiveMQInitialContextFactory +java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory # use the following property to configure the default connector java.naming.provider.url = vm://localhost diff --git a/activemq-core/src/test/resources/log4j.properties b/activemq-core/src/test/resources/log4j.properties index 3c5120b4eb..8150db523e 100755 --- a/activemq-core/src/test/resources/log4j.properties +++ b/activemq-core/src/test/resources/log4j.properties @@ -3,7 +3,7 @@ # log4j.rootLogger=INFO, out -log4j.logger.org.activemq.spring=WARN +log4j.logger.org.apache.activemq.spring=WARN # CONSOLE appender not used by default log4j.appender.stdout=org.apache.log4j.ConsoleAppender diff --git a/activemq-core/src/test/resources/login.config b/activemq-core/src/test/resources/login.config index 42513ed407..116ae03ccf 100644 --- a/activemq-core/src/test/resources/login.config +++ b/activemq-core/src/test/resources/login.config @@ -1,6 +1,6 @@ activemq-test-domain { org.activemq.jaas.PropertiesLoginModule required debug=true - org.activemq.jaas.properties.user="org/activemq/security/users.properties" - org.activemq.jaas.properties.group="org/activemq/security/groups.properties"; + org.activemq.jaas.properties.user="org/apache/activemq/security/users.properties" + org.activemq.jaas.properties.group="org/apache/activemq/security/groups.properties"; }; \ No newline at end of file diff --git a/activemq-core/src/test/resources/org/activemq/broker/spring.xml b/activemq-core/src/test/resources/org/apache/activemq/broker/spring.xml similarity index 80% rename from activemq-core/src/test/resources/org/activemq/broker/spring.xml rename to activemq-core/src/test/resources/org/apache/activemq/broker/spring.xml index 491a0eff22..2f0718238f 100644 --- a/activemq-core/src/test/resources/org/activemq/broker/spring.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/broker/spring.xml @@ -6,7 +6,7 @@ - @@ -18,7 +18,7 @@ + class="org.apache.activemq.ActiveMQConnectionFactory"> @@ -37,7 +37,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -63,10 +63,10 @@ - - org.activemq.spring.Test.spring.topic + org.apache.activemq.spring.Test.spring.topic diff --git a/activemq-core/src/test/resources/org/activemq/broker/store/loadtester.xml b/activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml similarity index 100% rename from activemq-core/src/test/resources/org/activemq/broker/store/loadtester.xml rename to activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml diff --git a/activemq-core/src/test/resources/org/activemq/filter/dummyPolicy.xml b/activemq-core/src/test/resources/org/apache/activemq/filter/dummyPolicy.xml similarity index 70% rename from activemq-core/src/test/resources/org/activemq/filter/dummyPolicy.xml rename to activemq-core/src/test/resources/org/apache/activemq/filter/dummyPolicy.xml index f9a850154e..11772a165f 100644 --- a/activemq-core/src/test/resources/org/activemq/filter/dummyPolicy.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/filter/dummyPolicy.xml @@ -3,14 +3,14 @@ - + - + - + diff --git a/activemq-core/src/test/resources/org/activemq/network/jms/queue-config.xml b/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-config.xml similarity index 75% rename from activemq-core/src/test/resources/org/activemq/network/jms/queue-config.xml rename to activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-config.xml index 319e0bcece..23a03ad344 100644 --- a/activemq-core/src/test/resources/org/activemq/network/jms/queue-config.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-config.xml @@ -4,7 +4,7 @@ - @@ -17,13 +17,13 @@ + class="org.apache.activemq.ActiveMQConnectionFactory"> - @@ -41,13 +41,13 @@ + class="org.apache.activemq.ActiveMQConnectionFactory"> + class="org.apache.activemq.network.jms.JmsQueueConnector"> @@ -58,8 +58,8 @@ - - + + diff --git a/activemq-core/src/test/resources/org/activemq/network/jms/topic-config.xml b/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-config.xml similarity index 74% rename from activemq-core/src/test/resources/org/activemq/network/jms/topic-config.xml rename to activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-config.xml index f0daf7bcac..506346545d 100644 --- a/activemq-core/src/test/resources/org/activemq/network/jms/topic-config.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-config.xml @@ -4,7 +4,7 @@ - @@ -17,13 +17,13 @@ + class="org.apache.activemq.ActiveMQConnectionFactory"> - @@ -41,13 +41,13 @@ + class="org.apache.activemq.ActiveMQConnectionFactory"> + class="org.apache.activemq.network.jms.JmsTopicConnector"> @@ -58,8 +58,8 @@ - - + + diff --git a/activemq-core/src/test/resources/org/activemq/network/jms/topic-spring.xml b/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-spring.xml similarity index 74% rename from activemq-core/src/test/resources/org/activemq/network/jms/topic-spring.xml rename to activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-spring.xml index cb6f818cf2..7f48142f63 100644 --- a/activemq-core/src/test/resources/org/activemq/network/jms/topic-spring.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-spring.xml @@ -4,7 +4,7 @@ - @@ -17,13 +17,13 @@ + class="org.apache.activemq.ActiveMQConnectionFactory"> - @@ -41,13 +41,13 @@ + class="org.apache.activemq.ActiveMQConnectionFactory"> + class="org.apache.activemq.network.jms.JmsTopicConnector"> @@ -58,8 +58,8 @@ - - + + diff --git a/activemq-core/src/test/resources/org/activemq/security/groups.properties b/activemq-core/src/test/resources/org/apache/activemq/security/groups.properties similarity index 100% rename from activemq-core/src/test/resources/org/activemq/security/groups.properties rename to activemq-core/src/test/resources/org/apache/activemq/security/groups.properties diff --git a/activemq-core/src/test/resources/org/activemq/security/users.properties b/activemq-core/src/test/resources/org/apache/activemq/security/users.properties similarity index 100% rename from activemq-core/src/test/resources/org/activemq/security/users.properties rename to activemq-core/src/test/resources/org/apache/activemq/security/users.properties diff --git a/activemq-core/src/test/resources/org/activemq/test/retroactive/activemq-fixed-buffer.xml b/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml similarity index 90% rename from activemq-core/src/test/resources/org/activemq/test/retroactive/activemq-fixed-buffer.xml rename to activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml index 9a0ab79935..b8781b82ef 100644 --- a/activemq-core/src/test/resources/org/activemq/test/retroactive/activemq-fixed-buffer.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml @@ -9,7 +9,7 @@ - + diff --git a/activemq-core/src/test/resources/org/activemq/test/retroactive/activemq-fixed-destination-buffer.xml b/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml similarity index 91% rename from activemq-core/src/test/resources/org/activemq/test/retroactive/activemq-fixed-destination-buffer.xml rename to activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml index 09f23efc85..85f7512fb2 100644 --- a/activemq-core/src/test/resources/org/activemq/test/retroactive/activemq-fixed-destination-buffer.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml @@ -9,7 +9,7 @@ - + diff --git a/activemq-core/src/test/resources/org/activemq/test/retroactive/activemq-message-query.xml b/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml similarity index 83% rename from activemq-core/src/test/resources/org/activemq/test/retroactive/activemq-message-query.xml rename to activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml index 2e34ff2388..32c89d2ba0 100644 --- a/activemq-core/src/test/resources/org/activemq/test/retroactive/activemq-message-query.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml @@ -10,7 +10,7 @@ - + @@ -21,6 +21,6 @@ + class="org.apache.activemq.test.retroactive.DummyMessageQuery" /> diff --git a/activemq-core/src/test/resources/org/activemq/test/retroactive/activemq-timed-policy.xml b/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml similarity index 90% rename from activemq-core/src/test/resources/org/activemq/test/retroactive/activemq-timed-policy.xml rename to activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml index a55298bd03..3ce52091a7 100644 --- a/activemq-core/src/test/resources/org/activemq/test/retroactive/activemq-timed-policy.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml @@ -9,7 +9,7 @@ - + diff --git a/activemq-core/src/test/resources/org/activemq/xbean/activemq-policy.xml b/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml similarity index 100% rename from activemq-core/src/test/resources/org/activemq/xbean/activemq-policy.xml rename to activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml diff --git a/activemq-core/src/test/resources/org/activemq/xbean/activemq.xml b/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml similarity index 100% rename from activemq-core/src/test/resources/org/activemq/xbean/activemq.xml rename to activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml diff --git a/activemq-core/src/test/resources/org/activemq/xbean/activemq2.xml b/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml similarity index 100% rename from activemq-core/src/test/resources/org/activemq/xbean/activemq2.xml rename to activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml diff --git a/activemq-core/src/test/resources/org/activemq/xbean/spring.xml b/activemq-core/src/test/resources/org/apache/activemq/xbean/spring.xml similarity index 70% rename from activemq-core/src/test/resources/org/activemq/xbean/spring.xml rename to activemq-core/src/test/resources/org/apache/activemq/xbean/spring.xml index 9908bcd25c..24406b0980 100644 --- a/activemq-core/src/test/resources/org/activemq/xbean/spring.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/xbean/spring.xml @@ -6,13 +6,13 @@ - - + + + class="org.apache.activemq.ActiveMQConnectionFactory"> @@ -29,7 +29,7 @@ - + @@ -37,14 +37,14 @@ - + - - + diff --git a/activemq-core/src/test/resources/org/activemq/xbean/spring2.xml b/activemq-core/src/test/resources/org/apache/activemq/xbean/spring2.xml similarity index 55% rename from activemq-core/src/test/resources/org/activemq/xbean/spring2.xml rename to activemq-core/src/test/resources/org/apache/activemq/xbean/spring2.xml index 2e0466ad3a..c0a611851d 100644 --- a/activemq-core/src/test/resources/org/activemq/xbean/spring2.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/xbean/spring2.xml @@ -2,7 +2,7 @@ - - + + diff --git a/activemq-core/src/test/resources/spring-embedded.xml b/activemq-core/src/test/resources/spring-embedded.xml index 7aa3334215..a8b9cc8abd 100755 --- a/activemq-core/src/test/resources/spring-embedded.xml +++ b/activemq-core/src/test/resources/spring-embedded.xml @@ -5,12 +5,12 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -53,9 +53,9 @@ - + - org.activemq.spring.Test.spring.embedded + org.apache.activemq.spring.Test.spring.embedded diff --git a/activemq-core/src/test/resources/spring-jndi.xml b/activemq-core/src/test/resources/spring-jndi.xml index bcc5e138c9..d33d3c99c4 100755 --- a/activemq-core/src/test/resources/spring-jndi.xml +++ b/activemq-core/src/test/resources/spring-jndi.xml @@ -11,7 +11,7 @@ - org.activemq.jndi.ActiveMQInitialContextFactory + org.apache.activemq.jndi.ActiveMQInitialContextFactory example.Spring.MyTopic @@ -58,7 +58,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -84,7 +84,7 @@ - + example.Spring.MyTopic diff --git a/activemq-core/src/test/resources/spring-queue.xml b/activemq-core/src/test/resources/spring-queue.xml index bbe8e5f7f2..f0cae526a9 100755 --- a/activemq-core/src/test/resources/spring-queue.xml +++ b/activemq-core/src/test/resources/spring-queue.xml @@ -5,7 +5,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -52,9 +52,9 @@ - + - org.activemq.spring.Test.spring.queue + org.apache.activemq.spring.Test.spring.queue diff --git a/activemq-core/src/test/resources/spring.xml b/activemq-core/src/test/resources/spring.xml index 670e30f321..bfce0f1f9b 100755 --- a/activemq-core/src/test/resources/spring.xml +++ b/activemq-core/src/test/resources/spring.xml @@ -5,7 +5,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -48,9 +48,9 @@ - + - org.activemq.spring.Test.spring.topic + org.apache.activemq.spring.Test.spring.topic