Rename directories to replace 'cougar' with 'disco'

betfair · Oct 17, 2017 · 5abab52 · 5abab52
1 parent c178b31
commit 5abab52
Show file tree

Hide file tree

Showing 2,199 changed files with 0 additions and 0 deletions.
diff --git a/...gar/baseline/BannedIPListInterceptor.java → ...sco/baseline/BannedIPListInterceptor.java b/...gar/baseline/BannedIPListInterceptor.java → ...sco/baseline/BannedIPListInterceptor.java
diff --git a/...cougar/baseline/BaselineLogExtension.java → .../disco/baseline/BaselineLogExtension.java b/...cougar/baseline/BaselineLogExtension.java → .../disco/baseline/BaselineLogExtension.java
diff --git a/.../cougar/baseline/BaselineServiceImpl.java → ...r/disco/baseline/BaselineServiceImpl.java b/.../cougar/baseline/BaselineServiceImpl.java → ...r/disco/baseline/BaselineServiceImpl.java
diff --git a/.../CheckedExceptionPostProcInterceptor.java → .../CheckedExceptionPostProcInterceptor.java b/.../CheckedExceptionPostProcInterceptor.java → .../CheckedExceptionPostProcInterceptor.java
diff --git a/...e/CheckedExceptionPreProcInterceptor.java → ...e/CheckedExceptionPreProcInterceptor.java b/...e/CheckedExceptionPreProcInterceptor.java → ...e/CheckedExceptionPreProcInterceptor.java
diff --git a/...pOperationResponseObjectDelegateImpl.java → ...pOperationResponseObjectDelegateImpl.java b/...pOperationResponseObjectDelegateImpl.java → ...pOperationResponseObjectDelegateImpl.java
diff --git a/...baseline/ConnectedObjectTestingUtils.java → ...baseline/ConnectedObjectTestingUtils.java b/...baseline/ConnectedObjectTestingUtils.java → ...baseline/ConnectedObjectTestingUtils.java
diff --git a/...air/cougar/baseline/LoggedAsyncEvent.java → ...fair/disco/baseline/LoggedAsyncEvent.java b/...air/cougar/baseline/LoggedAsyncEvent.java → ...fair/disco/baseline/LoggedAsyncEvent.java
diff --git a/.../baseline/SimpleResponseDelegateImpl.java → .../baseline/SimpleResponseDelegateImpl.java b/.../baseline/SimpleResponseDelegateImpl.java → .../baseline/SimpleResponseDelegateImpl.java
diff --git a/...seline/SomeComplexObjectDelegateImpl.java → ...seline/SomeComplexObjectDelegateImpl.java b/...seline/SomeComplexObjectDelegateImpl.java → ...seline/SomeComplexObjectDelegateImpl.java
diff --git a/...ougar/baseline/domain/SimpleCache1DO.java → ...disco/baseline/domain/SimpleCache1DO.java b/...ougar/baseline/domain/SimpleCache1DO.java → ...disco/baseline/domain/SimpleCache1DO.java
diff --git a/...ougar/baseline/domain/SimpleCache2DO.java → ...disco/baseline/domain/SimpleCache2DO.java b/...ougar/baseline/domain/SimpleCache2DO.java → ...disco/baseline/domain/SimpleCache2DO.java
diff --git a/...cougar/baseline/domain/SimpleCacheDO.java → .../disco/baseline/domain/SimpleCacheDO.java b/...cougar/baseline/domain/SimpleCacheDO.java → .../disco/baseline/domain/SimpleCacheDO.java
diff --git a/...fair/cougar/baseline/domain/SimpleDO.java → ...tfair/disco/baseline/domain/SimpleDO.java b/...fair/cougar/baseline/domain/SimpleDO.java → ...tfair/disco/baseline/domain/SimpleDO.java
diff --git a/...cation/SimpleInferredCountryResolver.java → ...cation/SimpleInferredCountryResolver.java b/...cation/SimpleInferredCountryResolver.java → ...cation/SimpleInferredCountryResolver.java
diff --git a/...rnativeRescriptIdentityTokenResolver.java → ...rnativeRescriptIdentityTokenResolver.java b/...rnativeRescriptIdentityTokenResolver.java → ...rnativeRescriptIdentityTokenResolver.java
diff --git a/...lineAsyncClientIdentityTokenResolver.java → ...lineAsyncClientIdentityTokenResolver.java b/...lineAsyncClientIdentityTokenResolver.java → ...lineAsyncClientIdentityTokenResolver.java
diff --git a/.../BaselineClientIdentityTokenResolver.java → .../BaselineClientIdentityTokenResolver.java b/.../BaselineClientIdentityTokenResolver.java → .../BaselineClientIdentityTokenResolver.java
diff --git a/...ine/security/GeneralIdentityResolver.java → ...ine/security/GeneralIdentityResolver.java b/...ine/security/GeneralIdentityResolver.java → ...ine/security/GeneralIdentityResolver.java
diff --git a/.../security/HttpCookieIdentityResolver.java → .../security/HttpCookieIdentityResolver.java b/.../security/HttpCookieIdentityResolver.java → .../security/HttpCookieIdentityResolver.java
diff --git a/...ine/security/SimpleIdentityTokenName.java → ...ine/security/SimpleIdentityTokenName.java b/...ine/security/SimpleIdentityTokenName.java → ...ine/security/SimpleIdentityTokenName.java
diff --git a/.../SimpleRescriptIdentityTokenResolver.java → .../SimpleRescriptIdentityTokenResolver.java b/.../SimpleRescriptIdentityTokenResolver.java → .../SimpleRescriptIdentityTokenResolver.java
diff --git a/...rity/SimpleSoapIdentityTokenResolver.java → ...rity/SimpleSoapIdentityTokenResolver.java b/...rity/SimpleSoapIdentityTokenResolver.java → ...rity/SimpleSoapIdentityTokenResolver.java
diff --git a/cougar-codegen-plugin/pom.xml → disco-codegen-plugin/pom.xml b/cougar-codegen-plugin/pom.xml → disco-codegen-plugin/pom.xml
diff --git a/...tfair/cougar/codegen/DocumentMangler.java → ...etfair/disco/codegen/DocumentMangler.java b/...tfair/cougar/codegen/DocumentMangler.java → ...etfair/disco/codegen/DocumentMangler.java
diff --git a/.../com/betfair/cougar/codegen/DomUtils.java → ...a/com/betfair/disco/codegen/DomUtils.java b/.../com/betfair/cougar/codegen/DomUtils.java → ...a/com/betfair/disco/codegen/DomUtils.java
diff --git a/...r/cougar/codegen/ExposedIDDGenerator.java → ...ir/disco/codegen/ExposedIDDGenerator.java b/...r/cougar/codegen/ExposedIDDGenerator.java → ...ir/disco/codegen/ExposedIDDGenerator.java
diff --git a/.../com/betfair/cougar/codegen/FileUtil.java → ...a/com/betfair/disco/codegen/FileUtil.java b/.../com/betfair/cougar/codegen/FileUtil.java → ...a/com/betfair/disco/codegen/FileUtil.java
diff --git a/...com/betfair/cougar/codegen/IDLReader.java → .../com/betfair/disco/codegen/IDLReader.java b/...com/betfair/cougar/codegen/IDLReader.java → .../com/betfair/disco/codegen/IDLReader.java
diff --git a/...m/betfair/cougar/codegen/IdlToDSMojo.java → ...om/betfair/disco/codegen/IdlToDSMojo.java b/...m/betfair/cougar/codegen/IdlToDSMojo.java → ...om/betfair/disco/codegen/IdlToDSMojo.java
diff --git a/.../betfair/cougar/codegen/NodeExcluder.java → ...m/betfair/disco/codegen/NodeExcluder.java b/.../betfair/cougar/codegen/NodeExcluder.java → ...m/betfair/disco/codegen/NodeExcluder.java
diff --git a/...a/com/betfair/cougar/codegen/Service.java → ...va/com/betfair/disco/codegen/Service.java b/...a/com/betfair/cougar/codegen/Service.java → ...va/com/betfair/disco/codegen/Service.java
diff --git a/...etfair/cougar/codegen/Transformation.java → ...betfair/disco/codegen/Transformation.java b/...etfair/cougar/codegen/Transformation.java → ...betfair/disco/codegen/Transformation.java
diff --git a/...tfair/cougar/codegen/Transformations.java → ...etfair/disco/codegen/Transformations.java b/...tfair/cougar/codegen/Transformations.java → ...etfair/disco/codegen/Transformations.java
diff --git a/...r/cougar/codegen/ValidationException.java → ...ir/disco/codegen/ValidationException.java b/...r/cougar/codegen/ValidationException.java → ...ir/disco/codegen/ValidationException.java
diff --git a/...com/betfair/cougar/codegen/Validator.java → .../com/betfair/disco/codegen/Validator.java b/...com/betfair/cougar/codegen/Validator.java → .../com/betfair/disco/codegen/Validator.java
diff --git a/.../betfair/cougar/codegen/XmlGenerator.java → ...m/betfair/disco/codegen/XmlGenerator.java b/.../betfair/cougar/codegen/XmlGenerator.java → ...m/betfair/disco/codegen/XmlGenerator.java
diff --git a/...a/com/betfair/cougar/codegen/XmlUtil.java → ...va/com/betfair/disco/codegen/XmlUtil.java b/...a/com/betfair/cougar/codegen/XmlUtil.java → ...va/com/betfair/disco/codegen/XmlUtil.java
diff --git a/.../betfair/cougar/codegen/XmlValidator.java → ...m/betfair/disco/codegen/XmlValidator.java b/.../betfair/cougar/codegen/XmlValidator.java → ...m/betfair/disco/codegen/XmlValidator.java
diff --git a/...ougar/codegen/except/PluginException.java → ...disco/codegen/except/PluginException.java b/...ougar/codegen/except/PluginException.java → ...disco/codegen/except/PluginException.java
diff --git a/.../resolver/DefaultSchemaCatalogSource.java → .../resolver/DefaultSchemaCatalogSource.java b/.../resolver/DefaultSchemaCatalogSource.java → .../resolver/DefaultSchemaCatalogSource.java
diff --git a/...odegen/resolver/InterceptingResolver.java → ...odegen/resolver/InterceptingResolver.java b/...odegen/resolver/InterceptingResolver.java → ...odegen/resolver/InterceptingResolver.java
diff --git a/...codegen/resolver/SchemaCatalogSource.java → ...codegen/resolver/SchemaCatalogSource.java b/...codegen/resolver/SchemaCatalogSource.java → ...codegen/resolver/SchemaCatalogSource.java
diff --git a/...ugar/codegen/resource/ResourceLoader.java → ...isco/codegen/resource/ResourceLoader.java b/...ugar/codegen/resource/ResourceLoader.java → ...isco/codegen/resource/ResourceLoader.java
diff --git a/.../transformations/AbstractTransformer.java → .../transformations/AbstractTransformer.java b/.../transformations/AbstractTransformer.java → .../transformations/AbstractTransformer.java
diff --git a/...ransformations/CougarTransformations.java → ...ransformations/CougarTransformations.java b/...ransformations/CougarTransformations.java → ...ransformations/CougarTransformations.java
diff --git a/.../betfair/cougar/transformations/Main.java → ...m/betfair/disco/transformations/Main.java b/.../betfair/cougar/transformations/Main.java → ...m/betfair/disco/transformations/Main.java
diff --git a/...sformations/manglers/AbstractMangler.java → ...sformations/manglers/AbstractMangler.java b/...sformations/manglers/AbstractMangler.java → ...sformations/manglers/AbstractMangler.java
diff --git a/...rmations/manglers/CommonTypesMangler.java → ...rmations/manglers/CommonTypesMangler.java b/...rmations/manglers/CommonTypesMangler.java → ...rmations/manglers/CommonTypesMangler.java
diff --git a/...lers/ResponseToSimpleResponseMangler.java → ...lers/ResponseToSimpleResponseMangler.java b/...lers/ResponseToSimpleResponseMangler.java → ...lers/ResponseToSimpleResponseMangler.java
diff --git a/...ormations/manglers/SimpleTypeMangler.java → ...ormations/manglers/SimpleTypeMangler.java b/...ormations/manglers/SimpleTypeMangler.java → ...ormations/manglers/SimpleTypeMangler.java
diff --git a/...mations/validators/AbstractValidator.java → ...mations/validators/AbstractValidator.java b/...mations/validators/AbstractValidator.java → ...mations/validators/AbstractValidator.java
diff --git a/...mations/validators/DataTypeValidator.java → ...mations/validators/DataTypeValidator.java b/...mations/validators/DataTypeValidator.java → ...mations/validators/DataTypeValidator.java
diff --git a/...ations/validators/ExceptionValidator.java → ...ations/validators/ExceptionValidator.java b/...ations/validators/ExceptionValidator.java → ...ations/validators/ExceptionValidator.java
diff --git a/...validators/InterfaceVersionValidator.java → ...validators/InterfaceVersionValidator.java b/...validators/InterfaceVersionValidator.java → ...validators/InterfaceVersionValidator.java
diff --git a/...sformations/validators/MapsValidator.java → ...sformations/validators/MapsValidator.java b/...sformations/validators/MapsValidator.java → ...sformations/validators/MapsValidator.java
diff --git a/...ations/validators/NameClashValidator.java → ...ations/validators/NameClashValidator.java b/...ations/validators/NameClashValidator.java → ...ations/validators/NameClashValidator.java
diff --git a/...ations/validators/OperationValidator.java → ...ations/validators/OperationValidator.java b/...ations/validators/OperationValidator.java → ...ations/validators/OperationValidator.java
diff --git a/...ns/validators/ParameterNameValidator.java → ...ns/validators/ParameterNameValidator.java b/...ns/validators/ParameterNameValidator.java → ...ns/validators/ParameterNameValidator.java
diff --git a/...validators/RequestParameterValidator.java → ...validators/RequestParameterValidator.java b/...validators/RequestParameterValidator.java → ...validators/RequestParameterValidator.java
diff --git a/.../validators/UnknownDataTypeValidator.java → .../validators/UnknownDataTypeValidator.java b/.../validators/UnknownDataTypeValidator.java → .../validators/UnknownDataTypeValidator.java
diff --git a/...ions/validators/ValidValuesValidator.java → ...ions/validators/ValidValuesValidator.java b/...ions/validators/ValidValuesValidator.java → ...ions/validators/ValidValuesValidator.java
diff --git a/.../src/main/resources/bsidl/iddstripper.xsl → .../src/main/resources/bsidl/iddstripper.xsl b/.../src/main/resources/bsidl/iddstripper.xsl → .../src/main/resources/bsidl/iddstripper.xsl
diff --git a/...c/main/resources/bsidl/v4_0/Interface.xsd → ...c/main/resources/bsidl/v4_0/Interface.xsd b/...c/main/resources/bsidl/v4_0/Interface.xsd → ...c/main/resources/bsidl/v4_0/Interface.xsd
diff --git a/.../src/main/resources/bsidl/v4_0/common.xsd → .../src/main/resources/bsidl/v4_0/common.xsd b/.../src/main/resources/bsidl/v4_0/common.xsd → .../src/main/resources/bsidl/v4_0/common.xsd
diff --git a/...rc/main/resources/bsidl/v4_0/dataType.xsd → ...rc/main/resources/bsidl/v4_0/dataType.xsd b/...rc/main/resources/bsidl/v4_0/dataType.xsd → ...rc/main/resources/bsidl/v4_0/dataType.xsd
diff --git a/...c/main/resources/bsidl/v4_0/eventType.xsd → ...c/main/resources/bsidl/v4_0/eventType.xsd b/...c/main/resources/bsidl/v4_0/eventType.xsd → ...c/main/resources/bsidl/v4_0/eventType.xsd
diff --git a/...in/resources/bsidl/v4_0/exceptionType.xsd → ...in/resources/bsidl/v4_0/exceptionType.xsd b/...in/resources/bsidl/v4_0/exceptionType.xsd → ...in/resources/bsidl/v4_0/exceptionType.xsd
diff --git a/...gen-plugin/src/main/resources/catalog.xml → ...gen-plugin/src/main/resources/catalog.xml b/...gen-plugin/src/main/resources/catalog.xml → ...gen-plugin/src/main/resources/catalog.xml
diff --git a/...tes/SOAP/soapServiceBindingDescriptor.ftl → ...tes/SOAP/soapServiceBindingDescriptor.ftl b/...tes/SOAP/soapServiceBindingDescriptor.ftl → ...tes/SOAP/soapServiceBindingDescriptor.ftl
diff --git a/...urces/templates/asyncServiceInterface.ftl → ...urces/templates/asyncServiceInterface.ftl b/...urces/templates/asyncServiceInterface.ftl → ...urces/templates/asyncServiceInterface.ftl
diff --git a/.../main/resources/templates/client-impl.ftl → .../main/resources/templates/client-impl.ftl b/.../main/resources/templates/client-impl.ftl → .../main/resources/templates/client-impl.ftl
diff --git a/...n/src/main/resources/templates/client.ftl → ...n/src/main/resources/templates/client.ftl b/...n/src/main/resources/templates/client.ftl → ...n/src/main/resources/templates/client.ftl
diff --git a/...ces/templates/clientConnectedDataType.ftl → ...ces/templates/clientConnectedDataType.ftl b/...ces/templates/clientConnectedDataType.ftl → ...ces/templates/clientConnectedDataType.ftl
diff --git a/...es/templates/clientExecutableResolver.ftl → ...es/templates/clientExecutableResolver.ftl b/...es/templates/clientExecutableResolver.ftl → ...es/templates/clientExecutableResolver.ftl
diff --git a/...ain/resources/templates/clientFactory.ftl → ...ain/resources/templates/clientFactory.ftl b/...ain/resources/templates/clientFactory.ftl → ...ain/resources/templates/clientFactory.ftl
diff --git a/...urces/templates/clientSyncServiceImpl.ftl → ...urces/templates/clientSyncServiceImpl.ftl b/...urces/templates/clientSyncServiceImpl.ftl → ...urces/templates/clientSyncServiceImpl.ftl
diff --git a/.../templates/clientSyncServiceInterface.ftl → .../templates/clientSyncServiceInterface.ftl b/.../templates/clientSyncServiceInterface.ftl → .../templates/clientSyncServiceInterface.ftl
diff --git a/.../main/resources/templates/collections.ftl → .../main/resources/templates/collections.ftl b/.../main/resources/templates/collections.ftl → .../main/resources/templates/collections.ftl
diff --git a/...n/src/main/resources/templates/common.ftl → ...n/src/main/resources/templates/common.ftl b/...n/src/main/resources/templates/common.ftl → ...n/src/main/resources/templates/common.ftl
diff --git a/...resources/templates/connectedDataType.ftl → ...resources/templates/connectedDataType.ftl b/...resources/templates/connectedDataType.ftl → ...resources/templates/connectedDataType.ftl
diff --git a/...src/main/resources/templates/dataType.ftl → ...src/main/resources/templates/dataType.ftl b/...src/main/resources/templates/dataType.ftl → ...src/main/resources/templates/dataType.ftl
diff --git a/...n/resources/templates/dataTypeBuilder.ftl → ...n/resources/templates/dataTypeBuilder.ftl b/...n/resources/templates/dataTypeBuilder.ftl → ...n/resources/templates/dataTypeBuilder.ftl
diff --git a/.../resources/templates/dataTypeDelegate.ftl → .../resources/templates/dataTypeDelegate.ftl b/.../resources/templates/dataTypeDelegate.ftl → .../resources/templates/dataTypeDelegate.ftl
diff --git a/...gin/src/main/resources/templates/enum.ftl → ...gin/src/main/resources/templates/enum.ftl b/...gin/src/main/resources/templates/enum.ftl → ...gin/src/main/resources/templates/enum.ftl
diff --git a/...in/resources/templates/eventInterface.ftl → ...in/resources/templates/eventInterface.ftl b/...in/resources/templates/eventInterface.ftl → ...in/resources/templates/eventInterface.ftl
diff --git a/...main/resources/templates/events/event.ftl → ...main/resources/templates/events/event.ftl b/...main/resources/templates/events/event.ftl → ...main/resources/templates/events/event.ftl
diff --git a/...es/events/jmsServiceBindingDescriptor.ftl → ...es/events/jmsServiceBindingDescriptor.ftl b/...es/events/jmsServiceBindingDescriptor.ftl → ...es/events/jmsServiceBindingDescriptor.ftl
diff --git a/...rc/main/resources/templates/exception.ftl → ...rc/main/resources/templates/exception.ftl b/...rc/main/resources/templates/exception.ftl → ...rc/main/resources/templates/exception.ftl
diff --git a/...ain/resources/templates/exceptionBase.ftl → ...ain/resources/templates/exceptionBase.ftl b/...ain/resources/templates/exceptionBase.ftl → ...ain/resources/templates/exceptionBase.ftl
diff --git a/...ain/resources/templates/exceptionCode.ftl → ...ain/resources/templates/exceptionCode.ftl b/...ain/resources/templates/exceptionCode.ftl → ...ain/resources/templates/exceptionCode.ftl
diff --git a/.../resources/templates/exceptionFactory.ftl → .../resources/templates/exceptionFactory.ftl b/.../resources/templates/exceptionFactory.ftl → .../resources/templates/exceptionFactory.ftl
diff --git a/...n/resources/templates/exceptionLegacy.ftl → ...n/resources/templates/exceptionLegacy.ftl b/...n/resources/templates/exceptionLegacy.ftl → ...n/resources/templates/exceptionLegacy.ftl
diff --git a/...src/main/resources/templates/external.ftl → ...src/main/resources/templates/external.ftl b/...src/main/resources/templates/external.ftl → ...src/main/resources/templates/external.ftl
diff --git a/...in/src/main/resources/templates/index.ftl → ...in/src/main/resources/templates/index.ftl b/...in/src/main/resources/templates/index.ftl → ...in/src/main/resources/templates/index.ftl
diff --git a/...rc/main/resources/templates/interface.ftl → ...rc/main/resources/templates/interface.ftl b/...rc/main/resources/templates/interface.ftl → ...rc/main/resources/templates/interface.ftl
diff --git a/...n/resources/templates/interfaceParser.ftl → ...n/resources/templates/interfaceParser.ftl b/...n/resources/templates/interfaceParser.ftl → ...n/resources/templates/interfaceParser.ftl
diff --git a/...onrpc/jsonRpcServiceBindingDescriptor.ftl → ...onrpc/jsonRpcServiceBindingDescriptor.ftl b/...onrpc/jsonRpcServiceBindingDescriptor.ftl → ...onrpc/jsonRpcServiceBindingDescriptor.ftl
diff --git a/...c/main/resources/templates/mapAdapter.ftl → ...c/main/resources/templates/mapAdapter.ftl b/...c/main/resources/templates/mapAdapter.ftl → ...c/main/resources/templates/mapAdapter.ftl
diff --git a/...esources/templates/registrationHelper.ftl → ...esources/templates/registrationHelper.ftl b/...esources/templates/registrationHelper.ftl → ...esources/templates/registrationHelper.ftl
diff --git a/...es/templates/rescript/requestDataType.ftl → ...es/templates/rescript/requestDataType.ftl b/...es/templates/rescript/requestDataType.ftl → ...es/templates/rescript/requestDataType.ftl
diff --git a/...ript/rescriptServiceBindingDescriptor.ftl → ...ript/rescriptServiceBindingDescriptor.ftl b/...ript/rescriptServiceBindingDescriptor.ftl → ...ript/rescriptServiceBindingDescriptor.ftl
diff --git a/...s/templates/rescript/responseDataType.ftl → ...s/templates/rescript/responseDataType.ftl b/...s/templates/rescript/responseDataType.ftl → ...s/templates/rescript/responseDataType.ftl
diff --git a/...ces/templates/serverConnectedDataType.ftl → ...ces/templates/serverConnectedDataType.ftl b/...ces/templates/serverConnectedDataType.ftl → ...ces/templates/serverConnectedDataType.ftl
diff --git a/...resources/templates/serviceDefinition.ftl → ...resources/templates/serviceDefinition.ftl b/...resources/templates/serviceDefinition.ftl → ...resources/templates/serviceDefinition.ftl
diff --git a/...s/templates/serviceExecutableResolver.ftl → ...s/templates/serviceExecutableResolver.ftl b/...s/templates/serviceExecutableResolver.ftl → ...s/templates/serviceExecutableResolver.ftl
diff --git a/...in/resources/templates/simpleTypeEnum.ftl → ...in/resources/templates/simpleTypeEnum.ftl b/...in/resources/templates/simpleTypeEnum.ftl → ...in/resources/templates/simpleTypeEnum.ftl
diff --git a/...socket/socketServiceBindingDescriptor.ftl → ...socket/socketServiceBindingDescriptor.ftl b/...socket/socketServiceBindingDescriptor.ftl → ...socket/socketServiceBindingDescriptor.ftl
diff --git a/...mplates/syncServiceExecutableResolver.ftl → ...mplates/syncServiceExecutableResolver.ftl b/...mplates/syncServiceExecutableResolver.ftl → ...mplates/syncServiceExecutableResolver.ftl
diff --git a/.../resources/templates/wrappedValueEnum.ftl → .../resources/templates/wrappedValueEnum.ftl b/.../resources/templates/wrappedValueEnum.ftl → .../resources/templates/wrappedValueEnum.ftl
diff --git a/...lugin/src/main/resources/w3/XMLSchema.dtd → ...lugin/src/main/resources/w3/XMLSchema.dtd b/...lugin/src/main/resources/w3/XMLSchema.dtd → ...lugin/src/main/resources/w3/XMLSchema.dtd
diff --git a/...lugin/src/main/resources/w3/datatypes.dtd → ...lugin/src/main/resources/w3/datatypes.dtd b/...lugin/src/main/resources/w3/datatypes.dtd → ...lugin/src/main/resources/w3/datatypes.dtd
diff --git a/...egen-plugin/src/main/resources/w3/xml.xsd → ...egen-plugin/src/main/resources/w3/xml.xsd b/...egen-plugin/src/main/resources/w3/xml.xsd → ...egen-plugin/src/main/resources/w3/xml.xsd
diff --git a/...in/src/main/resources/wsdl-xsl/README.txt → ...in/src/main/resources/wsdl-xsl/README.txt b/...in/src/main/resources/wsdl-xsl/README.txt → ...in/src/main/resources/wsdl-xsl/README.txt
diff --git a/...ugin/src/main/resources/wsdl-xsl/wsdl.xsl → ...ugin/src/main/resources/wsdl-xsl/wsdl.xsl b/...ugin/src/main/resources/wsdl-xsl/wsdl.xsl → ...ugin/src/main/resources/wsdl-xsl/wsdl.xsl
diff --git a/...plugin/src/main/resources/xsd-xsl/xsd.xsl → ...plugin/src/main/resources/xsd-xsl/xsd.xsl b/...plugin/src/main/resources/xsd-xsl/xsd.xsl → ...plugin/src/main/resources/xsd-xsl/xsd.xsl
diff --git a/...ava/com/betfair/cougar/codegen/Files.java → ...java/com/betfair/disco/codegen/Files.java b/...ava/com/betfair/cougar/codegen/Files.java → ...java/com/betfair/disco/codegen/Files.java
diff --git a/...tfair/cougar/codegen/IdlToDSMojoTest.java → ...etfair/disco/codegen/IdlToDSMojoTest.java b/...tfair/cougar/codegen/IdlToDSMojoTest.java → ...etfair/disco/codegen/IdlToDSMojoTest.java
diff --git a/...gar/codegen/InterceptingResolverTest.java → ...sco/codegen/InterceptingResolverTest.java b/...gar/codegen/InterceptingResolverTest.java → ...sco/codegen/InterceptingResolverTest.java
diff --git a/...codegen/TestExceptionMessageHandling.java → ...codegen/TestExceptionMessageHandling.java b/...codegen/TestExceptionMessageHandling.java → ...codegen/TestExceptionMessageHandling.java
diff --git a/...fair/cougar/codegen/XmlGeneratorTest.java → ...tfair/disco/codegen/XmlGeneratorTest.java b/...fair/cougar/codegen/XmlGeneratorTest.java → ...tfair/disco/codegen/XmlGeneratorTest.java
diff --git a/...fair/cougar/codegen/XmlValidatorTest.java → ...tfair/disco/codegen/XmlValidatorTest.java b/...fair/cougar/codegen/XmlValidatorTest.java → ...tfair/disco/codegen/XmlValidatorTest.java
diff --git a/...ugin/src/test/resources/BrokenService.xml → ...ugin/src/test/resources/BrokenService.xml b/...ugin/src/test/resources/BrokenService.xml → ...ugin/src/test/resources/BrokenService.xml
diff --git a/...n-plugin/src/test/resources/DataTypes.inc → ...n-plugin/src/test/resources/DataTypes.inc b/...n-plugin/src/test/resources/DataTypes.inc → ...n-plugin/src/test/resources/DataTypes.inc
diff --git a/...sageInExceptionTypeService-Extensions.xml → ...sageInExceptionTypeService-Extensions.xml b/...sageInExceptionTypeService-Extensions.xml → ...sageInExceptionTypeService-Extensions.xml
diff --git a/...sources/MessageInExceptionTypeService.xml → ...sources/MessageInExceptionTypeService.xml b/...sources/MessageInExceptionTypeService.xml → ...sources/MessageInExceptionTypeService.xml
diff --git a/...plugin/src/test/resources/SimpleTypes.inc → ...plugin/src/test/resources/SimpleTypes.inc b/...plugin/src/test/resources/SimpleTypes.inc → ...plugin/src/test/resources/SimpleTypes.inc
diff --git a/...lugin/src/test/resources/SomeService.wsdl → ...lugin/src/test/resources/SomeService.wsdl b/...lugin/src/test/resources/SomeService.wsdl → ...lugin/src/test/resources/SomeService.wsdl
diff --git a/...plugin/src/test/resources/SomeService.xml → ...plugin/src/test/resources/SomeService.xml b/...plugin/src/test/resources/SomeService.xml → ...plugin/src/test/resources/SomeService.xml
diff --git a/...gin/src/test/resources/SomeService3.3.xml → ...gin/src/test/resources/SomeService3.3.xml b/...gin/src/test/resources/SomeService3.3.xml → ...gin/src/test/resources/SomeService3.3.xml
diff --git a/...plugin/src/test/resources/iddstripper.xsl → ...plugin/src/test/resources/iddstripper.xsl b/...plugin/src/test/resources/iddstripper.xsl → ...plugin/src/test/resources/iddstripper.xsl
diff --git a/...n-plugin/src/test/resources/test-wsdl.xsl → ...n-plugin/src/test/resources/test-wsdl.xsl b/...n-plugin/src/test/resources/test-wsdl.xsl → ...n-plugin/src/test/resources/test-wsdl.xsl
diff --git a/cougar-framework/activemq-transport/pom.xml → disco-framework/activemq-transport/pom.xml b/cougar-framework/activemq-transport/pom.xml → disco-framework/activemq-transport/pom.xml
diff --git a/.../activemq/ActiveMQEventTransportImpl.java → .../activemq/ActiveMQEventTransportImpl.java b/.../activemq/ActiveMQEventTransportImpl.java → .../activemq/ActiveMQEventTransportImpl.java
diff --git a/...mq/ActiveMQSubscriptionEventListener.java → ...mq/ActiveMQSubscriptionEventListener.java b/...mq/ActiveMQSubscriptionEventListener.java → ...mq/ActiveMQSubscriptionEventListener.java
diff --git a/...monitoring/ManagedActiveMQConnection.java → ...monitoring/ManagedActiveMQConnection.java b/...monitoring/ManagedActiveMQConnection.java → ...monitoring/ManagedActiveMQConnection.java
diff --git a/...n/resources/conf/cougar-module-spring.xml → ...n/resources/conf/cougar-module-spring.xml b/...n/resources/conf/cougar-module-spring.xml → ...n/resources/conf/cougar-module-spring.xml
diff --git a/...ar-transport-activemq-defaults.properties → ...ar-transport-activemq-defaults.properties b/...ar-transport-activemq-defaults.properties → ...ar-transport-activemq-defaults.properties
diff --git a/...dule-config-cougar-transport-activemq.xml → ...dule-config-cougar-transport-activemq.xml b/...dule-config-cougar-transport-activemq.xml → ...dule-config-cougar-transport-activemq.xml
diff --git a/cougar-framework/cougar-api/pom.xml → disco-framework/disco-api/pom.xml b/cougar-framework/cougar-api/pom.xml → disco-framework/disco-api/pom.xml
diff --git a/.../betfair/cougar/api/ContainerContext.java → ...m/betfair/disco/api/ContainerContext.java b/.../betfair/cougar/api/ContainerContext.java → ...m/betfair/disco/api/ContainerContext.java
diff --git a/...ougar/api/DehydratedExecutionContext.java → ...disco/api/DehydratedExecutionContext.java b/...ougar/api/DehydratedExecutionContext.java → ...disco/api/DehydratedExecutionContext.java
diff --git a/.../com/betfair/cougar/api/EventHandler.java → ...a/com/betfair/disco/api/EventHandler.java b/.../com/betfair/cougar/api/EventHandler.java → ...a/com/betfair/disco/api/EventHandler.java
diff --git a/.../betfair/cougar/api/ExecutionContext.java → ...m/betfair/disco/api/ExecutionContext.java b/.../betfair/cougar/api/ExecutionContext.java → ...m/betfair/disco/api/ExecutionContext.java
diff --git a/...fair/cougar/api/ExecutionContextImpl.java → ...tfair/disco/api/ExecutionContextImpl.java b/...fair/cougar/api/ExecutionContextImpl.java → ...tfair/disco/api/ExecutionContextImpl.java
diff --git a/.../com/betfair/cougar/api/LogExtension.java → ...a/com/betfair/disco/api/LogExtension.java b/.../com/betfair/cougar/api/LogExtension.java → ...a/com/betfair/disco/api/LogExtension.java
diff --git a/...com/betfair/cougar/api/LoggableEvent.java → .../com/betfair/disco/api/LoggableEvent.java b/...com/betfair/cougar/api/LoggableEvent.java → .../com/betfair/disco/api/LoggableEvent.java
diff --git a/...om/betfair/cougar/api/RequestContext.java → ...com/betfair/disco/api/RequestContext.java b/...om/betfair/cougar/api/RequestContext.java → ...com/betfair/disco/api/RequestContext.java
diff --git a/...a/com/betfair/cougar/api/RequestUUID.java → ...va/com/betfair/disco/api/RequestUUID.java b/...a/com/betfair/cougar/api/RequestUUID.java → ...va/com/betfair/disco/api/RequestUUID.java
diff --git a/.../com/betfair/cougar/api/ResponseCode.java → ...a/com/betfair/disco/api/ResponseCode.java b/.../com/betfair/cougar/api/ResponseCode.java → ...a/com/betfair/disco/api/ResponseCode.java
diff --git a/...n/java/com/betfair/cougar/api/Result.java → ...in/java/com/betfair/disco/api/Result.java b/...n/java/com/betfair/cougar/api/Result.java → ...in/java/com/betfair/disco/api/Result.java
diff --git a/.../java/com/betfair/cougar/api/Service.java → ...n/java/com/betfair/disco/api/Service.java b/.../java/com/betfair/cougar/api/Service.java → ...n/java/com/betfair/disco/api/Service.java
diff --git a/...a/com/betfair/cougar/api/ServiceInfo.java → ...va/com/betfair/disco/api/ServiceInfo.java b/...a/com/betfair/cougar/api/ServiceInfo.java → ...va/com/betfair/disco/api/ServiceInfo.java
diff --git a/...com/betfair/cougar/api/UUIDGenerator.java → .../com/betfair/disco/api/UUIDGenerator.java b/...com/betfair/cougar/api/UUIDGenerator.java → .../com/betfair/disco/api/UUIDGenerator.java
diff --git a/...a/com/betfair/cougar/api/Validatable.java → ...va/com/betfair/disco/api/Validatable.java b/...a/com/betfair/cougar/api/Validatable.java → ...va/com/betfair/disco/api/Validatable.java
diff --git a/...air/cougar/api/annotations/BodyParam.java → ...fair/disco/api/annotations/BodyParam.java b/...air/cougar/api/annotations/BodyParam.java → ...fair/disco/api/annotations/BodyParam.java
diff --git a/...ir/cougar/api/annotations/IDLService.java → ...air/disco/api/annotations/IDLService.java b/...ir/cougar/api/annotations/IDLService.java → ...air/disco/api/annotations/IDLService.java
diff --git a/...air/cougar/api/annotations/Mandatory.java → ...fair/disco/api/annotations/Mandatory.java b/...air/cougar/api/annotations/Mandatory.java → ...fair/disco/api/annotations/Mandatory.java
diff --git a/...air/cougar/api/annotations/Operation.java → ...fair/disco/api/annotations/Operation.java b/...air/cougar/api/annotations/Operation.java → ...fair/disco/api/annotations/Operation.java
diff --git a/...m/betfair/cougar/api/export/Protocol.java → ...om/betfair/disco/api/export/Protocol.java b/...m/betfair/cougar/api/export/Protocol.java → ...om/betfair/disco/api/export/Protocol.java
diff --git a/...r/cougar/api/export/ProtocolParadigm.java → ...ir/disco/api/export/ProtocolParadigm.java b/...r/cougar/api/export/ProtocolParadigm.java → ...ir/disco/api/export/ProtocolParadigm.java
diff --git a/...r/cougar/api/export/ProtocolRegistry.java → ...ir/disco/api/export/ProtocolRegistry.java b/...r/cougar/api/export/ProtocolRegistry.java → ...ir/disco/api/export/ProtocolRegistry.java
diff --git a/...api/fault/CougarApplicationException.java → ...api/fault/CougarApplicationException.java b/...api/fault/CougarApplicationException.java → ...api/fault/CougarApplicationException.java
diff --git a/...m/betfair/cougar/api/fault/FaultCode.java → ...om/betfair/disco/api/fault/FaultCode.java b/...m/betfair/cougar/api/fault/FaultCode.java → ...om/betfair/disco/api/fault/FaultCode.java
diff --git a/...r/api/geolocation/GeoLocationDetails.java → ...o/api/geolocation/GeoLocationDetails.java b/...r/api/geolocation/GeoLocationDetails.java → ...o/api/geolocation/GeoLocationDetails.java
diff --git a/...tfair/cougar/api/security/Credential.java → ...etfair/disco/api/security/Credential.java b/...tfair/cougar/api/security/Credential.java → ...etfair/disco/api/security/Credential.java
diff --git a/...gar/api/security/CredentialFaultCode.java → ...sco/api/security/CredentialFaultCode.java b/...gar/api/security/CredentialFaultCode.java → ...sco/api/security/CredentialFaultCode.java
diff --git a/...betfair/cougar/api/security/Identity.java → .../betfair/disco/api/security/Identity.java b/...betfair/cougar/api/security/Identity.java → .../betfair/disco/api/security/Identity.java
diff --git a/...ir/cougar/api/security/IdentityChain.java → ...air/disco/api/security/IdentityChain.java b/...ir/cougar/api/security/IdentityChain.java → ...air/disco/api/security/IdentityChain.java
diff --git a/...cougar/api/security/IdentityResolver.java → .../disco/api/security/IdentityResolver.java b/...cougar/api/security/IdentityResolver.java → .../disco/api/security/IdentityResolver.java
diff --git a/...ir/cougar/api/security/IdentityToken.java → ...air/disco/api/security/IdentityToken.java b/...ir/cougar/api/security/IdentityToken.java → ...air/disco/api/security/IdentityToken.java
diff --git a/...r/api/security/IdentityTokenResolver.java → ...o/api/security/IdentityTokenResolver.java b/...r/api/security/IdentityTokenResolver.java → ...o/api/security/IdentityTokenResolver.java
diff --git a/...api/security/InferredCountryResolver.java → ...api/security/InferredCountryResolver.java b/...api/security/InferredCountryResolver.java → ...api/security/InferredCountryResolver.java
diff --git a/...security/InvalidCredentialsException.java → ...security/InvalidCredentialsException.java b/...security/InvalidCredentialsException.java → ...security/InvalidCredentialsException.java
diff --git a/...ir/cougar/api/security/TransportInfo.java → ...air/disco/api/security/TransportInfo.java b/...ir/cougar/api/security/TransportInfo.java → ...air/disco/api/security/TransportInfo.java
diff --git a/.../cougar/api/ExecutionContextImplTest.java → ...r/disco/api/ExecutionContextImplTest.java b/.../cougar/api/ExecutionContextImplTest.java → ...r/disco/api/ExecutionContextImplTest.java
diff --git a/cougar-framework/cougar-caching/pom.xml → disco-framework/disco-caching/pom.xml b/cougar-framework/cougar-caching/pom.xml → disco-framework/disco-caching/pom.xml
diff --git a/...ar/caching/CacheFrameworkIntegration.java → ...co/caching/CacheFrameworkIntegration.java b/...ar/caching/CacheFrameworkIntegration.java → ...co/caching/CacheFrameworkIntegration.java
diff --git a/...gar/caching/CacheFrameworkRegisterer.java → ...sco/caching/CacheFrameworkRegisterer.java b/...gar/caching/CacheFrameworkRegisterer.java → ...sco/caching/CacheFrameworkRegisterer.java
diff --git a/...ougar/caching/CacheFrameworkRegistry.java → ...disco/caching/CacheFrameworkRegistry.java b/...ougar/caching/CacheFrameworkRegistry.java → ...disco/caching/CacheFrameworkRegistry.java
diff --git a/...s/conf/cougar-caching-defaults.properties → ...s/conf/cougar-caching-defaults.properties b/...s/conf/cougar-caching-defaults.properties → ...s/conf/cougar-caching-defaults.properties
diff --git a/...n/resources/conf/cougar-module-spring.xml → ...n/resources/conf/cougar-module-spring.xml b/...n/resources/conf/cougar-module-spring.xml → ...n/resources/conf/cougar-module-spring.xml
diff --git a/...ces/conf/module-config-cougar-caching.xml → ...ces/conf/module-config-cougar-caching.xml b/...ces/conf/module-config-cougar-caching.xml → ...ces/conf/module-config-cougar-caching.xml
diff --git a/cougar-framework/cougar-client/pom.xml → disco-framework/disco-client/pom.xml b/cougar-framework/cougar-client/pom.xml → disco-framework/disco-client/pom.xml
diff --git a/...cougar/client/AbstractHttpExecutable.java → .../disco/client/AbstractHttpExecutable.java b/...cougar/client/AbstractHttpExecutable.java → .../disco/client/AbstractHttpExecutable.java
diff --git a/...ir/cougar/client/AsyncHttpExecutable.java → ...air/disco/client/AsyncHttpExecutable.java b/...ir/cougar/client/AsyncHttpExecutable.java → ...air/disco/client/AsyncHttpExecutable.java
diff --git a/...air/cougar/client/CallContextFactory.java → ...fair/disco/client/CallContextFactory.java b/...air/cougar/client/CallContextFactory.java → ...fair/disco/client/CallContextFactory.java
diff --git a/...fair/cougar/client/ClientCallContext.java → ...tfair/disco/client/ClientCallContext.java b/...fair/cougar/client/ClientCallContext.java → ...tfair/disco/client/ClientCallContext.java
diff --git a/...ougar/client/CougarClientConnManager.java → ...disco/client/CougarClientConnManager.java b/...ougar/client/CougarClientConnManager.java → ...disco/client/CougarClientConnManager.java
diff --git a/...r/cougar/client/CougarRequestFactory.java → ...ir/disco/client/CougarRequestFactory.java b/...r/cougar/client/CougarRequestFactory.java → ...ir/disco/client/CougarRequestFactory.java
diff --git a/.../client/DefaultGeoLocationSerializer.java → .../client/DefaultGeoLocationSerializer.java b/.../client/DefaultGeoLocationSerializer.java → .../client/DefaultGeoLocationSerializer.java
diff --git a/...lient/HttpClientCougarRequestFactory.java → ...lient/HttpClientCougarRequestFactory.java b/...lient/HttpClientCougarRequestFactory.java → ...lient/HttpClientCougarRequestFactory.java
diff --git a/...r/cougar/client/HttpClientExecutable.java → ...ir/disco/client/HttpClientExecutable.java b/...r/cougar/client/HttpClientExecutable.java → ...ir/disco/client/HttpClientExecutable.java
diff --git a/...air/cougar/client/HttpContextEmitter.java → ...fair/disco/client/HttpContextEmitter.java b/...air/cougar/client/HttpContextEmitter.java → ...fair/disco/client/HttpContextEmitter.java
diff --git a/...gar/client/JettyCougarRequestFactory.java → ...sco/client/JettyCougarRequestFactory.java b/...gar/client/JettyCougarRequestFactory.java → ...sco/client/JettyCougarRequestFactory.java
diff --git a/...va/com/betfair/cougar/client/Message.java → ...ava/com/betfair/disco/client/Message.java b/...va/com/betfair/cougar/client/Message.java → ...ava/com/betfair/disco/client/Message.java
diff --git a/...betfair/cougar/client/MessageBuilder.java → .../betfair/disco/client/MessageBuilder.java b/...betfair/cougar/client/MessageBuilder.java → .../betfair/disco/client/MessageBuilder.java
diff --git a/...ugar/client/SyncHttpTransportFactory.java → ...isco/client/SyncHttpTransportFactory.java b/...ugar/client/SyncHttpTransportFactory.java → ...isco/client/SyncHttpTransportFactory.java
diff --git a/...AsyncHttpClientIdentityTokenResolver.java → ...AsyncHttpClientIdentityTokenResolver.java b/...AsyncHttpClientIdentityTokenResolver.java → ...AsyncHttpClientIdentityTokenResolver.java
diff --git a/...ar/client/api/CompoundContextEmitter.java → ...co/client/api/CompoundContextEmitter.java b/...ar/client/api/CompoundContextEmitter.java → ...co/client/api/CompoundContextEmitter.java
diff --git a/...air/cougar/client/api/ContextEmitter.java → ...fair/disco/client/api/ContextEmitter.java b/...air/cougar/client/api/ContextEmitter.java → ...fair/disco/client/api/ContextEmitter.java
diff --git a/.../client/api/ContextEmitterRegisterer.java → .../client/api/ContextEmitterRegisterer.java b/.../client/api/ContextEmitterRegisterer.java → .../client/api/ContextEmitterRegisterer.java
diff --git a/.../cougar/client/api/CougarRemoteFault.java → ...r/disco/client/api/CougarRemoteFault.java b/.../cougar/client/api/CougarRemoteFault.java → ...r/disco/client/api/CougarRemoteFault.java
diff --git a/...gar/client/api/GeoLocationSerializer.java → ...sco/client/api/GeoLocationSerializer.java b/...gar/client/api/GeoLocationSerializer.java → ...sco/client/api/GeoLocationSerializer.java
diff --git a/.../api/HttpClientIdentityTokenResolver.java → .../api/HttpClientIdentityTokenResolver.java b/.../api/HttpClientIdentityTokenResolver.java → .../api/HttpClientIdentityTokenResolver.java
diff --git a/...ient/api/HttpIdentityChainSerialiser.java → ...ient/api/HttpIdentityChainSerialiser.java b/...ient/api/HttpIdentityChainSerialiser.java → ...ient/api/HttpIdentityChainSerialiser.java
diff --git a/...r/client/api/IdentityChainSerialiser.java → ...o/client/api/IdentityChainSerialiser.java b/...r/client/api/IdentityChainSerialiser.java → ...o/client/api/IdentityChainSerialiser.java
diff --git a/...fair/cougar/client/api/Transformable.java → ...tfair/disco/client/api/Transformable.java b/...fair/cougar/client/api/Transformable.java → ...tfair/disco/client/api/Transformable.java
diff --git a/...ception/AbstractExceptionTransformer.java → ...ception/AbstractExceptionTransformer.java b/...ception/AbstractExceptionTransformer.java → ...ception/AbstractExceptionTransformer.java
diff --git a/...lient/exception/ExceptionTransformer.java → ...lient/exception/ExceptionTransformer.java b/...lient/exception/ExceptionTransformer.java → ...lient/exception/ExceptionTransformer.java
diff --git a/...ception/ExceptionTransformerDelegate.java → ...ception/ExceptionTransformerDelegate.java b/...ception/ExceptionTransformerDelegate.java → ...ception/ExceptionTransformerDelegate.java
diff --git a/...TTPErrorToCougarExceptionTransformer.java → ...TTPErrorToCougarExceptionTransformer.java b/...TTPErrorToCougarExceptionTransformer.java → ...TTPErrorToCougarExceptionTransformer.java
diff --git a/.../factory/AbstractCougarClientFactory.java → .../factory/AbstractCougarClientFactory.java b/.../factory/AbstractCougarClientFactory.java → .../factory/AbstractCougarClientFactory.java
diff --git a/...t/query/AbstractQueryStringGenerator.java → ...t/query/AbstractQueryStringGenerator.java b/...t/query/AbstractQueryStringGenerator.java → ...t/query/AbstractQueryStringGenerator.java
diff --git a/...uery/DefaultQueryStringGeneratorImpl.java → ...uery/DefaultQueryStringGeneratorImpl.java b/...uery/DefaultQueryStringGeneratorImpl.java → ...uery/DefaultQueryStringGeneratorImpl.java
diff --git a/...ar/client/query/QueryStringGenerator.java → ...co/client/query/QueryStringGenerator.java b/...ar/client/query/QueryStringGenerator.java → ...co/client/query/QueryStringGenerator.java
diff --git a/...nt/query/QueryStringGeneratorFactory.java → ...nt/query/QueryStringGeneratorFactory.java b/...nt/query/QueryStringGeneratorFactory.java → ...nt/query/QueryStringGeneratorFactory.java
diff --git a/.../socket/ClientConnectedObjectManager.java → .../socket/ClientConnectedObjectManager.java b/.../socket/ClientConnectedObjectManager.java → .../socket/ClientConnectedObjectManager.java
diff --git a/...gar/client/socket/ClientSubscription.java → ...sco/client/socket/ClientSubscription.java b/...gar/client/socket/ClientSubscription.java → ...sco/client/socket/ClientSubscription.java
diff --git a/...ougar/client/socket/ConflaterFactory.java → ...disco/client/socket/ConflaterFactory.java b/...ougar/client/socket/ConflaterFactory.java → ...disco/client/socket/ConflaterFactory.java
diff --git a/...lient/socket/ExecutionVenueNioClient.java → ...lient/socket/ExecutionVenueNioClient.java b/...lient/socket/ExecutionVenueNioClient.java → ...lient/socket/ExecutionVenueNioClient.java
diff --git a/...tfair/cougar/client/socket/HeapState.java → ...etfair/disco/client/socket/HeapState.java b/...tfair/cougar/client/socket/HeapState.java → ...etfair/disco/client/socket/HeapState.java
diff --git a/...ougar/client/socket/IoSessionFactory.java → ...disco/client/socket/IoSessionFactory.java b/...ougar/client/socket/IoSessionFactory.java → ...disco/client/socket/IoSessionFactory.java
diff --git a/...ugar/client/socket/RPCTimeoutChecker.java → ...isco/client/socket/RPCTimeoutChecker.java b/...ugar/client/socket/RPCTimeoutChecker.java → ...isco/client/socket/RPCTimeoutChecker.java
diff --git a/...cougar/client/socket/SessionRecycler.java → .../disco/client/socket/SessionRecycler.java b/...cougar/client/socket/SessionRecycler.java → .../disco/client/socket/SessionRecycler.java
diff --git a/...socket/jmx/ClientSocketTransportInfo.java → ...socket/jmx/ClientSocketTransportInfo.java b/...socket/jmx/ClientSocketTransportInfo.java → ...socket/jmx/ClientSocketTransportInfo.java
diff --git a/...ket/resolver/DNSBasedAddressResolver.java → ...ket/resolver/DNSBasedAddressResolver.java b/...ket/resolver/DNSBasedAddressResolver.java → ...ket/resolver/DNSBasedAddressResolver.java
diff --git a/...et/resolver/FileBasedAddressResolver.java → ...et/resolver/FileBasedAddressResolver.java b/...et/resolver/FileBasedAddressResolver.java → ...et/resolver/FileBasedAddressResolver.java
diff --git a/...esolver/HotSwitchableAddressResolver.java → ...esolver/HotSwitchableAddressResolver.java b/...esolver/HotSwitchableAddressResolver.java → ...esolver/HotSwitchableAddressResolver.java
diff --git a/...cket/resolver/NetworkAddressResolver.java → ...cket/resolver/NetworkAddressResolver.java b/...cket/resolver/NetworkAddressResolver.java → ...cket/resolver/NetworkAddressResolver.java
diff --git a/.../client/ssl/UserAgnosticTokenHandler.java → .../client/ssl/UserAgnosticTokenHandler.java b/.../client/ssl/UserAgnosticTokenHandler.java → .../client/ssl/UserAgnosticTokenHandler.java
diff --git a/...ources/conf/cougar-application-spring.xml → ...ources/conf/cougar-application-spring.xml b/...ources/conf/cougar-application-spring.xml → ...ources/conf/cougar-application-spring.xml
diff --git a/...es/conf/cougar-client-defaults.properties → ...es/conf/cougar-client-defaults.properties b/...es/conf/cougar-client-defaults.properties → ...es/conf/cougar-client-defaults.properties
diff --git a/...ar/client/AbstractHttpExecutableTest.java → ...co/client/AbstractHttpExecutableTest.java b/...ar/client/AbstractHttpExecutableTest.java → ...co/client/AbstractHttpExecutableTest.java
diff --git a/...java/com/betfair/cougar/client/AppIT.java → .../java/com/betfair/disco/client/AppIT.java b/...java/com/betfair/cougar/client/AppIT.java → .../java/com/betfair/disco/client/AppIT.java
diff --git a/...ougar/client/AsyncHttpExecutableTest.java → ...disco/client/AsyncHttpExecutableTest.java b/...ougar/client/AsyncHttpExecutableTest.java → ...disco/client/AsyncHttpExecutableTest.java
diff --git a/...tfair/cougar/client/CapturingRequest.java → ...etfair/disco/client/CapturingRequest.java b/...tfair/cougar/client/CapturingRequest.java → ...etfair/disco/client/CapturingRequest.java
diff --git a/...ugar/client/CougarRequestFactoryTest.java → ...isco/client/CougarRequestFactoryTest.java b/...ugar/client/CougarRequestFactoryTest.java → ...isco/client/CougarRequestFactoryTest.java
diff --git a/...t/HttpClientCougarRequestFactoryTest.java → ...t/HttpClientCougarRequestFactoryTest.java b/...t/HttpClientCougarRequestFactoryTest.java → ...t/HttpClientCougarRequestFactoryTest.java
diff --git a/...ugar/client/HttpClientExecutableTest.java → ...isco/client/HttpClientExecutableTest.java b/...ugar/client/HttpClientExecutableTest.java → ...isco/client/HttpClientExecutableTest.java
diff --git a/...client/JettyCougarRequestFactoryTest.java → ...client/JettyCougarRequestFactoryTest.java b/...client/JettyCougarRequestFactoryTest.java → ...client/JettyCougarRequestFactoryTest.java
diff --git a/...air/cougar/client/MessageBuilderTest.java → ...fair/disco/client/MessageBuilderTest.java b/...air/cougar/client/MessageBuilderTest.java → ...fair/disco/client/MessageBuilderTest.java
diff --git a/...rrorToCougarExceptionTransformerTest.java → ...rrorToCougarExceptionTransformerTest.java b/...rrorToCougarExceptionTransformerTest.java → ...rrorToCougarExceptionTransformerTest.java
diff --git a/...uery/DefaultQueryStringGeneratorTest.java → ...uery/DefaultQueryStringGeneratorTest.java b/...uery/DefaultQueryStringGeneratorTest.java → ...uery/DefaultQueryStringGeneratorTest.java
diff --git a/...gar/client/socket/AbstractClientTest.java → ...sco/client/socket/AbstractClientTest.java b/...gar/client/socket/AbstractClientTest.java → ...sco/client/socket/AbstractClientTest.java
diff --git a/...ket/ClientConnectedObjectManagerTest.java → ...ket/ClientConnectedObjectManagerTest.java b/...ket/ClientConnectedObjectManagerTest.java → ...ket/ClientConnectedObjectManagerTest.java
diff --git a/...t/socket/ExecutionVenueNioClientTest.java → ...t/socket/ExecutionVenueNioClientTest.java b/...t/socket/ExecutionVenueNioClientTest.java → ...t/socket/ExecutionVenueNioClientTest.java
diff --git a/...r/client/socket/IoSessionFactoryTest.java → ...o/client/socket/IoSessionFactoryTest.java b/...r/client/socket/IoSessionFactoryTest.java → ...o/client/socket/IoSessionFactoryTest.java
diff --git a/...air/cougar/client/socket/MyIoSession.java → ...fair/disco/client/socket/MyIoSession.java b/...air/cougar/client/socket/MyIoSession.java → ...fair/disco/client/socket/MyIoSession.java
diff --git a/...ar/client/socket/ServerClientFactory.java → ...co/client/socket/ServerClientFactory.java b/...ar/client/socket/ServerClientFactory.java → ...co/client/socket/ServerClientFactory.java
diff --git a/...ar/client/socket/SessionRecyclerTest.java → ...co/client/socket/SessionRecyclerTest.java b/...ar/client/socket/SessionRecyclerTest.java → ...co/client/socket/SessionRecyclerTest.java
diff --git a/...lient/src/test/resources/log4j.properties → ...lient/src/test/resources/log4j.properties b/...lient/src/test/resources/log4j.properties → ...lient/src/test/resources/log4j.properties
diff --git a/...framework/cougar-config-bootstrap/pom.xml → ...-framework/disco-config-bootstrap/pom.xml b/...framework/cougar-config-bootstrap/pom.xml → ...-framework/disco-config-bootstrap/pom.xml
diff --git a/...esources/conf/cougar-bootstrap-spring.xml → ...esources/conf/cougar-bootstrap-spring.xml b/...esources/conf/cougar-bootstrap-spring.xml → ...esources/conf/cougar-bootstrap-spring.xml
diff --git a/cougar-framework/cougar-core-api/pom.xml → disco-framework/disco-core-api/pom.xml b/cougar-framework/cougar-core-api/pom.xml → disco-framework/disco-core-api/pom.xml
diff --git a/...ir/cougar/core/api/BindingDescriptor.java → ...air/disco/core/api/BindingDescriptor.java b/...ir/cougar/core/api/BindingDescriptor.java → ...air/disco/core/api/BindingDescriptor.java
diff --git a/...indingDescriptorRegistrationListener.java → ...indingDescriptorRegistrationListener.java b/...indingDescriptorRegistrationListener.java → ...indingDescriptorRegistrationListener.java
diff --git a/...ugar/core/api/CougarSpringCtxFactory.java → ...isco/core/api/CougarSpringCtxFactory.java b/...ugar/core/api/CougarSpringCtxFactory.java → ...isco/core/api/CougarSpringCtxFactory.java
diff --git a/...r/cougar/core/api/CougarStartingGate.java → ...ir/disco/core/api/CougarStartingGate.java b/...r/cougar/core/api/CougarStartingGate.java → ...ir/disco/core/api/CougarStartingGate.java
diff --git a/...betfair/cougar/core/api/GateListener.java → .../betfair/disco/core/api/GateListener.java b/...betfair/cougar/core/api/GateListener.java → .../betfair/disco/core/api/GateListener.java
diff --git a/.../cougar/core/api/GateListenerAdapter.java → ...r/disco/core/api/GateListenerAdapter.java b/.../cougar/core/api/GateListenerAdapter.java → ...r/disco/core/api/GateListenerAdapter.java
diff --git a/...tfair/cougar/core/api/GateRegisterer.java → ...etfair/disco/core/api/GateRegisterer.java b/...tfair/cougar/core/api/GateRegisterer.java → ...etfair/disco/core/api/GateRegisterer.java
diff --git a/.../core/api/OperationBindingDescriptor.java → .../core/api/OperationBindingDescriptor.java b/.../core/api/OperationBindingDescriptor.java → .../core/api/OperationBindingDescriptor.java
diff --git a/...betfair/cougar/core/api/RequestTimer.java → .../betfair/disco/core/api/RequestTimer.java b/...betfair/cougar/core/api/RequestTimer.java → .../betfair/disco/core/api/RequestTimer.java
diff --git a/...betfair/cougar/core/api/ServiceAware.java → .../betfair/disco/core/api/ServiceAware.java b/...betfair/cougar/core/api/ServiceAware.java → .../betfair/disco/core/api/ServiceAware.java
diff --git a/...ar/core/api/ServiceBindingDescriptor.java → ...co/core/api/ServiceBindingDescriptor.java b/...ar/core/api/ServiceBindingDescriptor.java → ...co/core/api/ServiceBindingDescriptor.java
diff --git a/...ir/cougar/core/api/ServiceDefinition.java → ...air/disco/core/api/ServiceDefinition.java b/...ir/cougar/core/api/ServiceDefinition.java → ...air/disco/core/api/ServiceDefinition.java
diff --git a/...air/cougar/core/api/ServiceRegistrar.java → ...fair/disco/core/api/ServiceRegistrar.java b/...air/cougar/core/api/ServiceRegistrar.java → ...fair/disco/core/api/ServiceRegistrar.java
diff --git a/...tfair/cougar/core/api/ServiceVersion.java → ...etfair/disco/core/api/ServiceVersion.java b/...tfair/cougar/core/api/ServiceVersion.java → ...etfair/disco/core/api/ServiceVersion.java
diff --git a/.../builder/BaseExecutionContextBuilder.java → .../builder/BaseExecutionContextBuilder.java b/.../builder/BaseExecutionContextBuilder.java → .../builder/BaseExecutionContextBuilder.java
diff --git a/...fair/cougar/core/api/builder/Builder.java → ...tfair/disco/core/api/builder/Builder.java b/...fair/cougar/core/api/builder/Builder.java → ...tfair/disco/core/api/builder/Builder.java
diff --git a/...er/DehydratedExecutionContextBuilder.java → ...er/DehydratedExecutionContextBuilder.java b/...er/DehydratedExecutionContextBuilder.java → ...er/DehydratedExecutionContextBuilder.java
diff --git a/.../api/builder/ExecutionContextBuilder.java → .../api/builder/ExecutionContextBuilder.java b/.../api/builder/ExecutionContextBuilder.java → .../api/builder/ExecutionContextBuilder.java
diff --git a/.../cougar/core/api/builder/ListBuilder.java → ...r/disco/core/api/builder/ListBuilder.java b/.../cougar/core/api/builder/ListBuilder.java → ...r/disco/core/api/builder/ListBuilder.java
diff --git a/...r/cougar/core/api/builder/MapBuilder.java → ...ir/disco/core/api/builder/MapBuilder.java b/...r/cougar/core/api/builder/MapBuilder.java → ...ir/disco/core/api/builder/MapBuilder.java
diff --git a/...r/cougar/core/api/builder/SetBuilder.java → ...ir/disco/core/api/builder/SetBuilder.java b/...r/cougar/core/api/builder/SetBuilder.java → ...ir/disco/core/api/builder/SetBuilder.java
diff --git a/...e/api/client/AbstractClientTransport.java → ...e/api/client/AbstractClientTransport.java b/...e/api/client/AbstractClientTransport.java → ...e/api/client/AbstractClientTransport.java
diff --git a/.../api/client/AbstractExceptionFactory.java → .../api/client/AbstractExceptionFactory.java b/.../api/client/AbstractExceptionFactory.java → .../api/client/AbstractExceptionFactory.java
diff --git a/...r/cougar/core/api/client/EnumWrapper.java → ...ir/disco/core/api/client/EnumWrapper.java b/...r/cougar/core/api/client/EnumWrapper.java → ...ir/disco/core/api/client/EnumWrapper.java
diff --git a/...gar/core/api/client/ExceptionFactory.java → ...sco/core/api/client/ExceptionFactory.java b/...gar/core/api/client/ExceptionFactory.java → ...sco/core/api/client/ExceptionFactory.java
diff --git a/...gar/core/api/client/TransportMetrics.java → ...sco/core/api/client/TransportMetrics.java b/...gar/core/api/client/TransportMetrics.java → ...sco/core/api/client/TransportMetrics.java
diff --git a/...e/api/collectionwrappers/WrappedList.java → ...e/api/collectionwrappers/WrappedList.java b/...e/api/collectionwrappers/WrappedList.java → ...e/api/collectionwrappers/WrappedList.java
diff --git a/...re/api/collectionwrappers/WrappedMap.java → ...re/api/collectionwrappers/WrappedMap.java b/...re/api/collectionwrappers/WrappedMap.java → ...re/api/collectionwrappers/WrappedMap.java
diff --git a/...re/api/collectionwrappers/WrappedSet.java → ...re/api/collectionwrappers/WrappedSet.java b/...re/api/collectionwrappers/WrappedSet.java → ...re/api/collectionwrappers/WrappedSet.java
diff --git a/...ar/core/api/ev/ClientExecutionResult.java → ...co/core/api/ev/ClientExecutionResult.java b/...ar/core/api/ev/ClientExecutionResult.java → ...co/core/api/ev/ClientExecutionResult.java
diff --git a/...lientPostProcessorRegistrationHelper.java → ...lientPostProcessorRegistrationHelper.java b/...lientPostProcessorRegistrationHelper.java → ...lientPostProcessorRegistrationHelper.java
diff --git a/...ClientPreProcessorRegistrationHelper.java → ...ClientPreProcessorRegistrationHelper.java b/...ClientPreProcessorRegistrationHelper.java → ...ClientPreProcessorRegistrationHelper.java
diff --git a/...re/api/ev/CompoundExecutableResolver.java → ...re/api/ev/CompoundExecutableResolver.java b/...re/api/ev/CompoundExecutableResolver.java → ...re/api/ev/CompoundExecutableResolver.java
diff --git a/...cougar/core/api/ev/ConnectedResponse.java → .../disco/core/api/ev/ConnectedResponse.java b/...cougar/core/api/ev/ConnectedResponse.java → .../disco/core/api/ev/ConnectedResponse.java
diff --git a/...ar/core/api/ev/EVServiceRegistration.java → ...co/core/api/ev/EVServiceRegistration.java b/...ar/core/api/ev/EVServiceRegistration.java → ...co/core/api/ev/EVServiceRegistration.java
diff --git a/...etfair/cougar/core/api/ev/Executable.java → ...betfair/disco/core/api/ev/Executable.java b/...etfair/cougar/core/api/ev/Executable.java → ...betfair/disco/core/api/ev/Executable.java
diff --git a/...ougar/core/api/ev/ExecutableResolver.java → ...disco/core/api/ev/ExecutableResolver.java b/...ougar/core/api/ev/ExecutableResolver.java → ...disco/core/api/ev/ExecutableResolver.java
diff --git a/...cougar/core/api/ev/ExecutableWrapper.java → .../disco/core/api/ev/ExecutableWrapper.java b/...cougar/core/api/ev/ExecutableWrapper.java → .../disco/core/api/ev/ExecutableWrapper.java
diff --git a/...r/core/api/ev/ExecutableWrapperUtils.java → ...o/core/api/ev/ExecutableWrapperUtils.java b/...r/core/api/ev/ExecutableWrapperUtils.java → ...o/core/api/ev/ExecutableWrapperUtils.java
diff --git a/...core/api/ev/ExecutionContextResolver.java → ...core/api/ev/ExecutionContextResolver.java b/...core/api/ev/ExecutionContextResolver.java → ...core/api/ev/ExecutionContextResolver.java
diff --git a/...r/core/api/ev/ExecutionManagerStatus.java → ...o/core/api/ev/ExecutionManagerStatus.java b/...r/core/api/ev/ExecutionManagerStatus.java → ...o/core/api/ev/ExecutionManagerStatus.java
diff --git a/...cougar/core/api/ev/ExecutionObserver.java → .../disco/core/api/ev/ExecutionObserver.java b/...cougar/core/api/ev/ExecutionObserver.java → .../disco/core/api/ev/ExecutionObserver.java
diff --git a/...r/core/api/ev/ExecutionPostProcessor.java → ...o/core/api/ev/ExecutionPostProcessor.java b/...r/core/api/ev/ExecutionPostProcessor.java → ...o/core/api/ev/ExecutionPostProcessor.java
diff --git a/...ar/core/api/ev/ExecutionPreProcessor.java → ...co/core/api/ev/ExecutionPreProcessor.java b/...ar/core/api/ev/ExecutionPreProcessor.java → ...co/core/api/ev/ExecutionPreProcessor.java
diff --git a/...gar/core/api/ev/ExecutionRequirement.java → ...sco/core/api/ev/ExecutionRequirement.java b/...gar/core/api/ev/ExecutionRequirement.java → ...sco/core/api/ev/ExecutionRequirement.java