refs/heads/grkvlt-network-20101013 - qpid

commit	80ba5c5efdc23e3922b8f8f5152ceeaefa6951b6	[log] [tgz]
author	Andrew Donald Kennedy <grkvlt@apache.org>	Mon Dec 06 16:05:46 2010 +0000
committer	Andrew Donald Kennedy <grkvlt@apache.org>	Mon Dec 06 16:05:46 2010 +0000
tree	2eb2141eb77d43701e718b5b5ab1cbd07401015f
parent	1d44d6e7a3369fb7773ba50d02c3baa8955da382 [diff]

Attempt one at merge from r1021441:HEAD

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/grkvlt-network-20101013@1042697 13f79535-47bb-0310-9956-ffa450edef68

qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java[diff]
qpid/java/broker-plugins/experimental/info/build.properties[diff]
qpid/java/broker-plugins/experimental/shutdown/MANIFEST.MF[Added - diff]
qpid/java/broker-plugins/experimental/shutdown/build.xml[Added - diff]
qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java[Added - diff]
qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java[Added - diff]
qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java[Added - diff]
qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd[Renamed from qpid/java/broker/bin/qpid.start - diff]
qpid/java/broker/build.xml[diff]
qpid/java/broker/etc/config.xml[diff]
qpid/java/broker/etc/log4j.xml[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/BrokerReceiver.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java[diff]
qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java[diff]
qpid/java/build.deps[diff]
qpid/java/client/README.txt[Added - diff]
qpid/java/client/build.xml[diff]
qpid/java/client/example/bin/README.txt[Deleted - diff]
qpid/java/client/example/bin/set_classpath.bat[Deleted - diff]
qpid/java/client/example/bin/set_classpath.sh[Deleted - diff]
qpid/java/client/example/source-jar.xml[Deleted - diff]
qpid/java/client/example/src/main/java/README.txt[diff]
qpid/java/client/src/main/java/client.bnd[diff]
qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java[diff]
qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java[diff]
qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java[diff]
qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java[diff]
qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java[diff]
qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java[diff]
qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java[diff]
qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java[diff]
qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java[diff]
qpid/java/common.xml[diff]
qpid/java/common/src/main/java/common.bnd[diff]
qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java[diff]
qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java[diff]
qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java[diff]
qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java[diff]
qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkHandler.java[diff]
qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkTransport.java[diff]
qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java[diff]
qpid/java/lib/slf4j-api-1.4.0.jar[Deleted - diff]
qpid/java/lib/slf4j-api-1.6.1.jar[Added - diff]
qpid/java/lib/slf4j-log4j12-1.4.0.jar[Deleted - diff]
qpid/java/lib/slf4j-log4j12-1.6.1.jar[Added - diff]
qpid/java/management/client/README.txt[diff]
qpid/java/management/client/bin/qman-wsdm-start.cmd[diff]
qpid/java/management/client/bin/qman-wsdm-start.sh[diff]
qpid/java/management/client/build.xml[diff]
qpid/java/management/common/src/main/java/management-common.bnd[diff]
qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF[diff]
qpid/java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF[diff]
qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist[diff]
qpid/java/release-docs/RELEASE_NOTES.txt[diff]
qpid/java/systests/etc/config-systests-settings.xml[diff]
qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java[diff]
qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java[diff]
qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java[diff]
qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java[diff]
qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java[diff]
qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java[diff]
qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java[diff]
qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java[diff]
qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java[diff]
qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java[diff]
qpid/java/test-profiles/08StandaloneExcludes[diff]
qpid/java/test-profiles/CPPExcludes[diff]
qpid/java/test-profiles/CPPNoPrefetchExcludes[diff]
qpid/java/test-profiles/CPPPrefetchExcludes[diff]
qpid/java/test-profiles/CPPTransientExcludes[diff]
qpid/java/test-profiles/Excludes[diff]
qpid/java/test-profiles/Java010Excludes[diff]
qpid/java/test-profiles/JavaExcludes[diff]
qpid/java/test-profiles/JavaInVMExcludes[diff]
qpid/java/test-profiles/JavaPersistentExcludes[diff]
qpid/java/test-profiles/JavaStandaloneExcludes[diff]
qpid/java/test-profiles/JavaTransientExcludes[diff]
qpid/java/test-profiles/XAExcludes[diff]
qpid/java/test-profiles/cpp.async.excludes[diff]
qpid/java/test-profiles/cpp.async.testprofile[diff]
qpid/java/test-profiles/cpp.cluster.testprofile[diff]
qpid/java/test-profiles/cpp.excludes[diff]
qpid/java/test-profiles/cpp.noprefetch.testprofile[diff]
qpid/java/test-profiles/cpp.ssl.excludes[diff]
qpid/java/test-profiles/cpp.ssl.testprofile[diff]
qpid/java/test-profiles/cpp.testprofile[diff]
qpid/java/test-profiles/default.0.10.testprofile[diff]
qpid/java/test-profiles/default.testprofile[diff]
qpid/java/test-profiles/java-derby.0.10.testprofile[diff]
qpid/java/test-profiles/java-derby.testprofile[diff]
qpid/java/test-profiles/java.0.10.testprofile[diff]
qpid/java/test-profiles/java.testprofile[diff]
qpid/java/test-profiles/test_resources/ssl/app1.crt[diff]
qpid/java/test-profiles/test_resources/ssl/app1.req[diff]
qpid/java/test-profiles/test_resources/ssl/app2.crt[diff]
qpid/java/test-profiles/test_resources/ssl/app2.req[diff]
qpid/java/test-profiles/test_resources/ssl/keystore.jks[diff]
qpid/java/tools/bin/qpid-python-testkit[Renamed from qpid/java/testkit/bin/qpid-python-testkit - diff]
qpid/java/tools/bin/set-testkit-env.sh[Renamed from qpid/java/testkit/bin/setenv.sh - diff]
qpid/java/tools/bin/testkit.py[Added - diff]
qpid/java/tools/src/main/java/org/apache/qpid/testkit/Client.java[Renamed from qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Client.java - diff]
qpid/java/tools/src/main/java/org/apache/qpid/testkit/ErrorHandler.java[Renamed from qpid/java/testkit/src/main/java/org/apache/qpid/testkit/ErrorHandler.java - diff]
qpid/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java[Added - diff]
qpid/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java[Renamed from qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Sender.java - diff]
qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java[Added - diff]

123 files changed

tree: 2eb2141eb77d43701e718b5b5ab1cbd07401015f

qpid/
.gitignore