QPID-1335: moved Qman into java/management/client

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@703177 13f79535-47bb-0310-9956-ffa450edef68

87 files changed, 2 insertions, 2 deletions

diff --git a/java/build.deps b/java/build.deps
index 20ceda21f6..8db5fbcf7e 100644
--- a/java/build.deps
+++ b/java/build.deps
@@ -23,14 +23,14 @@ xalan=lib/xalan-2.7.0.jar
 
 osgi-core=lib/org.osgi.core-1.0.0.jar
 felix-framework=lib/org.apache.felix.framework-1.0.0.jar
-commons-pool-libs=lib/commons-pool-1.4.jar
+
 
 felix.libs=${osgi-core} ${felix-framework}
 
 common.libs=${slf4j-api} ${backport-util-concurrent} ${mina-core} \
     ${mina-filter-ssl} ${commons-codec} ${commons-lang} ${commons-collections} \
     ${commons-configuration} 
-client.libs=${common.libs}  ${geronimo-jms} ${commons-pool-libs}
+client.libs=${common.libs}  ${geronimo-jms} 
 tools.libs=${client.libs}
 broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \
     ${slf4j-log4j} ${xalan} ${felix.libs} ${build.lib}/${project.name}-common-${project.version}.jar
diff --git a/java/client/src/main/java/org/apache/qpid/management/Constants.java b/java/management/client/src/main/java/org/apache/qpid/management/Constants.java
index 7be1bda776..7be1bda776 100644
--- a/java/client/src/main/java/org/apache/qpid/management/Constants.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/Constants.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/Names.java b/java/management/client/src/main/java/org/apache/qpid/management/Names.java
index dde7715509..dde7715509 100644
--- a/java/client/src/main/java/org/apache/qpid/management/Names.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/Names.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/Protocol.java b/java/management/client/src/main/java/org/apache/qpid/management/Protocol.java
index 185f417448..185f417448 100644
--- a/java/client/src/main/java/org/apache/qpid/management/Protocol.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/Protocol.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/config.xml b/java/management/client/src/main/java/org/apache/qpid/management/config.xml
index 590e33a0f7..590e33a0f7 100644
--- a/java/client/src/main/java/org/apache/qpid/management/config.xml
+++ b/java/management/client/src/main/java/org/apache/qpid/management/config.xml
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/AccessModeMapping.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/AccessModeMapping.java
index 899462a648..899462a648 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/AccessModeMapping.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/AccessModeMapping.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/AccessModeMappingParser.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/AccessModeMappingParser.java
index d9dcbd12d3..d9dcbd12d3 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/AccessModeMappingParser.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/AccessModeMappingParser.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionData.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionData.java
index 74e89ef19d..74e89ef19d 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionData.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionData.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionDataParser.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionDataParser.java
index d76baed07f..d76baed07f 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionDataParser.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionDataParser.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/Configuration.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configuration.java
index cd39d330bb..cd39d330bb 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/Configuration.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configuration.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/ConfigurationException.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/ConfigurationException.java
index 0ddbb3e1d8..0ddbb3e1d8 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/ConfigurationException.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/ConfigurationException.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/Configurator.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configurator.java
index fb33622f4d..fb33622f4d 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/Configurator.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configurator.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/IParser.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/IParser.java
index a221686765..a221686765 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/IParser.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/IParser.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/ManagementQueueMessageListenerParser.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/ManagementQueueMessageListenerParser.java
index f31cd832cc..f31cd832cc 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/ManagementQueueMessageListenerParser.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/ManagementQueueMessageListenerParser.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/MessageHandlerMapping.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/MessageHandlerMapping.java
index 7ce3baae49..7ce3baae49 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/MessageHandlerMapping.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/MessageHandlerMapping.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/MethodReplyQueueMessageListenerParser.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/MethodReplyQueueMessageListenerParser.java
index a466b50658..a466b50658 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/MethodReplyQueueMessageListenerParser.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/MethodReplyQueueMessageListenerParser.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/QpidDatasource.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/QpidDatasource.java
index f4428cb1e2..f4428cb1e2 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/QpidDatasource.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/QpidDatasource.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/Tag.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/Tag.java
index 9b3a4a3f6f..9b3a4a3f6f 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/Tag.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/Tag.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/TypeMapping.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/TypeMapping.java
index 714c8eb6f5..714c8eb6f5 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/TypeMapping.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/TypeMapping.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/TypeMappingParser.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/TypeMappingParser.java
index 40b9cf84ca..40b9cf84ca 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/TypeMappingParser.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/TypeMappingParser.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/UnknownAccessCodeException.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/UnknownAccessCodeException.java
index b7f1c0a7ec..b7f1c0a7ec 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/UnknownAccessCodeException.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/UnknownAccessCodeException.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/UnknownBrokerException.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/UnknownBrokerException.java
index 5b08e09c24..5b08e09c24 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/UnknownBrokerException.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/UnknownBrokerException.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/configuration/UnknownTypeCodeException.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/UnknownTypeCodeException.java
index 57005d21e5..57005d21e5 100644
--- a/java/client/src/main/java/org/apache/qpid/management/configuration/UnknownTypeCodeException.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/UnknownTypeCodeException.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/handler/base/BaseMessageHandler.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/BaseMessageHandler.java
index 798e835ff4..798e835ff4 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/handler/base/BaseMessageHandler.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/BaseMessageHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandler.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandler.java
index 21a3281fa9..21a3281fa9 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandler.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/handler/base/IMessageHandler.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/IMessageHandler.java
index b945a29117..b945a29117 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/handler/base/IMessageHandler.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/IMessageHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/ConfigurationMessageHandler.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/ConfigurationMessageHandler.java
index a5f8c238a7..a5f8c238a7 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/ConfigurationMessageHandler.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/ConfigurationMessageHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/InstrumentationMessageHandler.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/InstrumentationMessageHandler.java
index ee6d1f0092..ee6d1f0092 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/InstrumentationMessageHandler.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/InstrumentationMessageHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/MethodOrEventDataTransferObject.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/MethodOrEventDataTransferObject.java
index bc6a77d804..bc6a77d804 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/MethodOrEventDataTransferObject.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/MethodOrEventDataTransferObject.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/MethodResponseMessageHandler.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/MethodResponseMessageHandler.java
index 24db2e963d..24db2e963d 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/MethodResponseMessageHandler.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/MethodResponseMessageHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java
index 497e264581..497e264581 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/AccessMode.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/AccessMode.java
index 6d1426c122..6d1426c122 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/AccessMode.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/AccessMode.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/Direction.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/Direction.java
index 8166c35eb6..8166c35eb6 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/Direction.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/Direction.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/DomainModel.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/DomainModel.java
index b24228d122..b24228d122 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/DomainModel.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/DomainModel.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/IValidator.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/IValidator.java
index 1ede559145..1ede559145 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/IValidator.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/IValidator.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/JmxService.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/JmxService.java
index 9ca6ba0e7c..9ca6ba0e7c 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/JmxService.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/JmxService.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/MissingFeatureAttributesException.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/MissingFeatureAttributesException.java
index 160054059b..160054059b 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/MissingFeatureAttributesException.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/MissingFeatureAttributesException.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidArgument.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidArgument.java
index e38ad4cee0..e38ad4cee0 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidArgument.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidArgument.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidAttribute.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidAttribute.java
index d0bc470de9..d0bc470de9 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidAttribute.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidAttribute.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidClass.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidClass.java
index 262e17db9a..262e17db9a 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidClass.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidClass.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidEvent.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidEvent.java
index 200791bb93..200791bb93 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidEvent.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidEvent.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidFeature.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidFeature.java
index 5fccb0a858..5fccb0a858 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidFeature.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidFeature.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidFeatureBuilder.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidFeatureBuilder.java
index 4bac16452c..4bac16452c 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidFeatureBuilder.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidFeatureBuilder.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidMethod.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidMethod.java
index 4d4918e45f..4d4918e45f 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidMethod.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidMethod.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidPackage.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidPackage.java
index 524121afe5..524121afe5 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidPackage.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidPackage.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidProperty.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidProperty.java
index 8b2544af1c..8b2544af1c 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidProperty.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidProperty.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidStatistic.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidStatistic.java
index 37a652c098..37a652c098 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/QpidStatistic.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidStatistic.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/UnableToBuildFeatureException.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/UnableToBuildFeatureException.java
index 59721240d0..59721240d0 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/UnableToBuildFeatureException.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/UnableToBuildFeatureException.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/ValidationException.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/ValidationException.java
index 3b117e5b9d..3b117e5b9d 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/ValidationException.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/ValidationException.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/AbsTime.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/AbsTime.java
index 27bfa62e2b..27bfa62e2b 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/AbsTime.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/AbsTime.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java
index d6d25534d8..d6d25534d8 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Boolean.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Boolean.java
index 89867bd4c4..89867bd4c4 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Boolean.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Boolean.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/DeltaTime.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/DeltaTime.java
index 85724f34c8..85724f34c8 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/DeltaTime.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/DeltaTime.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Map.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Map.java
index f7d6101d3f..f7d6101d3f 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Map.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Map.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/ObjectReference.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/ObjectReference.java
index 784571e0c0..784571e0c0 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/ObjectReference.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/ObjectReference.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Str16.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Str16.java
index 7ab1c667f0..7ab1c667f0 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Str16.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Str16.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Str8.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Str8.java
index f8f48bc8ec..f8f48bc8ec 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Str8.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Str8.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java
index 786f8d9957..786f8d9957 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint16.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint16.java
index 31aeab954d..31aeab954d 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint16.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint16.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint32.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint32.java
index deb9772953..deb9772953 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint32.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint32.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint64.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint64.java
index 9d414cf225..9d414cf225 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint64.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint64.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint8.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint8.java
index 681537c48f..681537c48f 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint8.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint8.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Uuid.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uuid.java
index 74e0337173..74e0337173 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/model/type/Uuid.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uuid.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/services/BrokerMessageListener.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/BrokerMessageListener.java
index d5fdce09fc..d5fdce09fc 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/services/BrokerMessageListener.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/BrokerMessageListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/services/ManagementClient.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/ManagementClient.java
index b2f1b19a6c..b2f1b19a6c 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/services/ManagementClient.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/ManagementClient.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/services/QMan.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QMan.java
index 00dbec261d..00dbec261d 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/services/QMan.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QMan.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/services/QpidService.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QpidService.java
index 92689eba52..92689eba52 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/services/QpidService.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QpidService.java
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/services/StartupFailureException.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/StartupFailureException.java
index 9da8832624..9da8832624 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/services/StartupFailureException.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/StartupFailureException.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/TestConstants.java b/java/management/client/src/test/java/org/apache/qpid/management/TestConstants.java
index 1ed938d9fd..1ed938d9fd 100644
--- a/java/client/src/test/java/org/apache/qpid/management/TestConstants.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/TestConstants.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/configuration/AccessModeMappingTest.java b/java/management/client/src/test/java/org/apache/qpid/management/configuration/AccessModeMappingTest.java
index 4c53c3d428..4c53c3d428 100644
--- a/java/client/src/test/java/org/apache/qpid/management/configuration/AccessModeMappingTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/configuration/AccessModeMappingTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java b/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java
index c948db59bf..c948db59bf 100644
--- a/java/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/configuration/ConfiguratorTest.java b/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfiguratorTest.java
index c3fa0c13f3..c3fa0c13f3 100644
--- a/java/client/src/test/java/org/apache/qpid/management/configuration/ConfiguratorTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfiguratorTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/configuration/MappingParsersTest.java b/java/management/client/src/test/java/org/apache/qpid/management/configuration/MappingParsersTest.java
index 9755c62991..9755c62991 100644
--- a/java/client/src/test/java/org/apache/qpid/management/configuration/MappingParsersTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/configuration/MappingParsersTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/configuration/StubConfigurator.java b/java/management/client/src/test/java/org/apache/qpid/management/configuration/StubConfigurator.java
index 6d92e3b6f8..6d92e3b6f8 100644
--- a/java/client/src/test/java/org/apache/qpid/management/configuration/StubConfigurator.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/configuration/StubConfigurator.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/configuration/TypeMappingTest.java b/java/management/client/src/test/java/org/apache/qpid/management/configuration/TypeMappingTest.java
index bf44608c0e..bf44608c0e 100644
--- a/java/client/src/test/java/org/apache/qpid/management/configuration/TypeMappingTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/configuration/TypeMappingTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandlerTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandlerTest.java
index 6be4484f5c..6be4484f5c 100644
--- a/java/client/src/test/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandlerTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandlerTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java
index 0c67811621..0c67811621 100644
--- a/java/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/domain/model/BaseQpidFeatureBuilderTestCase.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseQpidFeatureBuilderTestCase.java
index 43793e588a..43793e588a 100644
--- a/java/client/src/test/java/org/apache/qpid/management/domain/model/BaseQpidFeatureBuilderTestCase.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseQpidFeatureBuilderTestCase.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/domain/model/DomainModelTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/DomainModelTest.java
index 185302c182..185302c182 100644
--- a/java/client/src/test/java/org/apache/qpid/management/domain/model/DomainModelTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/DomainModelTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java
index a4e1e24ff3..a4e1e24ff3 100644
--- a/java/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/domain/model/QpidMethodBuilderTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidMethodBuilderTest.java
index 6032721d1b..6032721d1b 100644
--- a/java/client/src/test/java/org/apache/qpid/management/domain/model/QpidMethodBuilderTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidMethodBuilderTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/domain/model/QpidNumberPropertyTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidNumberPropertyTest.java
index 2611923f71..2611923f71 100644
--- a/java/client/src/test/java/org/apache/qpid/management/domain/model/QpidNumberPropertyTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidNumberPropertyTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/domain/model/QpidPackageTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidPackageTest.java
index 530b526bec..530b526bec 100644
--- a/java/client/src/test/java/org/apache/qpid/management/domain/model/QpidPackageTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidPackageTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/domain/model/QpidPropertyBuilderTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidPropertyBuilderTest.java
index 4ac399def0..4ac399def0 100644
--- a/java/client/src/test/java/org/apache/qpid/management/domain/model/QpidPropertyBuilderTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidPropertyBuilderTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/domain/model/QpidStatisticBuilderTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStatisticBuilderTest.java
index 7f4cf72895..7f4cf72895 100644
--- a/java/client/src/test/java/org/apache/qpid/management/domain/model/QpidStatisticBuilderTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStatisticBuilderTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/domain/model/QpidStringPropertyTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStringPropertyTest.java
index 263e4209a6..263e4209a6 100644
--- a/java/client/src/test/java/org/apache/qpid/management/domain/model/QpidStringPropertyTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStringPropertyTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/management/domain/model/type/BinaryTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/type/BinaryTest.java
index 6636c08710..6636c08710 100644
--- a/java/client/src/test/java/org/apache/qpid/management/domain/model/type/BinaryTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/type/BinaryTest.java