You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gr...@apache.org on 2010/12/06 17:05:51 UTC
svn commit: r1042697 [1/4] - in
/qpid/branches/grkvlt-network-20101013/qpid/java: ./ broker-plugins/
broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/
broker-plugins/experimental/info/ broker-plugins/experimenta...
Author: grkvlt
Date: Mon Dec 6 16:05:46 2010
New Revision: 1042697
URL: http://svn.apache.org/viewvc?rev=1042697&view=rev
Log:
Attempt one at merge from r1021441:HEAD
Added:
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/
- copied from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/MANIFEST.MF
- copied unchanged from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/MANIFEST.MF
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/build.xml
- copied unchanged from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/build.xml
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/
- copied from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/
- copied from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/
- copied from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/
- copied from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/
- copied from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/
- copied from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/
- copied from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java
- copied unchanged from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java
- copied unchanged from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java
- copied unchanged from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
- copied unchanged from r1042605, qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
qpid/branches/grkvlt-network-20101013/qpid/java/client/README.txt
- copied unchanged from r1042600, qpid/trunk/qpid/java/client/README.txt
qpid/branches/grkvlt-network-20101013/qpid/java/lib/slf4j-api-1.6.1.jar
- copied unchanged from r1042606, qpid/trunk/qpid/java/lib/slf4j-api-1.6.1.jar
qpid/branches/grkvlt-network-20101013/qpid/java/lib/slf4j-log4j12-1.6.1.jar
- copied unchanged from r1042606, qpid/trunk/qpid/java/lib/slf4j-log4j12-1.6.1.jar
qpid/branches/grkvlt-network-20101013/qpid/java/tools/bin/qpid-python-testkit
- copied unchanged from r1042616, qpid/trunk/qpid/java/tools/bin/qpid-python-testkit
qpid/branches/grkvlt-network-20101013/qpid/java/tools/bin/set-testkit-env.sh
- copied unchanged from r1042616, qpid/trunk/qpid/java/tools/bin/set-testkit-env.sh
qpid/branches/grkvlt-network-20101013/qpid/java/tools/bin/testkit.py
- copied unchanged from r1042616, qpid/trunk/qpid/java/tools/bin/testkit.py
qpid/branches/grkvlt-network-20101013/qpid/java/tools/src/main/java/org/apache/qpid/testkit/
- copied from r1042616, qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/testkit/
qpid/branches/grkvlt-network-20101013/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Client.java
- copied unchanged from r1042616, qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Client.java
qpid/branches/grkvlt-network-20101013/qpid/java/tools/src/main/java/org/apache/qpid/testkit/ErrorHandler.java
- copied unchanged from r1042616, qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/testkit/ErrorHandler.java
qpid/branches/grkvlt-network-20101013/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java
- copied unchanged from r1042616, qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java
qpid/branches/grkvlt-network-20101013/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java
- copied unchanged from r1042616, qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java
qpid/branches/grkvlt-network-20101013/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
- copied, changed from r1042616, qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
Removed:
qpid/branches/grkvlt-network-20101013/qpid/java/broker/bin/qpid.start
qpid/branches/grkvlt-network-20101013/qpid/java/client/example/bin/
qpid/branches/grkvlt-network-20101013/qpid/java/client/example/source-jar.xml
qpid/branches/grkvlt-network-20101013/qpid/java/lib/slf4j-api-1.4.0.jar
qpid/branches/grkvlt-network-20101013/qpid/java/lib/slf4j-log4j12-1.4.0.jar
qpid/branches/grkvlt-network-20101013/qpid/java/testkit/bin/qpid-python-testkit
qpid/branches/grkvlt-network-20101013/qpid/java/testkit/bin/setenv.sh
qpid/branches/grkvlt-network-20101013/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Client.java
qpid/branches/grkvlt-network-20101013/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/ErrorHandler.java
qpid/branches/grkvlt-network-20101013/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Sender.java
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/broker/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/info/build.properties
qpid/branches/grkvlt-network-20101013/qpid/java/broker/bin/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/broker/build.xml
qpid/branches/grkvlt-network-20101013/qpid/java/broker/etc/config.xml
qpid/branches/grkvlt-network-20101013/qpid/java/broker/etc/log4j.xml
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/BrokerReceiver.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java
qpid/branches/grkvlt-network-20101013/qpid/java/build.deps (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/build.xml (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/client/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/client/build.xml
qpid/branches/grkvlt-network-20101013/qpid/java/client/example/src/main/java/README.txt
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/client.bnd
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/client.log4j (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
qpid/branches/grkvlt-network-20101013/qpid/java/common/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/common.xml (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/common.bnd
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkHandler.java
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkTransport.java
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
qpid/branches/grkvlt-network-20101013/qpid/java/doc/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/etc/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/genpom (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/integrationtests/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/integrationtests/src/resources/sustained-log4j.xml (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/junit-toolkit/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/lib/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/client/README.txt
qpid/branches/grkvlt-network-20101013/qpid/java/management/client/bin/qman-wsdm-start.cmd
qpid/branches/grkvlt-network-20101013/qpid/java/management/client/bin/qman-wsdm-start.sh
qpid/branches/grkvlt-network-20101013/qpid/java/management/client/build.xml
qpid/branches/grkvlt-network-20101013/qpid/java/management/client/etc/qman.log4j (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/client/src/main/java/org/apache/qpid/management/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/client/src/test/java/org/apache/qpid/management/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/management-common.bnd
qpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
qpid/branches/grkvlt-network-20101013/qpid/java/management/eclipse-plugin/src/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF
qpid/branches/grkvlt-network-20101013/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
qpid/branches/grkvlt-network-20101013/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/module.xml (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/perftests/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/perftests/etc/perftests.log4j (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/release-docs/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/release-docs/RELEASE_NOTES.txt
qpid/branches/grkvlt-network-20101013/qpid/java/resources/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/systests/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/systests/etc/config-systests-settings.xml
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/systests.log4j (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/tasks/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/08StandaloneExcludes (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/CPPExcludes (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/CPPNoPrefetchExcludes
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/CPPPrefetchExcludes
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/CPPTransientExcludes
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/Excludes (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/Java010Excludes
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/JavaExcludes (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/JavaInVMExcludes
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/JavaPersistentExcludes
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/JavaStandaloneExcludes (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/JavaTransientExcludes (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/XAExcludes (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/clean-dir (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/cpp.async.excludes
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/cpp.async.testprofile (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/cpp.cluster.testprofile (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/cpp.excludes
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/cpp.noprefetch.testprofile (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/cpp.ssl.excludes (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/cpp.ssl.testprofile (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/cpp.testprofile (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/default.0.10.testprofile
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/default.testprofile (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java-derby.0.10.testprofile
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java-derby.testprofile (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java.0.10.testprofile
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java.testprofile (contents, props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test-provider.properties (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app1.crt
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app1.req
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app2.crt
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app2.req
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/keystore.jks
qpid/branches/grkvlt-network-20101013/qpid/java/testkit/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Receiver.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/TestLauncher.java (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/testkit/testkit.py (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/tools/ (props changed)
qpid/branches/grkvlt-network-20101013/qpid/java/tools/etc/test.log4j (props changed)
Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 6 16:05:46 2010
@@ -2,4 +2,5 @@
/qpid/branches/0.5.x-dev/qpid/java:886720-886722,887145,892761,894875,916304,916325,930288,931179
/qpid/branches/java-broker-0-10/qpid/java:795950-829653
/qpid/branches/java-network-refactor/qpid/java:805429-821809
+/qpid/trunk/java:1022063-1037674
/qpid/trunk/qpid:796646-796653
Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 6 16:05:46 2010
@@ -2,4 +2,5 @@
/qpid/branches/java-broker-0-10/qpid/java/broker:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker:787599
-/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/java/broker:1022063-1037674
+/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1022062-1042605
Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 6 16:05:46 2010
@@ -0,0 +1,7 @@
+/qpid/branches/0.5.x-dev/broker-plugins:886720-886722
+/qpid/branches/0.5.x-dev/qpid/java/broker-plugins:886720-886722,887145,892761,894875,916304,916325,930288,931179
+/qpid/branches/java-broker-0-10/qpid/java/broker-plugins:795950-829653
+/qpid/branches/java-network-refactor/qpid/java/broker-plugins:805429-821809
+/qpid/trunk/java/broker-plugins:1022063-1037674
+/qpid/trunk/qpid/broker-plugins:796646-796653
+/qpid/trunk/qpid/java/broker-plugins:1022062-1042605
Modified: qpid/branches/grkvlt-network-20101013/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/branches/grkvlt-network-20101013/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java Mon Dec 6 16:05:46 2010
@@ -61,7 +61,7 @@ public abstract class AbstractConfigurat
public RuleSet reload()
{
RuleSet oldRules = _config;
-
+
try
{
RuleSet newRules = load();
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/info/build.properties
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/info/build.properties?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/info/build.properties (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/info/build.properties Mon Dec 6 16:05:46 2010
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/broker/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 6 16:05:46 2010
@@ -1,4 +1,5 @@
/qpid/branches/0.5-release/qpid/java/broker/bin:757268
/qpid/branches/java-broker-0-10/qpid/java/broker/bin:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker/bin:805429-821809
-/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/java/broker/bin:1022063-1037674
+/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1022062-1042605
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/build.xml
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/build.xml?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/build.xml (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/build.xml Mon Dec 6 16:05:46 2010
@@ -72,6 +72,12 @@
<fixcrlf srcdir="${module.release}/bin" fixlast="true" eol="dos" includes="*.bat"/>
</target>
+ <target name="release-bin-other" description="copy broker-plugins into module release">
+ <copy todir="${module.release}/lib/plugins" failonerror="true">
+ <fileset dir="${build.lib}/plugins"/>
+ </copy>
+ </target>
+
<target name="release-bin" depends="release-bin-tasks"/>
</project>
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/etc/config.xml
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/etc/config.xml?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/etc/config.xml (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/etc/config.xml Mon Dec 6 16:05:46 2010
@@ -53,9 +53,10 @@
<enabled>true</enabled>
<jmxport>8999</jmxport>
<ssl>
- <enabled>true</enabled>
- <!-- Update below path to your keystore location, eg ${conf}/qpid.keystore -->
- <keyStorePath>${prefix}/../test-profiles/test_resources/ssl/keystore.jks</keyStorePath>
+ <enabled>false</enabled>
+ <!-- Update below path to your keystore location, or run the bin/create-example-ssl-stores(.sh|.bat)
+ script from within the etc/ folder to generate an example store with self-signed cert -->
+ <keyStorePath>${conf}/qpid.keystore</keyStorePath>
<keyStorePassword>password</keyStorePassword>
</ssl>
</management>
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/etc/log4j.xml
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/etc/log4j.xml?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/etc/log4j.xml (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/etc/log4j.xml Mon Dec 6 16:05:46 2010
@@ -68,7 +68,7 @@
<param name="backupFilesToPath" value="${QPID_WORK}/backup/log"/>
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+ <param name="ConversionPattern" value="%d %-5p [%t] (%F:%L) - %m%n"/>
</layout>
</appender>
@@ -77,13 +77,13 @@
<param name="Append" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+ <param name="ConversionPattern" value="%d %-5p [%t] (%F:%L) - %m%n"/>
</layout>
</appender>
<appender class="org.apache.log4j.ConsoleAppender" name="STDOUT">
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+ <param name="ConversionPattern" value="%d %-5p [%t] (%F:%L) - %m%n"/>
</layout>
</appender>
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java Mon Dec 6 16:05:46 2010
@@ -255,6 +255,7 @@ public class BrokerInstance
private void configureLogging(File logConfigFile, int logWatchTime) throws Exception
{
+ _logger.info("configuring logging using file " + logConfigFile.getName());
if (logConfigFile.exists() && logConfigFile.canRead())
{
CurrentActor.get().message(BrokerMessages.LOG_CONFIG(logConfigFile.getAbsolutePath()));
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java Mon Dec 6 16:05:46 2010
@@ -29,6 +29,8 @@ import java.util.concurrent.CopyOnWriteA
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
+import sun.misc.Unsafe;
+
public class ConfigStore
{
private ConcurrentHashMap<ConfigObjectType, ConcurrentHashMap<UUID, ConfiguredObject>> _typeMap =
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java Mon Dec 6 16:05:46 2010
@@ -229,13 +229,12 @@ public abstract class ConfigurationPlugi
return getListValue(property, Collections.<String>emptyList());
}
- @SuppressWarnings("unchecked")
protected List<String> getListValue(String property, List<String> defaultValue)
{
- return (List<String>) _configuration.getList(property, defaultValue);
+ return _configuration.getList(property, defaultValue);
}
- /// Validation Helpers
+ // Validation Helpers
protected boolean contains(String property)
{
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java Mon Dec 6 16:05:46 2010
@@ -85,8 +85,5 @@ public class SlowConsumerDetectionConfig
}
}
- System.out.println("Configured SCDC");
- System.out.println("Delay:" + getDelay());
- System.out.println("TimeUnit:" + getTimeUnit());
}
}
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java Mon Dec 6 16:05:46 2010
@@ -57,20 +57,21 @@ public class ConnectionRegistry implemen
{
connection.close(cause, message);
}
- catch (AMQException e)
+ catch (Exception e)
{
- _logger.warn("Error closing connection:" + e.getMessage());
+ _logger.warn("Error closing connection: " + e.getMessage());
+ deregisterConnection(connection);
}
}
- public void registerConnection(AMQConnectionModel connnection)
+ public void registerConnection(AMQConnectionModel connection)
{
- _registry.add(connnection);
+ _registry.add(connection);
}
- public void deregisterConnection(AMQConnectionModel connnection)
+ public void deregisterConnection(AMQConnectionModel connection)
{
- _registry.remove(connnection);
+ _registry.remove(connection);
}
@Override
Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 6 16:05:46 2010
@@ -3,4 +3,5 @@
/qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/management:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker/src/main/java/org/apache/qpid/server/management:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker/src/main/java/org/apache/qpid/server/management:787599
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/java/broker/src/main/java/org/apache/qpid/server/management:1022063-1037674
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1022062-1042605
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java Mon Dec 6 16:05:46 2010
@@ -20,9 +20,13 @@
*/
package org.apache.qpid.server.management;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicLong;
+
import org.apache.qpid.server.logging.actors.ManagementActor;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.LogActor;
+import org.apache.qpid.thread.Threading;
import javax.management.ListenerNotFoundException;
import javax.management.MBeanInfo;
@@ -45,12 +49,13 @@ public abstract class AMQManagedObject e
/**
* broadcaster support class
*/
- protected NotificationBroadcasterSupport _broadcaster = new NotificationBroadcasterSupport();
+ protected NotificationBroadcasterSupport _broadcaster = new NotificationBroadcasterSupport(
+ Executors.newCachedThreadPool(Threading.getThreadFactory()));
/**
* sequence number for notifications
*/
- protected long _notificationSequenceNumber = 0;
+ protected AtomicLong _notificationSequenceNumber = new AtomicLong(0);
protected MBeanInfo _mbeanInfo;
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java Mon Dec 6 16:05:46 2010
@@ -20,13 +20,12 @@
*/
package org.apache.qpid.server.message;
-import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import java.util.concurrent.atomic.AtomicBoolean;
public abstract class MessageReference<M extends ServerMessage>
{
- private static final AtomicReferenceFieldUpdater<MessageReference, ServerMessage> _messageUpdater =
- AtomicReferenceFieldUpdater.newUpdater(MessageReference.class, ServerMessage.class,"_message");
+ private final AtomicBoolean _released = new AtomicBoolean(false);
private volatile M _message;
@@ -47,10 +46,12 @@ public abstract class MessageReference<M
public void release()
{
- M message = (M) _messageUpdater.getAndSet(this,null);
- if(message != null)
+ if(!_released.getAndSet(true))
{
- onRelease(message);
+ if(_message != null)
+ {
+ onRelease(_message);
+ }
}
}
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java Mon Dec 6 16:05:46 2010
@@ -63,6 +63,7 @@ public class PluginManager implements Cl
private static final Logger _logger = Logger.getLogger(PluginManager.class);
private static final int FELIX_STOP_TIMEOUT = 30000;
+ private static final String QPID_VER_SUFFIX = "version=0.9,";
private Framework _felix;
@@ -133,33 +134,33 @@ public class PluginManager implements Cl
"org.osgi.service.startlevel; version=1.0.0," +
"org.osgi.service.url; version=1.0.0," +
"org.osgi.util.tracker; version=1.0.0," +
- "org.apache.qpid.junit.extensions.util; version=0.7," +
- "org.apache.qpid; version=0.7," +
- "org.apache.qpid.common; version=0.7," +
- "org.apache.qpid.exchange; version=0.7," +
- "org.apache.qpid.framing; version=0.7," +
- "org.apache.qpid.management.common.mbeans.annotations; version=0.7," +
- "org.apache.qpid.protocol; version=0.7," +
- "org.apache.qpid.server.binding; version=0.7," +
- "org.apache.qpid.server.configuration; version=0.7," +
- "org.apache.qpid.server.configuration.plugins; version=0.7," +
- "org.apache.qpid.server.configuration.management; version=0.7," +
- "org.apache.qpid.server.exchange; version=0.7," +
- "org.apache.qpid.server.logging; version=0.7," +
- "org.apache.qpid.server.logging.actors; version=0.7," +
- "org.apache.qpid.server.logging.subjects; version=0.7," +
- "org.apache.qpid.server.management; version=0.7," +
- "org.apache.qpid.server.persistent; version=0.7," +
- "org.apache.qpid.server.plugins; version=0.7," +
- "org.apache.qpid.server.protocol; version=0.7," +
- "org.apache.qpid.server.queue; version=0.7," +
- "org.apache.qpid.server.registry; version=0.7," +
- "org.apache.qpid.server.security; version=0.7," +
- "org.apache.qpid.server.security.access; version=0.7," +
- "org.apache.qpid.server.security.access.plugins; version=0.7," +
- "org.apache.qpid.server.virtualhost; version=0.7," +
- "org.apache.qpid.server.virtualhost.plugins; version=0.7," +
- "org.apache.qpid.util; version=0.7," +
+ "org.apache.qpid.junit.extensions.util; " + QPID_VER_SUFFIX +
+ "org.apache.qpid; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.common; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.exchange; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.framing; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.management.common.mbeans.annotations; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.protocol; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.binding; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.configuration; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.configuration.plugins; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.configuration.management; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.exchange; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.logging; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.logging.actors; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.logging.subjects; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.management; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.persistent; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.plugins; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.protocol; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.queue; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.registry; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.security; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.security.access; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.security.access.plugins; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.virtualhost; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.server.virtualhost.plugins; " + QPID_VER_SUFFIX +
+ "org.apache.qpid.util; " + QPID_VER_SUFFIX +
"org.apache.commons.configuration; version=1.0.0," +
"org.apache.commons.lang; version=1.0.0," +
"org.apache.commons.lang.builder; version=1.0.0," +
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java Mon Dec 6 16:05:46 2010
@@ -361,7 +361,6 @@ public class AMQProtocolEngine implement
mechanisms.getBytes(),
locales.getBytes());
_sender.send(responseBody.generateFrame(0).toNioByteBuffer());
-
}
catch (AMQException e)
{
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java Mon Dec 6 16:05:46 2010
@@ -135,7 +135,7 @@ public class AMQProtocolSessionMBean ext
public String getVersion()
{
- return (_protocolSession.getClientVersion() == null) ? null : _protocolSession.getClientVersion().toString();
+ return _protocolSession.getClientVersion();
}
public Date getLastIoTime()
@@ -324,7 +324,7 @@ public class AMQProtocolSessionMBean ext
public void notifyClients(String notificationMsg)
{
Notification n =
- new Notification(MonitorNotification.THRESHOLD_VALUE_EXCEEDED, this, ++_notificationSequenceNumber,
+ new Notification(MonitorNotification.THRESHOLD_VALUE_EXCEEDED, this, _notificationSequenceNumber.getAndIncrement(),
System.currentTimeMillis(), notificationMsg);
_broadcaster.sendNotification(n);
}
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/BrokerReceiver.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/BrokerReceiver.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/BrokerReceiver.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/BrokerReceiver.java Mon Dec 6 16:05:46 2010
@@ -54,7 +54,7 @@ public class BrokerReceiver implements R
private IApplicationRegistry _appRegistry;
private volatile Receiver<java.nio.ByteBuffer> _delegate = new SelfDelegateProtocolEngine();
-
+
public BrokerReceiver(IApplicationRegistry appRegistry,
String fqdn,
Set<VERSION> supported,
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java Mon Dec 6 16:05:46 2010
@@ -38,7 +38,7 @@ import org.apache.qpid.transport.network
public class ProtocolEngine_0_10 extends InputHandler implements ConnectionConfig
{
- public static final int MAX_FRAME_SIZE = 64 * 1024 - 1;
+ public static final int MAX_FRAME_SIZE = Integer.getInteger("qpid.maxFrameSize", 64 * 1024 - 1);
private NetworkConnection _network;
private ServerConnection _connection;
Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 6 16:05:46 2010
@@ -3,4 +3,5 @@
/qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:787599
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/java/broker/src/main/java/org/apache/qpid/server/queue:1022063-1037674
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1022062-1042605
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java Mon Dec 6 16:05:46 2010
@@ -57,7 +57,44 @@ import javax.management.openmbean.Tabula
import javax.management.openmbean.TabularType;
import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import javax.management.JMException;
+import javax.management.MBeanException;
+import javax.management.MBeanNotificationInfo;
+import javax.management.Notification;
+import javax.management.OperationsException;
+import javax.management.monitor.MonitorNotification;
+import javax.management.openmbean.ArrayType;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataSupport;
+import javax.management.openmbean.CompositeType;
+import javax.management.openmbean.OpenDataException;
+import javax.management.openmbean.OpenType;
+import javax.management.openmbean.SimpleType;
+import javax.management.openmbean.TabularData;
+import javax.management.openmbean.TabularDataSupport;
+import javax.management.openmbean.TabularType;
+
+import org.apache.log4j.Logger;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.BasicContentHeaderProperties;
+import org.apache.qpid.framing.ContentHeaderBody;
+import org.apache.qpid.management.common.mbeans.ManagedQueue;
+import org.apache.qpid.management.common.mbeans.annotations.MBeanConstructor;
+import org.apache.qpid.management.common.mbeans.annotations.MBeanDescription;
+import org.apache.qpid.server.management.AMQManagedObject;
+import org.apache.qpid.server.management.ManagedObject;
+import org.apache.qpid.server.message.AMQMessage;
+import org.apache.qpid.server.message.AMQMessageHeader;
+import org.apache.qpid.server.message.MessageTransferMessage;
+import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.txn.LocalTransaction;
+import org.apache.qpid.server.txn.ServerTransaction;
+import org.apache.qpid.transport.MessageProperties;
/**
* AMQQueueMBean is the management bean for an {@link AMQQueue}.
@@ -298,7 +335,6 @@ public class AMQQueueMBean extends AMQMa
*/
public void checkForNotification(ServerMessage msg) throws AMQException
{
-
final Set<NotificationCheck> notificationChecks = _queue.getNotificationChecks();
if(!notificationChecks.isEmpty())
@@ -317,7 +353,6 @@ public class AMQQueueMBean extends AMQMa
}
}
}
-
}
/**
@@ -330,7 +365,7 @@ public class AMQQueueMBean extends AMQMa
notificationMsg = notification.name() + " " + notificationMsg;
_lastNotification =
- new Notification(MonitorNotification.THRESHOLD_VALUE_EXCEEDED, this, ++_notificationSequenceNumber,
+ new Notification(MonitorNotification.THRESHOLD_VALUE_EXCEEDED, this, _notificationSequenceNumber.getAndIncrement(),
System.currentTimeMillis(), notificationMsg);
_broadcaster.sendNotification(_lastNotification);
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java Mon Dec 6 16:05:46 2010
@@ -55,6 +55,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
+import org.apache.qpid.transport.network.IncomingNetworkTransport;
import org.apache.qpid.transport.network.NetworkTransport;
/**
@@ -71,7 +72,7 @@ public abstract class ApplicationRegistr
protected final ServerConfiguration _configuration;
- protected final Map<Integer, NetworkTransport> _transports = new HashMap<Integer, NetworkTransport>();
+ protected final Map<Integer, IncomingNetworkTransport> _transports = new HashMap<Integer, IncomingNetworkTransport>();
protected ManagedObjectRegistry _managedObjectRegistry;
@@ -374,12 +375,12 @@ public abstract class ApplicationRegistr
try
{
transport.close();
+ CurrentActor.get().message(BrokerMessages.SHUTTING_DOWN(transport.getAddress().toString(), port));
}
catch (Throwable e)
{
_logger.error("Unable to close network driver due to:" + e.getMessage());
}
- CurrentActor.get().message(BrokerMessages.SHUTTING_DOWN(transport.getAddress().toString(), port));
}
}
}
@@ -389,7 +390,7 @@ public abstract class ApplicationRegistr
return _configuration;
}
- public void registerTransport(int port, NetworkTransport transport)
+ public void registerTransport(int port, IncomingNetworkTransport transport)
{
synchronized (_transports)
{
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java Mon Dec 6 16:05:46 2010
@@ -36,6 +36,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
+import org.apache.qpid.transport.network.IncomingNetworkTransport;
import org.apache.qpid.transport.network.NetworkTransport;
public interface IApplicationRegistry
@@ -81,7 +82,7 @@ public interface IApplicationRegistry
/**
* Register any network transports for this registry
*/
- void registerTransport(int port, NetworkTransport transport);
+ void registerTransport(int port, IncomingNetworkTransport transport);
public UUID getBrokerId();
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java Mon Dec 6 16:05:46 2010
@@ -134,6 +134,8 @@ public class DerbyMessageStore implement
private static final String DELETE_FROM_META_DATA = "DELETE FROM " + META_DATA_TABLE_NAME + " WHERE message_id = ?";
private static final String SELECT_ALL_FROM_META_DATA = "SELECT message_id, meta_data FROM " + META_DATA_TABLE_NAME;
+ private static final String DERBY_SINGLE_DB_SHUTDOWN_CODE = "08006";
+
private LogSubject _logSubject;
private boolean _configured;
@@ -631,9 +633,9 @@ public class DerbyMessageStore implement
}
catch (SQLException e)
{
- if (e.getSQLState().equalsIgnoreCase("XJ015"))
+ if (e.getSQLState().equalsIgnoreCase(DERBY_SINGLE_DB_SHUTDOWN_CODE))
{
- //XJ015 is expected and represents a clean shutdown, do nothing.
+ //expected and represents a clean shutdown of this database only, do nothing.
}
else
{
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java Mon Dec 6 16:05:46 2010
@@ -906,10 +906,9 @@ public class Subscription_0_10 implement
public String toLogString()
{
String queueInfo = MessageFormat.format(QUEUE_FORMAT, _queue.getVirtualHost().getName(),
- _queue.getNameShortString());
- String result = "[" + MessageFormat.format(SUBSCRIPTION_FORMAT, getSubscriptionID()) + "("
- // queueString is "vh(/{0})/qu({1}) " so need to trim
- + queueInfo.substring(0, queueInfo.length() - 1) + ")" + "] ";
+ _queue.getNameShortString());
+ String result = "[" + MessageFormat.format(SUBSCRIPTION_FORMAT, getSubscriptionID()) +
+ "(" + queueInfo.trim() + ")" + "] ";
return result;
}
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java Mon Dec 6 16:05:46 2010
@@ -91,6 +91,10 @@ public class ServerConnection extends Co
if (state == State.CLOSED)
{
CurrentActor.get().message(this, ConnectionMessages.CLOSE());
+ if (_virtualHost != null)
+ {
+ _virtualHost.getConnectionRegistry().deregisterConnection(this);
+ }
}
}
Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 6 16:05:46 2010
@@ -1 +1,3 @@
/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:930288
+/qpid/trunk/java/broker/src/main/java/org/apache/qpid/server/virtualhost:1022063-1037674
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:1022062-1042605
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java Mon Dec 6 16:05:46 2010
@@ -45,13 +45,13 @@ public abstract class HouseKeepingTask i
{
// Don't need to undo this as this is a thread pool thread so will
// always go through here before we do any real work.
- Thread.currentThread().setName(_name);
+ //Thread.currentThread().setName(_name); // XXX temporary
CurrentActor.set(new AbstractActor(_rootLogger)
{
@Override
public String getLogMessage()
{
- return _name;
+ return _name + " ";
}
});
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java Mon Dec 6 16:05:46 2010
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import javax.management.NotCompliantMBeanException;
@@ -215,6 +216,25 @@ public class VirtualHostImpl implements
_connectionRegistry = new ConnectionRegistry();
_houseKeepingTasks = new ScheduledThreadPoolExecutor(_configuration.getHouseKeepingThreadCount());
+ _houseKeepingTasks.setThreadFactory(new ThreadFactory()
+ {
+ public Thread newThread(Runnable r)
+ {
+ Thread t = new Thread(r);
+ String name = "HouseKeeping";
+ StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+ for (StackTraceElement elt : trace)
+ {
+ if (elt.getClassName().endsWith("Test"))
+ {
+ name += "-" + elt.getClassName();
+// break; // FIXME
+ }
+ }
+ t.setName(name);
+ return t;
+ }
+ });
_queueRegistry = new DefaultQueueRegistry(this);
@@ -248,6 +268,7 @@ public class VirtualHostImpl implements
_brokerMBean = new AMQBrokerManagerMBean(_virtualHostMBean);
_brokerMBean.register();
+
initialiseHouseKeeping(hostConfig.getHousekeepingExpiredMessageCheckPeriod());
}
@@ -275,12 +296,22 @@ public class VirtualHostImpl implements
}
catch (Exception e)
{
- _logger.error("Exception in housekeeping for queue: "
- + q.getNameShortString().toString(), e);
- //Don't throw exceptions as this will stop the
- // house keeping task from running.
+ _logger.error("Exception in housekeeping for queue: " + q.getName(), e);
+ // Don't throw exceptions as this will stop the task from running.
}
}
+ }
+ }
+
+ class CheckTransactionsTask extends HouseKeepingTask
+ {
+ public CheckTransactionsTask(VirtualHost vhost)
+ {
+ super(vhost);
+ }
+
+ public void execute()
+ {
for (AMQConnectionModel connection : getConnectionRegistry().getConnections())
{
_logger.debug("Checking for long running open transactions on connection " + connection);
@@ -293,17 +324,19 @@ public class VirtualHostImpl implements
_configuration.getTransactionTimeoutOpenClose(),
_configuration.getTransactionTimeoutIdleWarn(),
_configuration.getTransactionTimeoutIdleClose());
- }
+ }
catch (Exception e)
{
_logger.error("Exception in housekeeping for connection: " + connection.toString(), e);
+ // Don't throw exceptions as this will stop the task from running.
}
}
}
}
- }
+ };
scheduleHouseKeepingTask(period, new ExpiredMessagesTask(this));
+ scheduleHouseKeepingTask(period, new CheckTransactionsTask(this));
Map<String, VirtualHostPluginFactory> plugins =
ApplicationRegistry.getInstance().getPluginManager().getVirtualHostPlugins();
@@ -368,13 +401,11 @@ public class VirtualHostImpl implements
_houseKeepingTasks.setCorePoolSize(newSize);
}
-
public int getHouseKeepingActiveCount()
{
return _houseKeepingTasks.getActiveCount();
}
-
private void initialiseMessageStore(VirtualHostConfiguration hostConfig) throws Exception
{
String messageStoreClass = hostConfig.getMessageStoreClass();
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java Mon Dec 6 16:05:46 2010
@@ -83,9 +83,11 @@ public class ConfiguredQueueBindingListe
if (config != null)
{
_cache.add(queue);
+ _log.error("=== SCD === ADD " + queue.getName());
}
else
{
+ _log.error("=== SCD === REMOVE " + queue.getName());
_cache.remove(queue);
}
}
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/build.deps?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/build.deps (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/build.deps Mon Dec 6 16:05:46 2010
@@ -1,3 +1,24 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+backport-util-concurrent=lib/backport-util-concurrent-2.2.jar
+
commons-beanutils-core=lib/commons-beanutils-core-1.8.0.jar
commons-cli=lib/commons-cli-1.0.jar
commons-codec=lib/commons-codec-1.3.jar
@@ -22,8 +43,8 @@ log4j=lib/log4j-1.2.12.jar
mina-core=lib/mina-core-1.1.7.jar
mina-filter-ssl=lib/mina-filter-ssl-1.1.7.jar
-slf4j-api=lib/slf4j-api-1.4.0.jar
-slf4j-log4j=lib/slf4j-log4j12-1.4.0.jar
+slf4j-api=lib/slf4j-api-1.6.1.jar
+slf4j-log4j=lib/slf4j-log4j12-1.6.1.jar
xalan=lib/xalan-2.7.0.jar
@@ -75,9 +96,15 @@ felix.libs=${felix-framework}
commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
${commons-codec} ${commons-lang} ${commons-collections} ${commons-configuration}
+<<<<<<< .working
common.libs=${slf4j-api} ${mina-core} ${mina-filter-ssl}
client.libs=${geronimo-jms} ${common.libs}
tools.libs=${commons-configuration.libs} ${broker.libs}
+=======
+common.libs=${slf4j-api} ${backport-util-concurrent} ${mina-core} ${mina-filter-ssl}
+client.libs=${geronimo-jms}
+tools.libs=${commons-configuration.libs} ${log4j}
+>>>>>>> .merge-right.r1042616
broker.libs=${commons-cli} ${commons-logging} ${log4j} ${slf4j-log4j} \
${xalan} ${felix.libs} ${derby-db} ${commons-configuration.libs}
Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/build.deps
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 6 16:05:46 2010
@@ -0,0 +1,7 @@
+/qpid/branches/0.5.x-dev/build.deps:886720-886722
+/qpid/branches/0.5.x-dev/qpid/java/build.deps:886720-886722,887145,892761,894875,916304,916325,930288,931179
+/qpid/branches/java-broker-0-10/qpid/java/build.deps:795950-829653
+/qpid/branches/java-network-refactor/qpid/java/build.deps:805429-821809
+/qpid/trunk/java/build.deps:1022063-1037674
+/qpid/trunk/qpid/build.deps:796646-796653
+/qpid/trunk/qpid/java/build.deps:1022062-1042616
Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 6 16:05:46 2010
@@ -0,0 +1,7 @@
+/qpid/branches/0.5.x-dev/build.xml:886720-886722
+/qpid/branches/0.5.x-dev/qpid/java/build.xml:886720-886722,887145,892761,894875,916304,916325,930288,931179
+/qpid/branches/java-broker-0-10/qpid/java/build.xml:795950-829653
+/qpid/branches/java-network-refactor/qpid/java/build.xml:805429-821809
+/qpid/trunk/java/build.xml:1022063-1037674
+/qpid/trunk/qpid/build.xml:796646-796653
+/qpid/trunk/qpid/java/build.xml:1022062-1042616
Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/client/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 6 16:05:46 2010
@@ -0,0 +1,7 @@
+/qpid/branches/0.5.x-dev/client:886720-886722
+/qpid/branches/0.5.x-dev/qpid/java/client:886720-886722,887145,892761,894875,916304,916325,930288,931179
+/qpid/branches/java-broker-0-10/qpid/java/client:795950-829653
+/qpid/branches/java-network-refactor/qpid/java/client:805429-821809
+/qpid/trunk/java/client:1022063-1037674
+/qpid/trunk/qpid/client:796646-796653
+/qpid/trunk/qpid/java/client:1022062-1042616
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/client/build.xml
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/client/build.xml?rev=1042697&r1=1042696&r2=1042697&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20101013/qpid/java/client/build.xml (original)
+++ qpid/branches/grkvlt-network-20101013/qpid/java/client/build.xml Mon Dec 6 16:05:46 2010
@@ -27,6 +27,9 @@
<import file="../module.xml"/>
+ <property name="example.src.dir" value="${project.root}/client/example/src/main/java" />
+ <property name="example.jar.file" value="${build.lib}/qpid-client-example-${project.version}.jar" />
+
<property name="output.dir" value="${module.precompiled}/org/apache/qpid/filter/selector"/>
<target name="precompile">
@@ -46,6 +49,23 @@
classpathref="module.class.path" packagenames="org.apache.qpid.jms"/>
</target>
+ <target name="release-bin-copy-examples">
+ <copy todir="${module.release}/example/src" failonerror="true">
+ <fileset dir="${example.src.dir}" excludes="runSample.sh README.txt" />
+ </copy>
+ <copy todir="${module.release}/example/lib" failonerror="true">
+ <fileset file="${example.jar.file}"/>
+ </copy>
+ </target>
+
+ <target name="release-bin-copy-readme">
+ <copy todir="${module.release}" overwrite="true" failonerror="true">
+ <fileset file="${basedir}/README.txt" />
+ </copy>
+ </target>
+
+ <target name="release-bin-other" depends="release-bin-copy-examples,release-bin-copy-readme"/>
+
<target name="release-bin" depends="release-bin-tasks"/>
<target name="bundle" depends="bundle-tasks"/>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org