You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/01/16 16:16:55 UTC
svn commit: r496725 [1/11] - in /incubator/qpid/branches/perftesting/qpid:
gentools/ gentools/src/org/apache/qpid/gentools/ gentools/templ.cpp/
gentools/templ.java/ java/ java/broker/ java/broker/etc/
java/broker/src/main/java/org/apache/qpid/server/ j...
Author: ritchiem
Date: Tue Jan 16 07:16:39 2007
New Revision: 496725
URL: http://svn.apache.org/viewvc?view=rev&rev=496725
Log:
Patched up to Persistence changes so performance benchmarks can be created before and after persistence changes.
Revision: 494092
Author: kpvdr
Date: 15:22:05, 08 January 2007
Message:
Fixed: [QPID-253] Existing classpath breaks codegen; [QPID-254] Build failure does not prevent timestamp from being generated. Also moved all required properties into ant build file, allowing the generation to be completed independently of Maven from the common directory.
----
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java
Modified : /incubator/qpid/trunk/qpid/java/common/pom.xml
Modified : /incubator/qpid/trunk/qpid/java/common/protocol-version.xml
Revision: 494042
Author: rgreig
Date: 12:21:18, 08 January 2007
Message:
QPID-252 : Reduce unnecessary object creation
----
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/pool/Event.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/pool/ReadWriteThreadModel.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/pool/PoolingFilterTest.java
Revision: 494018
Author: bhupendrab
Date: 10:42:21, 08 January 2007
Message:
----
Modified : /incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
Revision: 493060
Author: marnie
Date: 16:05:34, 05 January 2007
Message:
----
Added : /incubator/qpid/trunk/qpid/java/client/example/bin
Added : /incubator/qpid/trunk/qpid/java/client/example/bin/set_classpath.bat
Added : /incubator/qpid/trunk/qpid/java/client/example/bin/set_classpath.sh
Revision: 492956
Author: bhupendrab
Date: 10:09:14, 05 January 2007
Message:
QPID-213
----
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
Revision: 492902
Author: vinoski
Date: 05:09:49, 05 January 2007
Message:
moved some distribution files
moved some files around underneath the distribution directory, and changed
some assemblies to pick them up
----
Deleted : /incubator/qpid/trunk/qpid/java/LICENSE.txt
Deleted : /incubator/qpid/trunk/qpid/java/NOTICE.txt
Deleted : /incubator/qpid/trunk/qpid/java/README.txt
Modified : /incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml
Modified : /incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/client-bin.xml
Modified : /incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/src.xml
Added : /incubator/qpid/trunk/qpid/java/distribution/src/main/release/LICENSE.txt(Copy from path: /incubator/qpid/trunk/qpid/java/LICENSE.txt, Revision, 489214
Added : /incubator/qpid/trunk/qpid/java/distribution/src/main/release/NOTICE.txt(Copy from path: /incubator/qpid/trunk/qpid/java/NOTICE.txt, Revision, 489214
Added : /incubator/qpid/trunk/qpid/java/distribution/src/main/release/README.txt(Copy from path: /incubator/qpid/trunk/qpid/java/README.txt, Revision, 489214
Revision: 492756
Author: kpvdr
Date: 21:30:39, 04 January 2007
Message:
Fixed C++ client sending protocol version 0-0 over the wire. Minor fixes and tidy-up in related code.
----
Modified : /incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
Deleted : /incubator/qpid/trunk/qpid/cpp/lib/common/framing/AMQP_HighestVersion.h
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java
Deleted : /incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl
Added : /incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl(Copy from path: /incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl, Revision, 491906
Modified : /incubator/qpid/trunk/qpid/gentools/templ.java/MethodBodyClass.tmpl
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
Revision: 492718
Author: rhs
Date: 20:23:26, 04 January 2007
Message:
QPID-248 Modified field table types to not conflict with the officially specified definitions. Also reorganized type definitions to clearly distinguish between official and extended types and reenabled the AmqPlain authentication mechanism. This change allows the python interop test suite to run.
----
Modified : /incubator/qpid/trunk/qpid/java/broker/etc/config.xml
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
Revision: 492514
Author: bhupendrab
Date: 10:52:06, 04 January 2007
Message:
QPID-213
----
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
Revision: 492280
Author: kpvdr
Date: 20:15:19, 03 January 2007
Message:
Added ability for code generator to omit elements from the XML specification
----
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Generator.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/NodeAware.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Utils.java
Revision: 492184
Author: bhupendrab
Date: 15:38:03, 03 January 2007
Message:
QPID-213
----
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
Revision: 491839
Author: kpvdr
Date: 16:31:39, 02 January 2007
Message:
Removed check run check from ant build file.
----
Modified : /incubator/qpid/trunk/qpid/gentools/build.xml
Revision: 491801
Author: kpvdr
Date: 14:41:18, 02 January 2007
Message:
Added ant build file for the generator with compile (default) and clean targets.
----
Added : /incubator/qpid/trunk/qpid/gentools/build.xml
Revision: 491879
Author: kpvdr
Date: 18:19:58, 02 January 2007
Message:
Added automatic build of generator; added dependency check on source XML files that prevents generation if not needed
----
Modified : /incubator/qpid/trunk/qpid/java/common/pom.xml
Modified : /incubator/qpid/trunk/qpid/java/common/protocol-version.xml
Revision: 491673
Author: rgreig
Date: 23:02:01, 01 January 2007
Message:
QPID-233 : Patch from Rob Godfrey - fix to lock.unlock() bug
----
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
Revision: 491577
Author: rgreig
Date: 14:30:31, 01 January 2007
Message:
QPID-232 Added the service request/reply test
----
Added : /incubator/qpid/trunk/qpid/java/perftests/bin/serviceProvidingClient.sh
Added : /incubator/qpid/trunk/qpid/java/perftests/bin/serviceRequestingClient.sh
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceProvidingClient.java
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceRequestingClient.java
Revision: 491120
Author: rgreig
Date: 22:12:44, 29 December 2006
Message:
Reduced logging level to debug to avoid performance sapping output
----
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
Revision: 491072
Author: rgreig
Date: 18:37:34, 29 December 2006
Message:
QPID-232 Created a simple module and added the topic test
----
Added : /incubator/qpid/trunk/qpid/java/perftests
Added : /incubator/qpid/trunk/qpid/java/perftests/bin
Added : /incubator/qpid/trunk/qpid/java/perftests/bin/run_many.sh
Added : /incubator/qpid/trunk/qpid/java/perftests/bin/setupclasspath.sh
Added : /incubator/qpid/trunk/qpid/java/perftests/bin/topicListener.sh
Added : /incubator/qpid/trunk/qpid/java/perftests/bin/topicPublisher.sh
Added : /incubator/qpid/trunk/qpid/java/perftests/pom.xml
Added : /incubator/qpid/trunk/qpid/java/perftests/src
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/topic
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Config.java
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java
Added : /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java
Revision: 491031
Author: bhupendrab
Date: 15:47:42, 29 December 2006
Message:
QPID-213
----
Added : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
Revision: 491029
Author: bhupendrab
Date: 15:38:05, 29 December 2006
Message:
QPID-213
----
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
Revision: 490985
Author: bhupendrab
Date: 11:55:15, 29 December 2006
Message:
test queue and exchange names changed.
----
Modified : /incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
Revision: 490872
Author: vinoski
Date: 23:42:59, 28 December 2006
Message:
apply patch for QPID-231
----
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
Revision: 490734
Author: bhupendrab
Date: 15:07:56, 28 December 2006
Message:
----
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
Revision: 490709
Author: bhupendrab
Date: 12:04:46, 28 December 2006
Message:
QPID-188
Unit tests added
----
Added : /incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
Modified : /incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
Revision: 490708
Author: bhupendrab
Date: 12:02:26, 28 December 2006
Message:
MBean created as a separate class
----
Added : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
Revision: 490605
Author: vinoski
Date: 23:52:36, 27 December 2006
Message:
add snapshot repository for distribution
----
Modified : /incubator/qpid/trunk/qpid/java/pom.xml
Revision: 490505
Author: bhupendrab
Date: 14:10:05, 27 December 2006
Message:
QPID-213
improving the management GUI look and feel
----
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
Revision: 490373
Author: rgreig
Date: 21:10:20, 26 December 2006
Message:
QPID-227 Renamed version.properties to qpidversion.properties due to clash with a dependency also using version.properties. Also improved robustness where properties file does not contain expected properties.
----
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
Modified : /incubator/qpid/trunk/qpid/java/pom.xml
Revision: 489804
Author: rgreig
Date: 23:55:13, 22 December 2006
Message:
QPID-229 Fixed spurious import in test class
----
Modified : /incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
Revision: 489754
Author: rgreig
Date: 20:46:54, 22 December 2006
Message:
QPID-229 : Patch supplied by Rob Godfrey - Change implementation of FieldTable
----
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
Revision: 489748
Author: rgreig
Date: 20:32:43, 22 December 2006
Message:
QPID-229 : Patch supplied by Rob Godfrey - Change implementation of FieldTable
----
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
Added : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
Added : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
Added : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/JMSPropertyFieldTable.java
Deleted : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/PropertyFieldTable.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/JMSPropertyFieldTableTest.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
Modified : /incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
Modified : /incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
Modified : /incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
Revision: 489715
Author: kpvdr
Date: 18:26:40, 22 December 2006
Message:
File tidy-up for AMQP version code: Removed old XSLT files; moved cluster.asl into spec directory; renamed spec files to better reflect version notation; updated java, c++ and python files to reference new names.
----
Modified : /incubator/qpid/trunk/qpid/cpp/gen/Makefile.am
Modified : /incubator/qpid/trunk/qpid/java/common/pom.xml
Modified : /incubator/qpid/trunk/qpid/java/common/protocol-version.xml
Deleted : /incubator/qpid/trunk/qpid/java/common/src/main/versions
Deleted : /incubator/qpid/trunk/qpid/java/common/src/main/xsl
Modified : /incubator/qpid/trunk/qpid/python/amqp-doc
Modified : /incubator/qpid/trunk/qpid/python/qpid/testlib.py
Deleted : /incubator/qpid/trunk/qpid/specs/amqp-8.0.xml
Added : /incubator/qpid/trunk/qpid/specs/amqp.0-8.xml(Copy from path: /incubator/qpid/trunk/qpid/specs/amqp-8.0.xml, Revision, 489705
Added : /incubator/qpid/trunk/qpid/specs/amqp.0-9.xml
Added : /incubator/qpid/trunk/qpid/specs/cluster.0-8.xml(Copy from path: /incubator/qpid/trunk/qpid/java/common/src/main/xsl/cluster.asl, Revision, 489705
Added : /incubator/qpid/trunk/qpid/specs/cluster.0-9.xml
Revision: 489704
Author: kpvdr
Date: 17:43:09, 22 December 2006
Message:
Additional changes to support new Java AMQP version code, some C++ tidy-up as well.
----
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
Modified : /incubator/qpid/trunk/qpid/gentools/templ.java/MethodBodyClass.tmpl
Modified : /incubator/qpid/trunk/qpid/gentools/templ.java/MethodRegistryClass.tmpl
Modified : /incubator/qpid/trunk/qpid/gentools/templ.java/PropertyContentHeaderClass.tmpl
Revision: 489691
Author: kpvdr
Date: 17:00:28, 22 December 2006
Message:
AMQP version using new generator - Part 1. In these changes, all places where version-specific info is required, it has been hard-wired to major=8, minor=0. The next phase of changes will connect the version info to that obtained from ProtocolInitiation for the current session.
----
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
Modified : /incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
Modified : /incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteConsumeHandler.java
Modified : /incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ConsumerCounts.java
Modified : /incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/RecordingMethodHandlerFactory.java
Modified : /incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayStore.java
Modified : /incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java
Modified : /incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java
Modified : /incubator/qpid/trunk/qpid/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java
Modified : /incubator/qpid/trunk/qpid/java/common/pom.xml
Modified : /incubator/qpid/trunk/qpid/java/common/protocol-version.xml
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/xsl/cluster.asl
Modified : /incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
Modified : /incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
Modified : /incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java
Modified : /incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
Revision: 489644
Author: rgreig
Date: 13:06:45, 22 December 2006
Message:
----
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java
Added : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
Revision: 489403
Author: bhupendrab
Date: 16:47:01, 21 December 2006
Message:
QPID-227
----
Modified : /incubator/qpid/trunk/qpid/java/broker/pom.xml
Modified : /incubator/qpid/trunk/qpid/java/client/pom.xml
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
Modified : /incubator/qpid/trunk/qpid/java/pom.xml
Revision: 489331
Author: bhupendrab
Date: 11:33:49, 21 December 2006
Message:
QPID-188
test updated
----
Modified : /incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
Revision: 489330
Author: bhupendrab
Date: 11:32:58, 21 December 2006
Message:
QPID-188
Unit test for AMQProtocolSession mbean updated and closeChannel() method removed from mbean because it didn't seem to be a required feature for management console.
----
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
Modified : /incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
Revision: 489215
Author: vinoski
Date: 22:46:12, 20 December 2006
Message:
add clover support, fix logging level variables
Added support for the clover plugin to the top-level pom, and eliminated
redundant amqj.logging.level variables from module poms.
----
Modified : /incubator/qpid/trunk/qpid/java/broker/pom.xml
Modified : /incubator/qpid/trunk/qpid/java/client/pom.xml
Modified : /incubator/qpid/trunk/qpid/java/pom.xml
Modified : /incubator/qpid/trunk/qpid/java/systests/pom.xml
Revision: 489214
Author: cctrieloff
Date: 22:36:18, 20 December 2006
Message:
Multi version support part 2.
----
Modified : /incubator/qpid/trunk/qpid/gentools/build
Modified : /incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
Modified : /incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
Modified : /incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
Modified : /incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
Modified : /incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
Modified : /incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
Modified : /incubator/qpid/trunk/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
Revision: 489204
Author: rhs
Date: 21:47:54, 20 December 2006
Message:
conf file for jpackage
----
Added : /incubator/qpid/trunk/qpid/java/broker/etc/qpid-server.conf.jpp
Revision: 489140
Author: ritchiem
Date: 17:04:33, 20 December 2006
Message:
QPID-225
Applied Patch for queue browsing with client acknowledgement
----
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
Added:
incubator/qpid/branches/perftesting/qpid/gentools/build.xml
- copied unchanged from r493060, incubator/qpid/trunk/qpid/gentools/build.xml
incubator/qpid/branches/perftesting/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
- copied unchanged from r493060, incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
incubator/qpid/branches/perftesting/qpid/java/broker/etc/qpid-server.conf.jpp
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/broker/etc/qpid-server.conf.jpp
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
incubator/qpid/branches/perftesting/qpid/java/client/example/bin/
- copied from r493060, incubator/qpid/trunk/qpid/java/client/example/bin/
incubator/qpid/branches/perftesting/qpid/java/client/example/bin/set_classpath.bat
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/client/example/bin/set_classpath.bat
incubator/qpid/branches/perftesting/qpid/java/client/example/bin/set_classpath.sh
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/client/example/bin/set_classpath.sh
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/release/LICENSE.txt
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/distribution/src/main/release/LICENSE.txt
incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/release/NOTICE.txt
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/distribution/src/main/release/NOTICE.txt
incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/release/README.txt
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/distribution/src/main/release/README.txt
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
incubator/qpid/branches/perftesting/qpid/java/perftests/
- copied from r493060, incubator/qpid/trunk/qpid/java/perftests/
incubator/qpid/branches/perftesting/qpid/java/perftests/bin/
- copied from r493060, incubator/qpid/trunk/qpid/java/perftests/bin/
incubator/qpid/branches/perftesting/qpid/java/perftests/bin/run_many.sh
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/bin/run_many.sh
incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceProvidingClient.sh
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/bin/serviceProvidingClient.sh
incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestingClient.sh
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/bin/serviceRequestingClient.sh
incubator/qpid/branches/perftesting/qpid/java/perftests/bin/setupclasspath.sh
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/bin/setupclasspath.sh
incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topicListener.sh
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/bin/topicListener.sh
incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topicPublisher.sh
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/bin/topicPublisher.sh
incubator/qpid/branches/perftesting/qpid/java/perftests/pom.xml
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/pom.xml
incubator/qpid/branches/perftesting/qpid/java/perftests/src/
- copied from r493060, incubator/qpid/trunk/qpid/java/perftests/src/
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/
- copied from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/
- copied from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/
- copied from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/
- copied from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/
- copied from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/config/
- copied from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config/
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/
- copied from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceProvidingClient.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceProvidingClient.java
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceRequestingClient.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceRequestingClient.java
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/topic/
- copied from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/topic/
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Config.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Config.java
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java
incubator/qpid/branches/perftesting/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java
incubator/qpid/branches/perftesting/qpid/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
- copied unchanged from r493060, incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
incubator/qpid/branches/perftesting/qpid/specs/amqp.0-8.xml (with props)
incubator/qpid/branches/perftesting/qpid/specs/amqp.0-9.xml (with props)
incubator/qpid/branches/perftesting/qpid/specs/cluster.0-8.xml (with props)
incubator/qpid/branches/perftesting/qpid/specs/cluster.0-9.xml (with props)
Removed:
incubator/qpid/branches/perftesting/qpid/gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl
incubator/qpid/branches/perftesting/qpid/java/LICENSE.txt
incubator/qpid/branches/perftesting/qpid/java/NOTICE.txt
incubator/qpid/branches/perftesting/qpid/java/README.txt
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/PropertyFieldTable.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/versions/
incubator/qpid/branches/perftesting/qpid/java/common/src/main/xsl/
incubator/qpid/branches/perftesting/qpid/specs/amqp-8.0.xml
Modified:
incubator/qpid/branches/perftesting/qpid/gentools/build
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/Generator.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/Main.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/NodeAware.java
incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/Utils.java
incubator/qpid/branches/perftesting/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
incubator/qpid/branches/perftesting/qpid/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
incubator/qpid/branches/perftesting/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
incubator/qpid/branches/perftesting/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
incubator/qpid/branches/perftesting/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
incubator/qpid/branches/perftesting/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
incubator/qpid/branches/perftesting/qpid/gentools/templ.java/MethodBodyClass.tmpl
incubator/qpid/branches/perftesting/qpid/gentools/templ.java/MethodRegistryClass.tmpl
incubator/qpid/branches/perftesting/qpid/gentools/templ.java/PropertyContentHeaderClass.tmpl
incubator/qpid/branches/perftesting/qpid/java/broker/etc/config.xml
incubator/qpid/branches/perftesting/qpid/java/broker/pom.xml
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
incubator/qpid/branches/perftesting/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
incubator/qpid/branches/perftesting/qpid/java/client/pom.xml
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
incubator/qpid/branches/perftesting/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
incubator/qpid/branches/perftesting/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
incubator/qpid/branches/perftesting/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
incubator/qpid/branches/perftesting/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
incubator/qpid/branches/perftesting/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteConsumeHandler.java
incubator/qpid/branches/perftesting/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ConsumerCounts.java
incubator/qpid/branches/perftesting/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/RecordingMethodHandlerFactory.java
incubator/qpid/branches/perftesting/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayStore.java
incubator/qpid/branches/perftesting/qpid/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java
incubator/qpid/branches/perftesting/qpid/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java
incubator/qpid/branches/perftesting/qpid/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java
incubator/qpid/branches/perftesting/qpid/java/common/pom.xml
incubator/qpid/branches/perftesting/qpid/java/common/protocol-version.xml
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/JMSPropertyFieldTable.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/pool/Event.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
incubator/qpid/branches/perftesting/qpid/java/common/src/main/java/org/apache/qpid/pool/ReadWriteThreadModel.java
incubator/qpid/branches/perftesting/qpid/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
incubator/qpid/branches/perftesting/qpid/java/common/src/test/java/org/apache/qpid/framing/JMSPropertyFieldTableTest.java
incubator/qpid/branches/perftesting/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
incubator/qpid/branches/perftesting/qpid/java/common/src/test/java/org/apache/qpid/pool/PoolingFilterTest.java
incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/bin.xml
incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/client-bin.xml
incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/src.xml
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/bin/qpidmc.sh
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
incubator/qpid/branches/perftesting/qpid/java/pom.xml
incubator/qpid/branches/perftesting/qpid/java/systests/pom.xml
incubator/qpid/branches/perftesting/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
incubator/qpid/branches/perftesting/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
incubator/qpid/branches/perftesting/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
incubator/qpid/branches/perftesting/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
incubator/qpid/branches/perftesting/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
incubator/qpid/branches/perftesting/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java
incubator/qpid/branches/perftesting/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
Modified: incubator/qpid/branches/perftesting/qpid/gentools/build
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/gentools/build?view=diff&rev=496725&r1=496724&r2=496725
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/gentools/build (original)
+++ incubator/qpid/branches/perftesting/qpid/gentools/build Tue Jan 16 07:16:39 2007
@@ -10,6 +10,6 @@
echo "Compiling..."
javac org/apache/qpid/gentools/*.java
echo "Done. Try it out..."
-java org/apache/qpid/gentools/Main
+java org.apache.qpid.gentools.Main
echo "--------- Building gentools completed ----------"
cd ..
Modified: incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java?view=diff&rev=496725&r1=496724&r2=496725
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java (original)
+++ incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java Tue Jan 16 07:16:39 2007
@@ -21,12 +21,11 @@
package org.apache.qpid.gentools;
import java.io.PrintStream;
-import java.util.Iterator;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-public class AmqpClass implements Printable, NodeAware
+public class AmqpClass implements Printable, NodeAware
{
public LanguageConverter converter;
public AmqpVersionSet versionSet;
@@ -45,50 +44,82 @@
indexMap = new AmqpOrdinalVersionMap();
}
- public void addFromNode(Node classNode, int ordinal, AmqpVersion version)
+ public boolean addFromNode(Node classNode, int ordinal, AmqpVersion version)
throws AmqpParseException, AmqpTypeMappingException
{
versionSet.add(version);
int index = Utils.getNamedIntegerAttribute(classNode, "index");
- AmqpVersionSet versionSet = indexMap.get(index);
- if (versionSet != null)
- versionSet.add(version);
+ AmqpVersionSet indexVersionSet = indexMap.get(index);
+ if (indexVersionSet != null)
+ indexVersionSet.add(version);
else
{
- versionSet = new AmqpVersionSet();
- versionSet.add(version);
- indexMap.put(index, versionSet);
+ indexVersionSet = new AmqpVersionSet();
+ indexVersionSet.add(version);
+ indexMap.put(index, indexVersionSet);
}
NodeList nList = classNode.getChildNodes();
int fieldCntr = 0;
- int methodCntr = 0;
for (int i=0; i<nList.getLength(); i++)
{
Node child = nList.item(i);
if (child.getNodeName().compareTo(Utils.ELEMENT_FIELD) == 0)
{
- String fieldName = converter.prepareDomainName(Utils.getNamedAttribute(child, Utils.ATTRIBUTE_NAME));
+ String fieldName = converter.prepareDomainName(Utils.getNamedAttribute(child,
+ Utils.ATTRIBUTE_NAME));
AmqpField thisField = fieldMap.get(fieldName);
if (thisField == null)
{
thisField = new AmqpField(fieldName, converter);
fieldMap.put(fieldName, thisField);
}
- thisField.addFromNode(child, fieldCntr, version);
+ if (!thisField.addFromNode(child, fieldCntr++, version))
+ {
+ String className = converter.prepareClassName(Utils.getNamedAttribute(classNode,
+ Utils.ATTRIBUTE_NAME));
+ System.out.println("INFO: Generation supression tag found for field " +
+ className + "." + fieldName + " - removing.");
+ thisField.removeVersion(version);
+ fieldMap.remove(fieldName);
+ }
fieldCntr++;
}
else if (child.getNodeName().compareTo(Utils.ELEMENT_METHOD) == 0)
{
- String methodName = converter.prepareMethodName(Utils.getNamedAttribute(child, Utils.ATTRIBUTE_NAME));
+ String methodName = converter.prepareMethodName(Utils.getNamedAttribute(child,
+ Utils.ATTRIBUTE_NAME));
AmqpMethod thisMethod = methodMap.get(methodName);
if (thisMethod == null)
{
thisMethod = new AmqpMethod(methodName, converter);
methodMap.put(methodName, thisMethod);
}
- thisMethod.addFromNode(child, methodCntr++, version);
+ if (!thisMethod.addFromNode(child, fieldCntr++, version))
+ {
+ String className = converter.prepareClassName(Utils.getNamedAttribute(classNode,
+ Utils.ATTRIBUTE_NAME));
+ System.out.println("INFO: Generation supression tag found for method " +
+ className + "." + methodName + " - removing.");
+ thisMethod.removeVersion(version);
+ methodMap.remove(methodName);
+ }
+ }
+ else if (child.getNodeName().compareTo(Utils.ELEMENT_CODEGEN) == 0)
+ {
+ String value = Utils.getNamedAttribute(child, Utils.ATTRIBUTE_VALUE);
+ if (value.compareTo("no-gen") == 0)
+ return false;
}
}
+ return true;
+ }
+
+ public void removeVersion(AmqpVersion version)
+ {
+ indexMap.removeVersion(version);
+ fieldMap.removeVersion(version);
+ methodMap.removeVersion(version);
+ versionSet.remove(version);
}
public void print(PrintStream out, int marginSize, int tabSize)
@@ -97,25 +128,21 @@
String tab = Utils.createSpaces(tabSize);
out.println(margin + "[C] " + name + ": " + versionSet);
- Iterator<Integer> iItr = indexMap.keySet().iterator();
- while (iItr.hasNext())
+ for (Integer thisIndex : indexMap.keySet())
{
- int index = iItr.next();
- AmqpVersionSet indexVersionSet = indexMap.get(index);
- out.println(margin + tab + "[I] " + index + indexVersionSet);
+ AmqpVersionSet indexVersionSet = indexMap.get(thisIndex);
+ out.println(margin + tab + "[I] " + thisIndex + indexVersionSet);
}
- Iterator<String> sItr = fieldMap.keySet().iterator();
- while (sItr.hasNext())
+ for (String thisFieldName : fieldMap.keySet())
{
- AmqpField thisField = fieldMap.get(sItr.next());
+ AmqpField thisField = fieldMap.get(thisFieldName);
thisField.print(out, marginSize + tabSize, tabSize);
}
- sItr = methodMap.keySet().iterator();
- while (sItr.hasNext())
+ for (String thisMethodName : methodMap.keySet())
{
- AmqpMethod thisMethod = methodMap.get(sItr.next());
+ AmqpMethod thisMethod = methodMap.get(thisMethodName);
thisMethod.print(out, marginSize + tabSize, tabSize);
}
}
Modified: incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstant.java?view=diff&rev=496725&r1=496724&r2=496725
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstant.java (original)
+++ incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstant.java Tue Jan 16 07:16:39 2007
@@ -21,7 +21,6 @@
package org.apache.qpid.gentools;
import java.io.PrintStream;
-import java.util.Iterator;
import java.util.TreeMap;
/**
@@ -113,13 +112,11 @@
public String getStringValue(AmqpVersion version)
throws AmqpTypeMappingException
{
- Iterator<String> sItr = keySet().iterator();
- while (sItr.hasNext())
+ for (String thisValue : keySet())
{
- String value = sItr.next();
- AmqpVersionSet versionSet = get(value);
+ AmqpVersionSet versionSet = get(thisValue);
if (versionSet.contains(version))
- return value;
+ return thisValue;
}
throw new AmqpTypeMappingException("Unable to find value for constant \"" + name +
"\" for version " + version.toString() + ".");
@@ -199,11 +196,9 @@
else
{
out.println(margin + tab + "[C] " + name + ": " + versionSet);
- Iterator<String> sItr = keySet().iterator();
- while (sItr.hasNext())
+ for (String thisValue : keySet())
{
- String value = sItr.next();
- out.println(margin + tab + tab + "= \"" + value + "\" " + get(value));
+ out.println(margin + tab + tab + "= \"" + thisValue + "\" " + get(thisValue));
}
}
}
Modified: incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java?view=diff&rev=496725&r1=496724&r2=496725
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java (original)
+++ incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java Tue Jan 16 07:16:39 2007
@@ -48,7 +48,7 @@
/* (non-Javadoc)
* @see org.apache.qpid.gentools.NodeAware#addFromNode(org.w3c.dom.Node, int, org.apache.qpid.gentools.AmqpVersion)
*/
- public void addFromNode(Node node, int ordinal, AmqpVersion version)
+ public boolean addFromNode(Node node, int ordinal, AmqpVersion version)
throws AmqpParseException, AmqpTypeMappingException
{
NodeList nodeList = node.getChildNodes();
@@ -71,10 +71,8 @@
thisConstant.versionSet.add(version);
// Now, find the value in the map
boolean foundValue = false;
- Iterator<String> vItr = thisConstant.keySet().iterator();
- while (vItr.hasNext() && !foundValue)
+ for (String thisValue : thisConstant.keySet())
{
- String thisValue = vItr.next();
if (value.compareTo(thisValue) == 0)
{
foundValue = true;
@@ -97,6 +95,7 @@
}
}
}
+ return true;
}
/* (non-Javadoc)
@@ -105,10 +104,9 @@
public void print(PrintStream out, int marginSize, int tabSize)
{
out.println(Utils.createSpaces(marginSize) + "Constants: ");
- Iterator<AmqpConstant> cItr = iterator();
- while (cItr.hasNext())
+ for (AmqpConstant thisAmqpConstant : this)
{
- cItr.next().print(out, marginSize, tabSize);
+ thisAmqpConstant.print(out, marginSize, tabSize);
}
}
Modified: incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomain.java?view=diff&rev=496725&r1=496724&r2=496725
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomain.java (original)
+++ incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomain.java Tue Jan 16 07:16:39 2007
@@ -21,7 +21,6 @@
package org.apache.qpid.gentools;
import java.io.PrintStream;
-import java.util.Iterator;
import java.util.TreeMap;
@SuppressWarnings("serial")
@@ -48,13 +47,11 @@
public String getDomainType(AmqpVersion version)
throws AmqpTypeMappingException
{
- Iterator<String> i = keySet().iterator();
- while (i.hasNext())
+ for (String thisDomainType : keySet())
{
- String type = i.next();
- AmqpVersionSet versionSet = get(type);
+ AmqpVersionSet versionSet = get(thisDomainType);
if (versionSet.contains(version))
- return type;
+ return thisDomainType;
} throw new AmqpTypeMappingException("Unable to find version " + version + ".");
}
@@ -72,12 +69,10 @@
String tab = Utils.createSpaces(tabSize);
out.println(margin + domainName + ":");
- Iterator<String> i = keySet().iterator();
- while (i.hasNext())
+ for (String thisDomainType : keySet())
{
- String type = i.next();
- AmqpVersionSet vs = get(type);
- out.println(margin + tab + type + " : " + vs.toString());
+ AmqpVersionSet vs = get(thisDomainType);
+ out.println(margin + tab + thisDomainType + " : " + vs.toString());
}
}
}
Modified: incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java?view=diff&rev=496725&r1=496724&r2=496725
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java (original)
+++ incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java Tue Jan 16 07:16:39 2007
@@ -21,7 +21,6 @@
package org.apache.qpid.gentools;
import java.io.PrintStream;
-import java.util.Iterator;
import java.util.TreeMap;
import org.w3c.dom.Node;
@@ -38,7 +37,7 @@
this.converter.setDomainMap(this);
}
- public void addFromNode(Node n, int o, AmqpVersion v)
+ public boolean addFromNode(Node n, int o, AmqpVersion v)
throws AmqpParseException, AmqpTypeMappingException
{
NodeList nl = n.getChildNodes();
@@ -82,7 +81,8 @@
{
addFromNode(c, 0, v);
}
- }
+ }
+ return true;
}
public String getDomainType(String domainName, AmqpVersion version)
@@ -110,11 +110,9 @@
public void print(PrintStream out, int marginSize, int tabSize)
{
out.println(Utils.createSpaces(marginSize) + "Domain Map:");
- Iterator<String> i = keySet().iterator();
- while (i.hasNext())
+ for (String thisDomainName : keySet())
{
- String domainName = i.next();
- AmqpDomain domain = get(domainName);
+ AmqpDomain domain = get(thisDomainName);
domain.print(out, marginSize + tabSize, tabSize);
}
}
Modified: incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java?view=diff&rev=496725&r1=496724&r2=496725
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java (original)
+++ incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java Tue Jan 16 07:16:39 2007
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.gentools;
+import java.util.ArrayList;
import java.util.TreeMap;
@SuppressWarnings("serial")
@@ -30,5 +31,28 @@
if (size() != 1)
return false;
return get(firstKey()).equals(globalVersionSet);
+ }
+
+ public boolean removeVersion(AmqpVersion version)
+ {
+ Boolean res = false;
+ ArrayList<String> removeList = new ArrayList<String>();
+ for (String domainName : keySet())
+ {
+ AmqpVersionSet versionSet = get(domainName);
+ if (versionSet.contains(version))
+ {
+ versionSet.remove(version);
+ if (versionSet.isEmpty())
+ removeList.add(domainName);
+ res = true;
+ }
+ }
+ // Get rid of domains no longer in use
+ for (String domainName : removeList)
+ {
+ remove(domainName);
+ }
+ return res;
}
}
Modified: incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java?view=diff&rev=496725&r1=496724&r2=496725
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java (original)
+++ incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java Tue Jan 16 07:16:39 2007
@@ -22,9 +22,9 @@
import java.io.PrintStream;
import java.util.ArrayList;
-import java.util.Iterator;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class AmqpField implements Printable, NodeAware, VersionConsistencyCheck
{
@@ -43,7 +43,7 @@
ordinalMap = new AmqpOrdinalVersionMap();
}
- public void addFromNode(Node fieldNode, int ordinal, AmqpVersion version)
+ public boolean addFromNode(Node fieldNode, int ordinal, AmqpVersion version)
throws AmqpParseException, AmqpTypeMappingException
{
versionSet.add(version);
@@ -71,6 +71,25 @@
ordinalMap.put(ordinal, thisVersionList);
}
thisVersionList.add(version);
+ NodeList nList = fieldNode.getChildNodes();
+ for (int i=0; i<nList.getLength(); i++)
+ {
+ Node child = nList.item(i);
+ if (child.getNodeName().compareTo(Utils.ELEMENT_CODEGEN) == 0)
+ {
+ String value = Utils.getNamedAttribute(child, Utils.ATTRIBUTE_VALUE);
+ if (value.compareTo("no-gen") == 0)
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public void removeVersion(AmqpVersion version)
+ {
+ domainMap.removeVersion(version);
+ ordinalMap.removeVersion(version);
+ versionSet.remove(version);
}
public boolean isCodeTypeConsistent(LanguageConverter converter)
@@ -79,12 +98,10 @@
if (domainMap.size() == 1)
return true; // By definition
ArrayList<String> codeTypeList = new ArrayList<String>();
- Iterator<String> itr = domainMap.keySet().iterator();
- while (itr.hasNext())
+ for (String thisDomainName : domainMap.keySet())
{
- String domainName = itr.next();
- AmqpVersionSet versionSet = domainMap.get(domainName);
- String codeType = converter.getGeneratedType(domainName, versionSet.first());
+ AmqpVersionSet versionSet = domainMap.get(thisDomainName);
+ String codeType = converter.getGeneratedType(thisDomainName, versionSet.first());
if (!codeTypeList.contains(codeType))
codeTypeList.add(codeType);
}
@@ -101,9 +118,10 @@
// Since the various doamin names map to the same code type, add the version occurrences
// across all domains to see we have all possible versions covered
int vCntr = 0;
- Iterator<String> itr = domainMap.keySet().iterator();
- while (itr.hasNext())
- vCntr += domainMap.get(itr.next()).size();
+ for (String thisDomainName : domainMap.keySet())
+ {
+ vCntr += domainMap.get(thisDomainName).size();
+ }
return vCntr == generator.globalVersionSet.size();
}
@@ -112,20 +130,16 @@
String margin = Utils.createSpaces(marginSize);
out.println(margin + "[F] " + name + ": " + versionSet);
- Iterator<Integer> iItr = ordinalMap.keySet().iterator();
- while (iItr.hasNext())
+ for (Integer thisOrdinal : ordinalMap.keySet())
{
- Integer ordinalValue = iItr.next();
- AmqpVersionSet versionList = ordinalMap.get(ordinalValue);
- out.println(margin + " [O] " + ordinalValue + " : " + versionList.toString());
+ AmqpVersionSet versionList = ordinalMap.get(thisOrdinal);
+ out.println(margin + " [O] " + thisOrdinal + " : " + versionList.toString());
}
- Iterator<String> sItr = domainMap.keySet().iterator();
- while (sItr.hasNext())
+ for (String thisDomainName : domainMap.keySet())
{
- String domainKey = sItr.next();
- AmqpVersionSet versionList = domainMap.get(domainKey);
- out.println(margin + " [D] " + domainKey + " : " + versionList.toString());
+ AmqpVersionSet versionList = domainMap.get(thisDomainName);
+ out.println(margin + " [D] " + thisDomainName + " : " + versionList.toString());
}
}
Modified: incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java?view=diff&rev=496725&r1=496724&r2=496725
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java (original)
+++ incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java Tue Jan 16 07:16:39 2007
@@ -29,17 +29,29 @@
@SuppressWarnings("serial")
public class AmqpFieldMap extends TreeMap<String, AmqpField> implements VersionConsistencyCheck
{
+ public void removeVersion(AmqpVersion version)
+ {
+ String[] fieldNameArray = new String[size()];
+ keySet().toArray(fieldNameArray);
+ for (String fieldName : fieldNameArray)
+ {
+ get(fieldName).removeVersion(version);
+ remove(fieldName);
+ }
+ }
+
public AmqpFieldMap getFieldMapForOrdinal(int ordinal)
{
AmqpFieldMap newMap = new AmqpFieldMap();
- Iterator<String> fItr = keySet().iterator();
- while (fItr.hasNext())
+ for (String thisFieldName: keySet())
{
- AmqpField field = get(fItr.next());
+ AmqpField field = get(thisFieldName);
TreeMap<Integer, AmqpVersionSet> ordinalMap = field.ordinalMap;
AmqpVersionSet ordinalVersions = ordinalMap.get(ordinal);
if (ordinalVersions != null)
+ {
newMap.put(field.name, field);
+ }
}
return newMap;
}
@@ -48,19 +60,26 @@
LanguageConverter converter)
throws AmqpTypeMappingException
{
+ // TODO: REVIEW THIS! There may be a bug here that affects C++ generation (only with >1 version)...
+ // If version == null (a common scenario) then the version map is built up on the
+ // basis of first found item, and ignores other version variations.
+ // This should probably be disallowed by throwing an NPE, as AmqpOrdinalFieldMap cannot
+ // represent these possibilities.
+ // *OR*
+ // Change the structure of AmqpOrdianlFieldMap to allow for the various combinations that
+ // will result from version variation - but that is what AmqpFieldMap is... :-$
AmqpOrdinalFieldMap ordinalFieldMap = new AmqpOrdinalFieldMap();
- Iterator<String> fItr = keySet().iterator();
- while (fItr.hasNext())
+ for (String thisFieldName: keySet())
{
- AmqpField field = get(fItr.next());
+ AmqpField field = get(thisFieldName);
if (version == null || field.versionSet.contains(version))
{
+ // 1. Search for domain name in field domain map with version that matches
String domain = "";
boolean dFound = false;
- Iterator<String> dItr = field.domainMap.keySet().iterator();
- while (dItr.hasNext() && !dFound)
+ for (String thisDomainName : field.domainMap.keySet())
{
- domain = dItr.next();
+ domain = thisDomainName;
AmqpVersionSet versionSet = field.domainMap.get(domain);
if (version == null || versionSet.contains(version))
{
@@ -70,12 +89,12 @@
}
}
+ // 2. Search for ordinal in field ordianl map with version that matches
int ordinal = -1;
boolean oFound = false;
- Iterator<Integer> oItr = field.ordinalMap.keySet().iterator();
- while (oItr.hasNext() && !oFound)
+ for (Integer thisOrdinal : field.ordinalMap.keySet())
{
- ordinal = oItr.next();
+ ordinal = thisOrdinal;
AmqpVersionSet versionSet = field.ordinalMap.get(ordinal);
if (version == null || versionSet.contains(version))
oFound = true;
@@ -102,10 +121,9 @@
public int getNumFields(AmqpVersion version)
{
int fCntr = 0;
- Iterator<String> fItr = keySet().iterator();
- while (fItr.hasNext())
+ for (String thisFieldName : keySet())
{
- AmqpField field = get(fItr.next());
+ AmqpField field = get(thisFieldName);
if (field.versionSet.contains(version))
fCntr++;
}
@@ -156,7 +174,6 @@
public String parseFieldMapOrdinally(Method generateMethod, Method bitGenerateMethod,
int indentSize, int tabSize, Generator codeGenerator)
-// int indentSize, int tabSize, AmqpVersionSet versionSet, AmqpDomainMap globalDomainMap)
throws AmqpTypeMappingException, IllegalAccessException, InvocationTargetException
{
String indent = Utils.createSpaces(indentSize);
@@ -320,10 +337,9 @@
public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
{
- Iterator<String> fItr = keySet().iterator();
- while (fItr.hasNext())
+ for (String thisFieldName : keySet())
{
- AmqpField field = get(fItr.next());
+ AmqpField field = get(thisFieldName);
if (!field.isVersionConsistent(globalVersionSet))
return false;
}
Modified: incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java?view=diff&rev=496725&r1=496724&r2=496725
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java (original)
+++ incubator/qpid/branches/perftesting/qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java Tue Jan 16 07:16:39 2007
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.gentools;
+import java.util.ArrayList;
import java.util.TreeMap;
@SuppressWarnings("serial")
@@ -43,5 +44,28 @@
if (size() != 1)
return false;
return get(firstKey()).equals(globalVersionSet);
+ }
+
+ public boolean removeVersion(AmqpVersion version)
+ {
+ Boolean res = false;
+ ArrayList<Boolean> removeList = new ArrayList<Boolean>();
+ for (Boolean flag : keySet())
+ {
+ AmqpVersionSet versionSet = get(flag);
+ if (versionSet.contains(version))
+ {
+ versionSet.remove(version);
+ if (versionSet.isEmpty())
+ removeList.add(flag);
+ res = true;
+ }
+ }
+ // Get rid of flags no longer in use
+ for (Boolean flag : removeList)
+ {
+ remove(flag);
+ }
+ return res;
}
}