qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r1237273 [1/4] - in /qpid/trunk/qpid/java: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/ broker-plugins/access-control/src/main/java/org/apache/qpid/se...
Date Sun, 29 Jan 2012 13:05:13 GMT
Author: rgodfrey
Date: Sun Jan 29 13:05:07 2012
New Revision: 1237273

URL: http://svn.apache.org/viewvc?rev=1237273&view=rev
Log:
QPID-3789 : [Java] code tidyups

Removed:
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/collections/KeyValue.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/collections/ReferenceMap.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractKeyValue.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractMapEntry.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/DefaultMapEntry.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/PrettyPrintingUtils.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/
Modified:
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/DatabaseVisitor.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/BindingTupleBindingFactory.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageContentKeyTupleBindingFactory.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTupleBindingFactory.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTupleBindingFactory.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_4.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_5.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/TupleBindingFactory.java
    qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java
    qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java
    qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
    qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
    qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlActivator.java
    qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java
    qpid/trunk/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java
    qpid/trunk/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java
    qpid/trunk/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java
    qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallActivator.java
    qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFProperty.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfig.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicNormalizer.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/WindowCreditManager.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/output/HeaderPropertiesConverter.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9_1/ProtocolOutputConverterImpl.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AuthorizationHolder.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ImplicitAcceptDispositionChangeListener.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostHouseKeepingPlugin.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java
    qpid/trunk/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
    qpid/trunk/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
    qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
    qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
    qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/Closeable.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_8.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Node.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser_0_10.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/NoFailover.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java
    qpid/trunk/qpid/java/common/Type.tpl
    qpid/trunk/qpid/java/common/src/main/java/org/apache/configuration/PropertyNameResolver.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQStoreException.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/common/ServerPropertyNames.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/QpidProperty.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/thread/Threading.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSetFactory.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayerFactory.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/Serial.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/UUIDs.java

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java Sun Jan 29 13:05:07 2012
@@ -27,6 +27,10 @@ import org.apache.qpid.framing.AMQShortS
 
 public class AMQShortStringEncoding
 {
+    private AMQShortStringEncoding()
+    {
+    }
+
     public static AMQShortString readShortString(TupleInput tupleInput)
     {
         int length = (int) tupleInput.readShort();

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java Sun Jan 29 13:05:07 2012
@@ -151,7 +151,7 @@ public class BDBMessageStore implements 
      * messageId (long) - bodySize (integer), metaData (MessageMetaData encoded as binary)
      *
      * Message (Content):
-     * messageId (long), byteOffset (integer) - dataLength(integer), data(binary);
+     * messageId (long), byteOffset (integer) - dataLength(integer), data(binary)
      */
 
     private LogSubject _logSubject;
@@ -429,9 +429,6 @@ public class BDBMessageStore implements 
         envConfig.setTransactional(true);
         envConfig.setConfigParam("je.lock.nLockTables", "7");
 
-        // Restore 500,000 default timeout.
-        //envConfig.setLockTimeout(15000);
-
         // Added to help diagnosis of Deadlock issue
         // http://www.oracle.com/technology/products/berkeley-db/faq/je_faq.html#23
         if (Boolean.getBoolean("qpid.bdb.lock.debug"))
@@ -903,7 +900,6 @@ public class BDBMessageStore implements 
     public void removeMessage(long messageId, boolean sync) throws AMQStoreException
     {
 
-        // _log.debug("public void removeMessage(Long messageId = " + messageId): called");
         boolean complete = false;
         com.sleepycat.je.Transaction tx = null;
 
@@ -1116,9 +1112,6 @@ public class BDBMessageStore implements 
      */
     public void bindQueue(Exchange exchange, AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQStoreException
     {
-        // _log.debug("public void bindQueue(Exchange exchange = " + exchange + ", AMQShortString routingKey = " + routingKey
-        // + ", AMQQueue queue = " + queue + ", FieldTable args = " + args + "): called");
-
         if (_state != State.RECOVERING)
         {
             BindingKey bindingRecord = new BindingKey(exchange.getNameShortString(),
@@ -1408,8 +1401,6 @@ public class BDBMessageStore implements 
     public void enqueueMessage(final com.sleepycat.je.Transaction tx, final TransactionLogResource queue,
                                long messageId) throws AMQStoreException
     {
-        // _log.debug("public void enqueueMessage(Transaction tx = " + tx + ", AMQShortString name = " + name + ", Long messageId): called");
-
         AMQShortString name = AMQShortString.valueOf(queue.getResourceName());
 
         DatabaseEntry key = new DatabaseEntry();
@@ -1498,11 +1489,6 @@ public class BDBMessageStore implements 
      */
     private StoreFuture commitTranImpl(final com.sleepycat.je.Transaction tx, boolean syncCommit) throws AMQStoreException
     {
-        //if (_log.isDebugEnabled())
-        //{
-        //    _log.debug("public void commitTranImpl() called with (Transaction=" + tx + ", syncCommit= "+ syncCommit + ")");
-        //}
-
         if (tx == null)
         {
             throw new AMQStoreException("Fatal internal error: transactional is null at commitTran");
@@ -1969,8 +1955,6 @@ public class BDBMessageStore implements 
 
     private StoreFuture commit(com.sleepycat.je.Transaction tx, boolean syncCommit) throws DatabaseException
     {
-        // _log.debug("void commit(Transaction tx = " + tx + ", sync = " + syncCommit + "): called");
-
         tx.commitNoSync();
 
         BDBCommitFuture commitFuture = new BDBCommitFuture(_commitThread, tx, syncCommit);
@@ -1986,8 +1970,6 @@ public class BDBMessageStore implements 
 
     private static final class BDBCommitFuture implements StoreFuture
     {
-        // private static final Logger _log = Logger.getLogger(BDBCommitFuture.class);
-
         private final CommitThread _commitThread;
         private final com.sleepycat.je.Transaction _tx;
         private DatabaseException _databaseException;
@@ -1996,9 +1978,6 @@ public class BDBMessageStore implements 
 
         public BDBCommitFuture(CommitThread commitThread, com.sleepycat.je.Transaction tx, boolean syncCommit)
         {
-            // _log.debug("public Commit(CommitThread commitThread = " + commitThread + ", Transaction tx = " + tx
-            // + "): called");
-
             _commitThread = commitThread;
             _tx = tx;
             _syncCommit = syncCommit;
@@ -2017,9 +1996,6 @@ public class BDBMessageStore implements 
 
         public synchronized void abort(DatabaseException databaseException)
         {
-            // _log.debug("public synchronized void abort(DatabaseException databaseException = " + databaseException
-            // + "): called");
-
             _complete = true;
             _databaseException = databaseException;
 
@@ -2028,8 +2004,6 @@ public class BDBMessageStore implements 
 
         public void commit() throws DatabaseException
         {
-            //_log.debug("public void commit(): called");
-
             _commitThread.addJob(this, _syncCommit);
 
             if(!_syncCommit)
@@ -2039,7 +2013,6 @@ public class BDBMessageStore implements 
             }
 
             waitForCompletion();
-            // _log.debug("Commit completed, _databaseException = " + _databaseException);
 
             if (_databaseException != null)
             {
@@ -2081,8 +2054,6 @@ public class BDBMessageStore implements 
      */
     private class CommitThread extends Thread
     {
-        // private final Logger _log = Logger.getLogger(CommitThread.class);
-
         private final AtomicBoolean _stopped = new AtomicBoolean(false);
         private final Queue<BDBCommitFuture> _jobQueue = new ConcurrentLinkedQueue<BDBCommitFuture>();
         private final CheckpointConfig _config = new CheckpointConfig();
@@ -2119,7 +2090,6 @@ public class BDBMessageStore implements 
                         }
                         catch (InterruptedException e)
                         {
-                            // _log.info(getName() + " interrupted. ");
                         }
                     }
                 }
@@ -2129,8 +2099,6 @@ public class BDBMessageStore implements 
 
         private void processJobs()
         {
-            // _log.debug("private void processJobs(): called");
-
             int size = _jobQueue.size();
 
             try

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java Sun Jan 29 13:05:07 2012
@@ -65,6 +65,7 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Set;
 
 /**
  * This is a simple BerkeleyDB Store upgrade tool that will upgrade a V4 Store to a V5 Store.
@@ -407,87 +408,39 @@ public class BDBStoreUpgrade
     {
         _logger.info("Starting store upgrade from version 4");
         
-        //Migrate _exchangeDb;
+        //Migrate _exchangeDb
         _logger.info("Exchanges");
 
         moveContents(_oldMessageStore.getExchangesDb(), _newMessageStore.getExchangesDb(), "Exchange");
 
-        final List<AMQShortString> topicExchanges = new ArrayList<AMQShortString>();
-        final TupleBinding exchangeTB = new ExchangeTB();
-        
-        DatabaseVisitor exchangeListVisitor = new DatabaseVisitor()
-        {           
-            public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
-            {
-                ExchangeRecord exchangeRec = (ExchangeRecord) exchangeTB.entryToObject(value);
-                AMQShortString type = exchangeRec.getType();
 
-                if (ExchangeDefaults.TOPIC_EXCHANGE_CLASS.equals(type))
-                {
-                    topicExchanges.add(exchangeRec.getNameShortString());
-                }
-            }
-        };
+        TopicExchangeDiscoverer exchangeListVisitor = new TopicExchangeDiscoverer();
         _oldMessageStore.visitExchanges(exchangeListVisitor);
 
 
-        //Migrate _queueBindingsDb;
+        //Migrate _queueBindingsDb
         _logger.info("Queue Bindings");
         moveContents(_oldMessageStore.getBindingsDb(), _newMessageStore.getBindingsDb(), "Queue Binding");
 
         //Inspect the bindings to gather a list of queues which are probably durable subscriptions, i.e. those 
         //which have a colon in their name and are bound to the Topic exchanges above
-        final List<AMQShortString> durableSubQueues = new ArrayList<AMQShortString>();
-        final TupleBinding<BindingKey> bindingTB = _oldMessageStore.getBindingTupleBindingFactory().getInstance();
-        
-        DatabaseVisitor durSubQueueListVisitor = new DatabaseVisitor()
-        {           
-            public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
-            {
-                BindingKey bindingRec = (BindingKey) bindingTB.entryToObject(key);
-                AMQShortString queueName = bindingRec.getQueueName();
-                AMQShortString exchangeName = bindingRec.getExchangeName();
-                
-                if (topicExchanges.contains(exchangeName) && queueName.asString().contains(":"))
-                {
-                    durableSubQueues.add(queueName);
-                }
-            }
-        };
+        DurableSubDiscoverer durSubQueueListVisitor =
+                new DurableSubDiscoverer(exchangeListVisitor.getTopicExchanges(),
+                                         _oldMessageStore.getBindingTupleBindingFactory().getInstance());
         _oldMessageStore.visitBindings(durSubQueueListVisitor);
 
+        final List<AMQShortString> durableSubQueues = durSubQueueListVisitor.getDurableSubQueues();
 
-        //Migrate _queueDb;
+        //Migrate _queueDb
         _logger.info("Queues");
 
         // hold the list of existing queue names
-        final List<AMQShortString> existingQueues = new ArrayList<AMQShortString>();
 
         final TupleBinding<QueueRecord> queueTupleBinding = _oldMessageStore.getQueueTupleBindingFactory().getInstance();
 
-        DatabaseVisitor queueVisitor = new DatabaseVisitor()
-        {
-            public void visit(DatabaseEntry key, DatabaseEntry value) throws AMQStoreException
-            {
-                QueueRecord queueRec = (QueueRecord) queueTupleBinding.entryToObject(value);
-                AMQShortString queueName = queueRec.getNameShortString();
-
-                //if the queue name is in the gathered list then set its exclusivity true
-                if (durableSubQueues.contains(queueName))
-                {
-                    _logger.info("Marking as possible DurableSubscription backing queue: " + queueName);
-                    queueRec.setExclusive(true);
-                }
-                
-                //The simple call to createQueue with the QueueRecord object is sufficient for a v2->v3 upgrade as
-                //the extra 'exclusive' property in v3 will be defaulted to false in the record creation.
-                _newMessageStore.createQueue(queueRec);
-
-                _count++;
-                existingQueues.add(queueName);
-            }
-        };
+        QueueVisitor queueVisitor = new QueueVisitor(queueTupleBinding, durableSubQueues, _newMessageStore);
         _oldMessageStore.visitQueues(queueVisitor);
+        final List<AMQShortString> existingQueues = queueVisitor.getExistingQueues();
 
         logCount(queueVisitor.getVisitedCount(), "Queue");
 
@@ -495,42 +448,15 @@ public class BDBStoreUpgrade
         // Look for persistent messages stored for non-durable queues
         _logger.info("Checking for messages previously sent to non-durable queues");
 
-        // track all message delivery to existing queues
-        final HashSet<Long> queueMessages = new HashSet<Long>();
-
-        // hold all non existing queues and their messages IDs
-        final HashMap<String, HashSet<Long>> phantomMessageQueues = new HashMap<String, HashSet<Long>>();
-
         // delivery DB visitor to check message delivery and identify non existing queues
         final QueueEntryTB queueEntryTB = new QueueEntryTB();
-        DatabaseVisitor messageDeliveryCheckVisitor = new DatabaseVisitor()
-        {
-            public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
-            {
-                QueueEntryKey entryKey = (QueueEntryKey) queueEntryTB.entryToObject(key);
-                Long messageId = entryKey.getMessageId();
-                AMQShortString queueName = entryKey.getQueueName();
-                if (!existingQueues.contains(queueName))
-                {
-                    String name = queueName.asString();
-                    HashSet<Long> messages = phantomMessageQueues.get(name);
-                    if (messages == null)
-                    {
-                        messages = new HashSet<Long>();
-                        phantomMessageQueues.put(name, messages);
-                    }
-                    messages.add(messageId);
-                    _count++;
-                }
-                else
-                {
-                    queueMessages.add(messageId);
-                }
-            }
-        };
+        MessageDeliveryCheckVisitor messageDeliveryCheckVisitor =
+                new MessageDeliveryCheckVisitor(queueEntryTB, queueVisitor.getExistingQueues());
         _oldMessageStore.visitDelivery(messageDeliveryCheckVisitor);
 
-        if (phantomMessageQueues.isEmpty())
+        final Set<Long> queueMessages = messageDeliveryCheckVisitor.getQueueMessages();
+
+        if (messageDeliveryCheckVisitor.getPhantomMessageQueues().isEmpty())
         {
             _logger.info("No such messages were found");
         }
@@ -538,7 +464,7 @@ public class BDBStoreUpgrade
         {
             _logger.info("Found " + messageDeliveryCheckVisitor.getVisitedCount()+ " such messages in total");
 
-            for (Entry<String, HashSet<Long>> phantomQueue : phantomMessageQueues.entrySet())
+            for (Entry<String, HashSet<Long>> phantomQueue : messageDeliveryCheckVisitor.getPhantomMessageQueues().entrySet())
             {
                 String queueName = phantomQueue.getKey();
                 HashSet<Long> messages = phantomQueue.getValue();
@@ -572,40 +498,20 @@ public class BDBStoreUpgrade
         }
 
 
-        //Migrate _messageMetaDataDb;
+        //Migrate _messageMetaDataDb
         _logger.info("Message MetaData");
         
         final Database newMetaDataDB = _newMessageStore.getMetaDataDb();
-        final TupleBinding<Object> oldMetaDataTupleBinding = _oldMessageStore.getMetaDataTupleBindingFactory().getInstance();
-        final TupleBinding<Object> newMetaDataTupleBinding = _newMessageStore.getMetaDataTupleBindingFactory().getInstance();
-        
-        DatabaseVisitor metaDataVisitor = new DatabaseVisitor()
-        {
-            public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
-            {
-                _count++;
-                MessageMetaData metaData = (MessageMetaData) oldMetaDataTupleBinding.entryToObject(value);
-
-                // get message id
-                Long messageId = TupleBinding.getPrimitiveBinding(Long.class).entryToObject(key);
 
-                // ONLY copy data if message is delivered to existing queue
-                if (!queueMessages.contains(messageId))
-                {
-                    return;
-                }
-                DatabaseEntry newValue = new DatabaseEntry();
-                newMetaDataTupleBinding.objectToEntry(metaData, newValue);
-                
-                newMetaDataDB.put(null, key, newValue);
-            }
-        };
+        MetaDataVisitor metaDataVisitor = new MetaDataVisitor(queueMessages, newMetaDataDB,
+                _oldMessageStore.getMetaDataTupleBindingFactory().getInstance(),
+                _newMessageStore.getMetaDataTupleBindingFactory().getInstance());
         _oldMessageStore.visitMetaDataDb(metaDataVisitor);
 
         logCount(metaDataVisitor.getVisitedCount(), "Message MetaData");
 
 
-        //Migrate _messageContentDb;
+        //Migrate _messageContentDb
         _logger.info("Message Contents");
         final Database newContentDB = _newMessageStore.getContentDb();
         
@@ -613,74 +519,17 @@ public class BDBStoreUpgrade
         final TupleBinding<MessageContentKey> newContentKeyTupleBinding = new MessageContentKeyTB_5();
         final TupleBinding contentTB = new ContentTB();
         
-        DatabaseVisitor contentVisitor = new DatabaseVisitor()
-        {
-            private long _prevMsgId = -1; //Initialise to invalid value
-            private int _bytesSeenSoFar = 0;
-            
-            public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
-            {
-                _count++;
-
-                //determine the msgId of the current entry
-                MessageContentKey_4 contentKey = (MessageContentKey_4) oldContentKeyTupleBinding.entryToObject(key);
-                long msgId = contentKey.getMessageId();
-
-                // ONLY copy data if message is delivered to existing queue
-                if (!queueMessages.contains(msgId))
-                {
-                    return;
-                }
-                //if this is a new message, restart the byte offset count.
-                if(_prevMsgId != msgId)
-                {
-                    _bytesSeenSoFar = 0;
-                }
-
-                //determine the content size
-                ByteBuffer content = (ByteBuffer) contentTB.entryToObject(value);
-                int contentSize = content.limit();
-
-                //create the new key: id + previously seen data count
-                MessageContentKey_5 newKey = new MessageContentKey_5(msgId, _bytesSeenSoFar);
-                DatabaseEntry newKeyEntry = new DatabaseEntry();
-                newContentKeyTupleBinding.objectToEntry(newKey, newKeyEntry);
-
-                DatabaseEntry newValueEntry = new DatabaseEntry();
-                contentTB.objectToEntry(content, newValueEntry);
-
-                newContentDB.put(null, newKeyEntry, newValueEntry);
-
-                _prevMsgId = msgId;
-                _bytesSeenSoFar += contentSize;
-            }
-        };
+        DatabaseVisitor contentVisitor = new ContentVisitor(oldContentKeyTupleBinding, queueMessages,
+                                                            contentTB, newContentKeyTupleBinding, newContentDB);
         _oldMessageStore.visitContentDb(contentVisitor);
 
         logCount(contentVisitor.getVisitedCount(), "Message Content");
 
 
-        //Migrate _deliveryDb;
+        //Migrate _deliveryDb
         _logger.info("Delivery Records");
         final Database deliveryDb =_newMessageStore.getDeliveryDb();
-        DatabaseVisitor deliveryDbVisitor = new DatabaseVisitor()
-        {
-
-            public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
-            {
-                _count++;
-
-                // get message id from entry key
-                QueueEntryKey entryKey = (QueueEntryKey) queueEntryTB.entryToObject(key);
-                AMQShortString queueName = entryKey.getQueueName();
-
-                // ONLY copy data if message queue exists
-                if (existingQueues.contains(queueName))
-                {
-                    deliveryDb.put(null, key, value);
-                }
-            }
-        };
+        DatabaseVisitor deliveryDbVisitor = new DeliveryDbVisitor(queueEntryTB, existingQueues, deliveryDb);
         _oldMessageStore.visitDelivery(deliveryDbVisitor);
         logCount(contentVisitor.getVisitedCount(), "Delivery Record");
     }
@@ -711,7 +560,7 @@ public class BDBStoreUpgrade
         {
             public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
             {
-                _count++;
+                incrementCount();
                 newDatabase.put(null, key, value);
             }
         };
@@ -1117,4 +966,280 @@ public class BDBStoreUpgrade
         System.exit(0);
     }
 
+    private static class TopicExchangeDiscoverer extends DatabaseVisitor
+    {
+        private final List<AMQShortString> topicExchanges = new ArrayList<AMQShortString>();
+        private final TupleBinding exchangeTB = new ExchangeTB();
+
+        public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
+        {
+            ExchangeRecord exchangeRec = (ExchangeRecord) exchangeTB.entryToObject(value);
+            AMQShortString type = exchangeRec.getType();
+
+            if (ExchangeDefaults.TOPIC_EXCHANGE_CLASS.equals(type))
+            {
+                topicExchanges.add(exchangeRec.getNameShortString());
+            }
+        }
+
+        public List<AMQShortString> getTopicExchanges()
+        {
+            return topicExchanges;
+        }
+    }
+
+    private static class MessageDeliveryCheckVisitor extends DatabaseVisitor
+    {
+        private final QueueEntryTB _queueEntryTB;
+        private final List<AMQShortString> _existingQueues;
+
+        // track all message delivery to existing queues
+        private final HashSet<Long> _queueMessages = new HashSet<Long>();
+
+        // hold all non existing queues and their messages IDs
+        private final HashMap<String, HashSet<Long>> _phantomMessageQueues = new HashMap<String, HashSet<Long>>();
+
+
+
+        public MessageDeliveryCheckVisitor(QueueEntryTB queueEntryTB, List<AMQShortString> existingQueues)
+        {
+            _queueEntryTB = queueEntryTB;
+            _existingQueues = existingQueues;
+        }
+
+        public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
+        {
+            QueueEntryKey entryKey = (QueueEntryKey) _queueEntryTB.entryToObject(key);
+            Long messageId = entryKey.getMessageId();
+            AMQShortString queueName = entryKey.getQueueName();
+            if (!_existingQueues.contains(queueName))
+            {
+                String name = queueName.asString();
+                HashSet<Long> messages = _phantomMessageQueues.get(name);
+                if (messages == null)
+                {
+                    messages = new HashSet<Long>();
+                    _phantomMessageQueues.put(name, messages);
+                }
+                messages.add(messageId);
+                incrementCount();
+            }
+            else
+            {
+                _queueMessages.add(messageId);
+            }
+        }
+
+        public HashSet<Long> getQueueMessages()
+        {
+            return _queueMessages;
+        }
+
+        public HashMap<String, HashSet<Long>> getPhantomMessageQueues()
+        {
+            return _phantomMessageQueues;
+        }
+    }
+
+    private static class ContentVisitor extends DatabaseVisitor
+    {
+        private long _prevMsgId; //Initialise to invalid value
+        private int _bytesSeenSoFar;
+        private final TupleBinding<MessageContentKey> _oldContentKeyTupleBinding;
+        private final Set<Long> _queueMessages;
+        private final TupleBinding _contentTB;
+        private final TupleBinding<MessageContentKey> _newContentKeyTupleBinding;
+        private final Database _newContentDB;
+
+        public ContentVisitor(TupleBinding<MessageContentKey> oldContentKeyTupleBinding, Set<Long> queueMessages, TupleBinding contentTB, TupleBinding<MessageContentKey> newContentKeyTupleBinding, Database newContentDB)
+        {
+            _oldContentKeyTupleBinding = oldContentKeyTupleBinding;
+            _queueMessages = queueMessages;
+            _contentTB = contentTB;
+            _newContentKeyTupleBinding = newContentKeyTupleBinding;
+            _newContentDB = newContentDB;
+            _prevMsgId = -1;
+            _bytesSeenSoFar = 0;
+        }
+
+        public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
+        {
+            incrementCount();
+
+            //determine the msgId of the current entry
+            MessageContentKey_4 contentKey = (MessageContentKey_4) _oldContentKeyTupleBinding.entryToObject(key);
+            long msgId = contentKey.getMessageId();
+
+            // ONLY copy data if message is delivered to existing queue
+            if (!_queueMessages.contains(msgId))
+            {
+                return;
+            }
+            //if this is a new message, restart the byte offset count.
+            if(_prevMsgId != msgId)
+            {
+                _bytesSeenSoFar = 0;
+            }
+
+            //determine the content size
+            ByteBuffer content = (ByteBuffer) _contentTB.entryToObject(value);
+            int contentSize = content.limit();
+
+            //create the new key: id + previously seen data count
+            MessageContentKey_5 newKey = new MessageContentKey_5(msgId, _bytesSeenSoFar);
+            DatabaseEntry newKeyEntry = new DatabaseEntry();
+            _newContentKeyTupleBinding.objectToEntry(newKey, newKeyEntry);
+
+            DatabaseEntry newValueEntry = new DatabaseEntry();
+            _contentTB.objectToEntry(content, newValueEntry);
+
+            _newContentDB.put(null, newKeyEntry, newValueEntry);
+
+            _prevMsgId = msgId;
+            _bytesSeenSoFar += contentSize;
+        }
+    }
+
+    private static class DeliveryDbVisitor extends DatabaseVisitor
+    {
+
+        private final QueueEntryTB _queueEntryTB;
+        private final List<AMQShortString> _existingQueues;
+        private final Database _deliveryDb;
+
+        public DeliveryDbVisitor(QueueEntryTB queueEntryTB, List<AMQShortString> existingQueues, Database deliveryDb)
+        {
+            _queueEntryTB = queueEntryTB;
+            _existingQueues = existingQueues;
+            _deliveryDb = deliveryDb;
+        }
+
+        public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
+        {
+            incrementCount();
+
+            // get message id from entry key
+            QueueEntryKey entryKey = (QueueEntryKey) _queueEntryTB.entryToObject(key);
+            AMQShortString queueName = entryKey.getQueueName();
+
+            // ONLY copy data if message queue exists
+            if (_existingQueues.contains(queueName))
+            {
+                _deliveryDb.put(null, key, value);
+            }
+        }
+    }
+
+    private class DurableSubDiscoverer extends DatabaseVisitor
+    {
+        private final List<AMQShortString> _durableSubQueues;
+        private final TupleBinding<BindingKey> _bindingTB;
+        private final List<AMQShortString> _topicExchanges;
+
+
+        public DurableSubDiscoverer(List<AMQShortString> topicExchanges, TupleBinding<BindingKey> bindingTB)
+        {
+            _durableSubQueues = new ArrayList<AMQShortString>();
+            _bindingTB = bindingTB;
+            _topicExchanges = topicExchanges;
+        }
+
+        public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
+        {
+            BindingKey bindingRec = _bindingTB.entryToObject(key);
+            AMQShortString queueName = bindingRec.getQueueName();
+            AMQShortString exchangeName = bindingRec.getExchangeName();
+
+            if (_topicExchanges.contains(exchangeName) && queueName.asString().contains(":"))
+            {
+                _durableSubQueues.add(queueName);
+            }
+        }
+
+        public List<AMQShortString> getDurableSubQueues()
+        {
+            return _durableSubQueues;
+        }
+    }
+
+    private static class QueueVisitor extends DatabaseVisitor
+    {
+        private final TupleBinding<QueueRecord> _queueTupleBinding;
+        private final List<AMQShortString> _durableSubQueues;
+        private final List<AMQShortString> _existingQueues = new ArrayList<AMQShortString>();
+        private final BDBMessageStore _newMessageStore;
+
+        public QueueVisitor(TupleBinding<QueueRecord> queueTupleBinding,
+                            List<AMQShortString> durableSubQueues,
+                            BDBMessageStore newMessageStore)
+        {
+            _queueTupleBinding = queueTupleBinding;
+            _durableSubQueues = durableSubQueues;
+            _newMessageStore = newMessageStore;
+        }
+
+        public void visit(DatabaseEntry key, DatabaseEntry value) throws AMQStoreException
+        {
+            QueueRecord queueRec = _queueTupleBinding.entryToObject(value);
+            AMQShortString queueName = queueRec.getNameShortString();
+
+            //if the queue name is in the gathered list then set its exclusivity true
+            if (_durableSubQueues.contains(queueName))
+            {
+                _logger.info("Marking as possible DurableSubscription backing queue: " + queueName);
+                queueRec.setExclusive(true);
+            }
+
+            //The simple call to createQueue with the QueueRecord object is sufficient for a v2->v3 upgrade as
+            //the extra 'exclusive' property in v3 will be defaulted to false in the record creation.
+            _newMessageStore.createQueue(queueRec);
+
+            incrementCount();
+            _existingQueues.add(queueName);
+        }
+
+        public List<AMQShortString> getExistingQueues()
+        {
+            return _existingQueues;
+        }
+    }
+
+    private static class MetaDataVisitor extends DatabaseVisitor
+    {
+        private final TupleBinding<Object> _oldMetaDataTupleBinding;
+        private final TupleBinding<Object> _newMetaDataTupleBinding;
+        private final Set<Long> _queueMessages;
+        private final Database _newMetaDataDB;
+
+        public MetaDataVisitor(Set<Long> queueMessages,
+                               Database newMetaDataDB,
+                               TupleBinding<Object> oldMetaDataTupleBinding,
+                               TupleBinding<Object> newMetaDataTupleBinding)
+        {
+            _queueMessages = queueMessages;
+            _newMetaDataDB = newMetaDataDB;
+            _oldMetaDataTupleBinding = oldMetaDataTupleBinding;
+            _newMetaDataTupleBinding = newMetaDataTupleBinding;
+        }
+
+
+        public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
+        {
+            incrementCount();
+            MessageMetaData metaData = (MessageMetaData) _oldMetaDataTupleBinding.entryToObject(value);
+
+            // get message id
+            Long messageId = TupleBinding.getPrimitiveBinding(Long.class).entryToObject(key);
+
+            // ONLY copy data if message is delivered to existing queue
+            if (!_queueMessages.contains(messageId))
+            {
+                return;
+            }
+            DatabaseEntry newValue = new DatabaseEntry();
+            _newMetaDataTupleBinding.objectToEntry(metaData, newValue);
+
+            _newMetaDataDB.put(null, key, newValue);
+        }
+    }
 }

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/DatabaseVisitor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/DatabaseVisitor.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/DatabaseVisitor.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/DatabaseVisitor.java Sun Jan 29 13:05:07 2012
@@ -28,15 +28,20 @@ import org.apache.qpid.AMQStoreException
 /** Visitor Interface so that each DatabaseEntry for a database can easily be processed. */
 public abstract class DatabaseVisitor
 {
-    protected int _count;
+    private int _count;
 
     abstract public void visit(DatabaseEntry entry, DatabaseEntry value) throws AMQStoreException, DatabaseException;
 
-    public int getVisitedCount()
+    public final int getVisitedCount()
     {
         return _count;
     }
 
+    protected final void incrementCount()
+    {
+        _count++;
+    }
+
     public void resetVisitCount()
     {
         _count = 0;

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java Sun Jan 29 13:05:07 2012
@@ -32,6 +32,10 @@ import java.io.IOException;
 
 public class FieldTableEncoding
 {
+    private FieldTableEncoding()
+    {
+    }
+
     public static FieldTable readFieldTable(TupleInput tupleInput) throws DatabaseException
     {
         long length = tupleInput.readLong();

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/BindingTupleBindingFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/BindingTupleBindingFactory.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/BindingTupleBindingFactory.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/BindingTupleBindingFactory.java Sun Jan 29 13:05:07 2012
@@ -33,7 +33,7 @@ public class BindingTupleBindingFactory 
 
     public TupleBinding<BindingKey> getInstance()
     {
-        switch (_version)
+        switch (getVersion())
         {
             default:
             case 5:

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageContentKeyTupleBindingFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageContentKeyTupleBindingFactory.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageContentKeyTupleBindingFactory.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageContentKeyTupleBindingFactory.java Sun Jan 29 13:05:07 2012
@@ -33,7 +33,7 @@ public class MessageContentKeyTupleBindi
 
     public TupleBinding<MessageContentKey> getInstance()
     {
-        switch (_version)
+        switch (getVersion())
         {
             default:
             case 5:

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTupleBindingFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTupleBindingFactory.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTupleBindingFactory.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTupleBindingFactory.java Sun Jan 29 13:05:07 2012
@@ -31,7 +31,7 @@ public class MessageMetaDataTupleBinding
 
     public TupleBinding<Object> getInstance()
     {
-        switch (_version)
+        switch (getVersion())
         {
             default:
             case 5:

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTupleBindingFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTupleBindingFactory.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTupleBindingFactory.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTupleBindingFactory.java Sun Jan 29 13:05:07 2012
@@ -34,7 +34,7 @@ public class QueueTupleBindingFactory ex
 
     public TupleBinding<QueueRecord> getInstance()
     {
-        switch (_version)
+        switch (getVersion())
         {
             default:
             case 5:

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_4.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_4.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_4.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_4.java Sun Jan 29 13:05:07 2012
@@ -34,9 +34,7 @@ import org.apache.qpid.server.store.berk
 
 public class QueueTuple_4 extends TupleBinding<QueueRecord> implements QueueTuple
 {
-    protected static final Logger _logger = Logger.getLogger(QueueTuple_4.class);
-
-    protected FieldTable _arguments;
+    private static final Logger _logger = Logger.getLogger(QueueTuple_4.class);
 
     public QueueTuple_4()
     {

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_5.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_5.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_5.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_5.java Sun Jan 29 13:05:07 2012
@@ -33,9 +33,7 @@ import org.apache.qpid.server.store.berk
 
 public class QueueTuple_5 extends QueueTuple_4
 {
-    protected static final Logger _logger = Logger.getLogger(QueueTuple_5.class);
-
-    protected FieldTable _arguments;
+    private static final Logger _logger = Logger.getLogger(QueueTuple_5.class);
 
     public QueueTuple_5()
     {

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/TupleBindingFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/TupleBindingFactory.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/TupleBindingFactory.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/TupleBindingFactory.java Sun Jan 29 13:05:07 2012
@@ -24,7 +24,7 @@ import com.sleepycat.bind.tuple.TupleBin
 
 public abstract class TupleBindingFactory<E>
 {
-    protected int _version;
+    private final int _version;
 
     public TupleBindingFactory(int version)
     {
@@ -32,4 +32,9 @@ public abstract class TupleBindingFactor
     }
 
     public abstract TupleBinding<E> getInstance();
+
+    public int getVersion()
+    {
+        return _version;
+    }
 }

Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java Sun Jan 29 13:05:07 2012
@@ -27,10 +27,10 @@ import org.apache.log4j.Logger;
 
 public abstract class AbstractConfiguration implements ConfigurationFile
 {
-    protected static final Logger _logger = Logger.getLogger(ConfigurationFile.class);
+    private static final Logger _logger = Logger.getLogger(ConfigurationFile.class);
     
-    protected File _file;
-    protected RuleSet _config;
+    private File _file;
+    private RuleSet _config;
     
     public AbstractConfiguration(File file)
     {

Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java Sun Jan 29 13:05:07 2012
@@ -21,8 +21,6 @@
 package org.apache.qpid.server.security.access.config;
 
 import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -35,7 +33,7 @@ import org.apache.qpid.server.security.a
 /**
  * An access control v2 rule action.
  * 
- * An action consists of an {@link Operation} on an {@link ObjectType} with certain properties, stored in a {@link Map}.
+ * An action consists of an {@link Operation} on an {@link ObjectType} with certain properties, stored in a {@link java.util.Map}.
  * The operation and object should be an allowable combination, based on the {@link ObjectType#isAllowed(Operation)}
  * method of the object, which is exposed as the {@link #isAllowed()} method here. The internal {@link #propertiesMatch(Map)}
  * and {@link #valueMatches(String, String)} methods are used to determine wildcarded matching of properties, with
@@ -136,12 +134,6 @@ public class Action
             }
             else if (a.getOperation() == b.getOperation())
             {
-                // Same operator, compare rest of action
-                
-//                    || (getOperation() == a.getOperation()
-//                        && getObjectType() == a.getObjectType()
-//                        && _properties.matches(a.getProperties())));
-
                 return 1; // b is more specific
             }
             else // Different operations

Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java Sun Jan 29 13:05:07 2012
@@ -78,7 +78,7 @@ public class PlainConfiguration extends 
         
         try
         {
-            _st = new StreamTokenizer(new BufferedReader(new FileReader(_file)));
+            _st = new StreamTokenizer(new BufferedReader(new FileReader(getFile())));
             _st.resetSyntax(); // setup the tokenizer
                 
             _st.commentChar(COMMENT); // single line comments

Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java Sun Jan 29 13:05:07 2012
@@ -312,9 +312,9 @@ public class RuleSet
         return true;
     }
 
-    // C++ broker authorise function prototype
+    // CPP broker authorise function prototype
     // virtual bool authorise(const std::string& id, const Action& action, const ObjectType& objType,
-    //        const std::string& name, std::map<Property, std::string>* params=0);
+    //        const std::string& name, std::map<Property, std::string>* params=0)
 
     // Possibly add a String name paramater?
 

Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlActivator.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlActivator.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlActivator.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlActivator.java Sun Jan 29 13:05:07 2012
@@ -23,10 +23,9 @@ package org.apache.qpid.server.security.
 import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory;
 import org.apache.qpid.server.security.SecurityPluginActivator;
 import org.apache.qpid.server.security.SecurityPluginFactory;
-import org.osgi.framework.BundleActivator;
 
 /**
- * The OSGi {@link BundleActivator} for {@link AccessControl}.
+ * The OSGi {@link org.osgi.framework.BundleActivator} for {@link AccessControl}.
  */
 public class AccessControlActivator extends SecurityPluginActivator
 {

Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java Sun Jan 29 13:05:07 2012
@@ -58,7 +58,7 @@ public class AccessControlConfiguration 
 
     public String getFileName()
     {
-        return _configuration.getString("");
+        return getConfig().getString("");
     }
 
     public void validateConfiguration() throws ConfigurationException

Modified: qpid/trunk/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java Sun Jan 29 13:05:07 2012
@@ -42,6 +42,10 @@ public class AppInfo
 
     private static Map<String, String> appInfoMap = new TreeMap<String, String>();
 
+    private AppInfo()
+    {
+    }
+
     /**
      * getInfo method retrieves a key-value map for specific application properties
      *

Modified: qpid/trunk/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java Sun Jan 29 13:05:07 2012
@@ -45,6 +45,10 @@ public class SystemInfo
             "os.arch", "os.name", "os.version", "sun.arch.data.model",
             "user.home", "user.dir", "user.name", "user.timezone");
 
+    private SystemInfo()
+    {
+    }
+
     /**
      * getInfo collects all the properties specified in sysprops list
      * @return A Map<String,String>

Modified: qpid/trunk/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java Sun Jan 29 13:05:07 2012
@@ -54,9 +54,6 @@ public class DiagnosticExchange extends 
     public static final AMQShortString DIAGNOSTIC_EXCHANGE_CLASS = new AMQShortString("x-diagnostic");
     public static final AMQShortString DIAGNOSTIC_EXCHANGE_NAME = new AMQShortString("diagnostic");
 
-    /** The logger */
-    //private static final Logger _logger = Logger.getLogger(DiagnosticExchange.class);
-
     /**
      * MBean class implementing the management interfaces.
      */
@@ -83,7 +80,6 @@ public class DiagnosticExchange extends 
          * @returns null
          * TODO or can there? Could this actually return all the information in one easy to read table?
          */
-        @Override
         public TabularData bindings() throws OpenDataException
         {
             return null;
@@ -197,13 +193,6 @@ public class DiagnosticExchange extends 
     public ArrayList<AMQQueue> doRoute(InboundMessage payload)
     {
         //TODO shouldn't modify messages... perhaps put a new message on the queue?
-        /*
-        Long value = new Long(SizeOf.getUsedMemory());
-        AMQShortString key = new AMQShortString("memory");
-        FieldTable headers = ((BasicContentHeaderProperties)payload.getMessageHeader().properties).getHeaders();
-        headers.put(key, value);
-        ((BasicContentHeaderProperties)payload.getMessageHeader().properties).setHeaders(headers);
-        */
         AMQQueue q = getQueueRegistry().getQueue(new AMQShortString("diagnosticqueue"));
         ArrayList<AMQQueue> queues =  new ArrayList<AMQQueue>();
         queues.add(q);

Modified: qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallActivator.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallActivator.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallActivator.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallActivator.java Sun Jan 29 13:05:07 2012
@@ -20,14 +20,12 @@
  */
 package org.apache.qpid.server.security.access.plugins;
 
-import org.osgi.framework.BundleActivator;
-
 import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory;
 import org.apache.qpid.server.security.SecurityPluginActivator;
 import org.apache.qpid.server.security.SecurityPluginFactory;
 
 /**
- * The OSGi {@link BundleActivator} for {@link Firewall}.
+ * The OSGi {@link org.osgi.framework.BundleActivator} for {@link Firewall}.
  */
 public class FirewallActivator extends SecurityPluginActivator
 {

Modified: qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java Sun Jan 29 13:05:07 2012
@@ -64,7 +64,7 @@ public class FirewallConfiguration exten
 
     public Result getDefaultAction()
     {
-        String defaultAction = _configuration.getString("[@default-action]");
+        String defaultAction = getConfig().getString("[@default-action]");
         if (defaultAction == null)
         {
             return Result.ABSTAIN;
@@ -85,8 +85,8 @@ public class FirewallConfiguration exten
     public void validateConfiguration() throws ConfigurationException
     {
         // Valid Configuration either has xml links to new files
-        _finalConfig = new CompositeConfiguration(_configuration);
-        List subFiles = _configuration.getList("xml[@fileName]");
+        _finalConfig = new CompositeConfiguration(getConfig());
+        List subFiles = getConfig().getList("xml[@fileName]");
         for (Object subFile : subFiles)
         {
             _finalConfig.addConfiguration(new XMLConfiguration((String) subFile));
@@ -94,7 +94,7 @@ public class FirewallConfiguration exten
 
         // all rules must have an access attribute or a default value
         if (_finalConfig.getList("rule[@access]").size() == 0 &&
-            _configuration.getString("[@default-action]") == null)
+            getConfig().getString("[@default-action]") == null)
         {
             throw new ConfigurationException("No rules or default-action found in firewall configuration.");
         }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java Sun Jan 29 13:05:07 2012
@@ -290,7 +290,6 @@ public class QpidCompositeRollingAppende
                 c.setType(i);
                 Date next = new Date(c.getNextCheckMillis(epoch));
                 String r1 = sdf.format(next);
-                // LogLog.debug("Type = "+i+", r0 = "+r0+", r1 = "+r1);
                 if ((r0 != null) && (r1 != null) && !r0.equals(r1))
                 {
                     return i;
@@ -405,19 +404,6 @@ public class QpidCompositeRollingAppende
         }
     }
 
-    /*
-        public void setRollingStyle(String style) {
-            if (style == S_BY_SIZE) {
-                rollingStyle = BY_SIZE;
-            }
-            else if (style == S_BY_DATE) {
-                rollingStyle = BY_DATE;
-            }
-            else if (style == S_BY_COMPOSITE) {
-                rollingStyle = BY_COMPOSITE;
-            }
-        }
-     */
     public boolean getStaticLogFileName()
     {
         return staticLogFileName;
@@ -535,7 +521,6 @@ public class QpidCompositeRollingAppende
             now.setTime(System.currentTimeMillis());
             sdf = new SimpleDateFormat(datePattern);
             int type = computeCheckPeriod();
-            // printPeriodicity(type);
             rc.setType(type);
             // next line added as this removes the name check in rollOver
             nextCheck = rc.getNextCheckMillis(now);
@@ -783,7 +768,9 @@ public class QpidCompositeRollingAppende
                     curSizeRollBackups--;
                 }
             }
-            // Map {(maxBackupIndex - 1), ..., 2, 1} to {maxBackupIndex, ..., 3, 2}
+            /*
+              map {(maxBackupIndex - 1), ..., 2, 1} to {maxBackupIndex, ..., 3, 2}.
+            */
             for (int i = curSizeRollBackups; i >= 1; i--)
             {
                 String oldName = (fileName + "." + i);

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java Sun Jan 29 13:05:07 2012
@@ -120,58 +120,8 @@ public class Configuration
             _devlog.debug("Using configuration file " + _configFile.getAbsolutePath());
         }
 
-//        String logConfig = _commandLine.getOptionValue("l");
-//        String logWatchConfig = _commandLine.getOptionValue("w", "0");
-//        if (logConfig != null)
-//        {
-//            File logConfigFile = new File(logConfig);
-//            configureLogging(logConfigFile, logWatchConfig);
-//        }
-//        else
-//        {
-//            File configFileDirectory = _configFile.getParentFile();
-//            File logConfigFile = new File(configFileDirectory, DEFAULT_LOG_CONFIG_FILENAME);
-//            configureLogging(logConfigFile, logWatchConfig);
-//        }
     }
 
-
-//    private void configureLogging(File logConfigFile, String logWatchConfig)
-//    {
-//        int logWatchTime = 0;
-//        try
-//        {
-//            logWatchTime = Integer.parseInt(logWatchConfig);
-//        }
-//        catch (NumberFormatException e)
-//        {
-//            _devlog.error("Log watch configuration value of " + logWatchConfig + " is invalid. Must be "
-//                          + "a non-negative integer. Using default of zero (no watching configured");
-//        }
-//
-//        if (logConfigFile.exists() && logConfigFile.canRead())
-//        {
-//            _devlog.info("Configuring logger using configuration file " + logConfigFile.getAbsolutePath());
-//            if (logWatchTime > 0)
-//            {
-//                _devlog.info("log file " + logConfigFile.getAbsolutePath() + " will be checked for changes every "
-//                             + logWatchTime + " seconds");
-//                // log4j expects the watch interval in milliseconds
-//                DOMConfigurator.configureAndWatch(logConfigFile.getAbsolutePath(), logWatchTime * 1000);
-//            }
-//            else
-//            {
-//                DOMConfigurator.configure(logConfigFile.getAbsolutePath());
-//            }
-//        }
-//        else
-//        {
-//            System.err.println("Logging configuration error: unable to read file " + logConfigFile.getAbsolutePath());
-//            System.err.println("Using basic log4j configuration");
-//            BasicConfigurator.configure();
-//        }
-//    }
-
     public File getConfigFile()
     {
         return _configFile;

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFProperty.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFProperty.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFProperty.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFProperty.java Sun Jan 29 13:05:07 2012
@@ -67,8 +67,6 @@ public class QMFProperty
 
     public void setQMFClass(QMFClass qmfClass)
     {
- /*       _map.put(REF_CLASS, qmfClass.getName());
-        _map.put(REF_PACKAGE, qmfClass.getPackage().getName());*/
     }
 
     public void setReferencedClass(String refClass)

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java Sun Jan 29 13:05:07 2012
@@ -212,7 +212,7 @@ public class AMQBrokerManagerMBean exten
     {
         // TODO
         // Check if the exchange is in use.
-        // boolean inUse = false;
+
         // Check if there are queue-bindings with the exchange and unregister
         // when there are no bindings.
         CurrentActor.set(new ManagementActor(getLogActor().getRootMessageLogger()));

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java Sun Jan 29 13:05:07 2012
@@ -784,20 +784,6 @@ public class AMQChannel implements Sessi
 
             AMQQueue queue = message.getQueue();
 
-            // Our Java Client will always suspend the channel when resending!
-            // If the client has requested the messages be resent then it is
-            // their responsibility to ensure that thay are capable of receiving them
-            // i.e. The channel hasn't been server side suspended.
-            // if (isSuspended())
-            // {
-            // _logger.info("Channel is suspended so requeuing");
-            // //move this message to requeue
-            // msgToRequeue.add(message);
-            // }
-            // else
-            // {
-            // release to allow it to be delivered
-
             // Without any details from the client about what has been processed we have to mark
             // all messages in the unacked map as redelivered.
             message.setRedelivered();

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java Sun Jan 29 13:05:07 2012
@@ -94,7 +94,7 @@ public class Binding
             return true;
         }
         
-        if (o == null || !(o instanceof Binding))
+        if (!(o instanceof Binding))
         {
             return false;
         }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java Sun Jan 29 13:05:07 2012
@@ -205,7 +205,7 @@ public class QueueConfiguration extends 
 
         public void validateConfiguration() throws ConfigurationException
         {
-            if (_configuration.isEmpty())
+            if (getConfig().isEmpty())
             {
                 throw new ConfigurationException("Queue section cannot be empty.");
             }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=1237273&r1=1237272&r2=1237273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java Sun Jan 29 13:05:07 2012
@@ -176,7 +176,7 @@ public class ServerConfiguration extends
      */
     public ServerConfiguration(Configuration conf)
     {
-        _configuration = conf;
+        setConfig(conf);
     }
 
     /**
@@ -196,8 +196,8 @@ public class ServerConfiguration extends
      */
     public void initialise() throws ConfigurationException
     {	
-        setConfiguration("", _configuration);
-        setupVirtualHosts(_configuration);
+        setConfiguration("", getConfig());
+        setupVirtualHosts(getConfig());
     }
 
     public String[] getElementsProcessed()
@@ -302,7 +302,7 @@ public class ServerConfiguration extends
 
                 // save the default virtualhost name
                 String defaultVirtualHost = vhostConfiguration.getString("default");
-                _configuration.setProperty("virtualhosts.default", defaultVirtualHost);
+                getConfig().setProperty("virtualhosts.default", defaultVirtualHost);
             }
         }
 



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message