/[Apache-SVN]
ViewVC logotype

Revision 1042697


Jump to revision: Previous Next
Author: grkvlt
Date: Mon Dec 6 16:05:46 2010 UTC (13 years, 6 months ago)
Changed paths: 196 (showing only 100; show all)
Log Message:
Attempt one at merge from r1021441:HEAD

Changed paths

Path Details
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/bin/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/bin/qpid.start deleted
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/build.xml modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/etc/config.xml modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/etc/log4j.xml modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/BrokerReceiver.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/info/build.properties modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown, r1042605)
added
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/MANIFEST.MF
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/MANIFEST.MF, r1042605)
replaced
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/build.xml
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/build.xml, r1042605)
replaced
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src, r1042605)
replaced
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main, r1042605)
replaced
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java, r1042605)
replaced
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org, r1042605)
replaced
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache, r1042605)
replaced
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid, r1042605)
replaced
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown, r1042605)
replaced
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java, r1042605)
replaced
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java, r1042605)
replaced
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java, r1042605)
replaced
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
(Copied from qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd, r1042605)
replaced
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/build.deps modified , text changed , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/build.xml modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/README.txt
(Copied from qpid/trunk/qpid/java/client/README.txt, r1042600)
added
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/build.xml modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/example/bin/ deleted
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/example/source-jar.xml deleted
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/example/src/main/java/README.txt modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/client.bnd modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/client.log4j modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/common/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/common.bnd modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkHandler.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkTransport.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/common.xml modified , text changed , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/doc/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/etc/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/genpom modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/integrationtests/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/integrationtests/src/resources/sustained-log4j.xml modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/junit-toolkit/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/lib/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/lib/slf4j-api-1.4.0.jar deleted
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/lib/slf4j-api-1.6.1.jar
(Copied from qpid/trunk/qpid/java/lib/slf4j-api-1.6.1.jar, r1042606)
added
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/lib/slf4j-log4j12-1.4.0.jar deleted
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/lib/slf4j-log4j12-1.6.1.jar
(Copied from qpid/trunk/qpid/java/lib/slf4j-log4j12-1.6.1.jar, r1042606)
added
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/management/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/management/client/README.txt modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/management/client/bin/qman-wsdm-start.cmd modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/management/client/bin/qman-wsdm-start.sh modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/management/client/build.xml modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/management/client/etc/qman.log4j modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/management/client/src/main/java/org/apache/qpid/management/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/management/client/src/test/java/org/apache/qpid/management/ modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/management-common.bnd modified , text changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java modified , props changed
Directoryqpid/branches/grkvlt-network-20101013/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java modified , props changed
[...]

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26