Rename cougar to disco in file content

.travis.yml

@@ -7,7 +7,7 @@ jdk:
 notifications:
   email:
     recipients:
-      - betfair-cougar[email protected]
+      - betfair-disco[email protected]
     on_success: always
     on_failure: always
 before_install:

ProjectTasks.md

@@ -5,7 +5,7 @@ Documentation Publishing
 ------------------------
 * Ensure you have configured a [GitHub SSH Key](https://help.github.com/articles/generating-ssh-keys)
 * Pull the latest [betfair/gh-pages-publishing](https://github.com/betfair/gh-pages-publishing)
-* Run ```./publish betfair/cougar <github-user> <branch-name>```
+* Run ```./publish betfair/disco <github-user> <branch-name>```
 
 Snapshot Deploy
 ---------------
@@ -15,16 +15,16 @@ Snapshot Deploy
 
 Releasing
 ---------
-* Branch cougar to create the release branch
+* Branch disco to create the release branch
 * Perform maven release - see below
-* Branch the cougar-documentation to create the release documentation
-* Publish the new cougar-documentation branch
-* Change the master cougar-documentation to reference the new release
+* Branch the disco-documentation to create the release documentation
+* Publish the new disco-documentation branch
+* Change the master disco-documentation to reference the new release
 * Branch the archetypes to create the release branch
 * Update the archetypes on the release branch to reference the release version
 * [Perform maven release](https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide) on the archetype branch
 * Update the archetypes on the master branch to reference the new SNAPSHOT
-* Send notification email to betfair-cougar@googlegroups.com
+* Send notification email to betfair-disco@googlegroups.com
 
 Perform maven release
 ---------------------
@@ -47,9 +47,9 @@ mvn release:prepare
 # enter gpg passphrase when prompted
 # some fudgery required now, namely to install release binaries in local repo
 cd target
-git clone --branch 3.2.0 [email protected]:betfair/cougar checkout
+git clone --branch 3.2.0 [email protected]:betfair/disco checkout
 cd checkout
-git fetch [email protected]:betfair/cougar
+git fetch [email protected]:betfair/disco
 git checkout 3.2.0
 mvn install -Dmaven.test.skip=true
 cd ..
@@ -74,7 +74,7 @@ mvn release:clean
 If you have errors due to a pre-existing tag, then delete using:
 ```
 # remote
-git push origin :cougar-master-pom-3.2.0
+git push origin :disco-master-pom-3.2.0
 # local
-git tag -d cougar-master-pom-3.2.0
+git tag -d disco-master-pom-3.2.0
 ```

README.md

@@ -1,27 +1,27 @@
-Cougar
+Disco
 ======
 
-Welcome to Cougar!
+Welcome to Disco!
 
-Cougar is a framework for making building network exposed service interfaces easy. It supports multiple paradigms of interface interaction over multiple network transports and protocols. It has an asynchronous core, supporting high throughput, highly concurrent implementations, and yet offers simpler synchronous interfaces when you want to trade speed for simpler code. It also comprises an interface definition language, client and server stub generator, plus a whole bunch of other goodies to make your life as simple as possible and to free you up to implement your business logic.
+Disco is a framework for making building network exposed service interfaces easy. It supports multiple paradigms of interface interaction over multiple network transports and protocols. It has an asynchronous core, supporting high throughput, highly concurrent implementations, and yet offers simpler synchronous interfaces when you want to trade speed for simpler code. It also comprises an interface definition language, client and server stub generator, plus a whole bunch of other goodies to make your life as simple as possible and to free you up to implement your business logic.
 
-Read more on [Cougar's site](http://betfair.github.io/cougar).
+Read more on [Disco's site](http://betfair.github.io/disco).
 
 Project admin
 -------------
 
 [Project tasks](ProjectTasks.md)
 
-[Sonar report](http://nemo.sonarqube.org/dashboard/index?id=com.betfair.cougar%3Acougar-master-pom)
+[Sonar report](http://nemo.sonarqube.org/dashboard/index?id=uk.co.exemel.disco%3Adisco-master-pom)
 
-[![Build Status](https://travis-ci.org/betfair/cougar.png?branch=master)](https://travis-ci.org/betfair/cougar)
+[![Build Status](https://travis-ci.org/betfair/disco.png?branch=master)](https://travis-ci.org/betfair/disco)
 
 Licensing & Copyright
 ---------------------
 
 Main project: Copyright 2013-2014, The Sporting Exchange Limited. Specific files may differ.
 
-Cougar is covered by "[The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html)":
+Disco is covered by "[The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html)":
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

THANKS.md

@@ -1,4 +1,4 @@
-Many people have contributed to Cougar over the years at Betfair, we want to call out those who have made the greatest contributions internally before it was released since those contributions aren't visible on Github. Authors are those who made >50 individual commits. Names are in decreasing order of number of individual commits.
+Many people have contributed to Disco over the years at Betfair, we want to call out those who have made the greatest contributions internally before it was released since those contributions aren't visible on Github. Authors are those who made >50 individual commits. Names are in decreasing order of number of individual commits.
 
 Where just initials are presented it's because we haven't been able to obtain permission from the individual to publish their name.
 

baseline-client/binaryclient-app/pom.xml

@@ -20,7 +20,7 @@
 
   <parent>
     <artifactId>baseline-client</artifactId>
-    <groupId>com.betfair.cougar</groupId>
+    <groupId>uk.co.exemel.disco</groupId>
     <version>3.3-SNAPSHOT</version>
   </parent>
 
@@ -38,13 +38,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.betfair.cougar</groupId>
-            <artifactId>cougar-client</artifactId>
+            <groupId>uk.co.exemel.disco</groupId>
+            <artifactId>disco-client</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.betfair.cougar</groupId>
-            <artifactId>cougar-marshalling-impl</artifactId>
+            <groupId>uk.co.exemel.disco</groupId>
+            <artifactId>disco-marshalling-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -58,34 +58,34 @@
             <version>5.2</version>
         </dependency>              
         <dependency>
-            <groupId>com.betfair.cougar</groupId>
-            <artifactId>cougar-marshalling-api</artifactId>
+            <groupId>uk.co.exemel.disco</groupId>
+            <artifactId>disco-marshalling-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.betfair.cougar</groupId>
-            <artifactId>cougar-core-impl</artifactId>
+            <groupId>uk.co.exemel.disco</groupId>
+            <artifactId>disco-core-impl</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.betfair.cougar</groupId>
+            <groupId>uk.co.exemel.disco</groupId>
             <artifactId>net-util</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.betfair.cougar</groupId>
-            <artifactId>cougar-standalone-ev</artifactId>
+            <groupId>uk.co.exemel.disco</groupId>
+            <artifactId>disco-standalone-ev</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>com.betfair.cougar</groupId>
-            <artifactId>cougar-transport-api</artifactId>
+            <groupId>uk.co.exemel.disco</groupId>
+            <artifactId>disco-transport-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.betfair.cougar</groupId>
-            <artifactId>cougar-transport-impl</artifactId>
+            <groupId>uk.co.exemel.disco</groupId>
+            <artifactId>disco-transport-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
 

baseline-client/binaryclient-app/src/main/java/com/betfair/platform/ComplexObjectCreator.java

@@ -37,7 +37,7 @@ public class ComplexObjectCreator implements Constants {
   private ClassGen           _cg;
 
   public ComplexObjectCreator(String objectType) {
-    _cg = new ClassGen(objectType, "java.lang.Object", "ComplexObject.java", ACC_PUBLIC | ACC_SUPER, new String[] { "com.betfair.cougar.api.Result" });
+    _cg = new ClassGen(objectType, "java.lang.Object", "ComplexObject.java", ACC_PUBLIC | ACC_SUPER, new String[] { "uk.co.exemel.disco.api.Result" });
 
     _cp = _cg.getConstantPool();
     _factory = new InstructionFactory(_cg, _cp);
@@ -73,4 +73,4 @@ private void createMethod_0() {
   }
 
 
-}
+}

baseline-client/binaryclient-app/src/main/java/com/betfair/platform/TestClient.java

@@ -33,28 +33,28 @@
 import com.betfair.baseline.v2.to.BodyParamEnumObject;
 import com.betfair.baseline.v2.to.EnumOperationResponseObject;
 import com.betfair.baseline.v2.to.SimpleResponse;
-import com.betfair.cougar.api.ExecutionContext;
-import com.betfair.cougar.api.RequestUUID;
-import com.betfair.cougar.api.ResponseCode;
-import com.betfair.cougar.api.geolocation.GeoLocationDetails;
-import com.betfair.cougar.api.security.IdentityChain;
-import com.betfair.cougar.core.api.ServiceVersion;
-import com.betfair.cougar.core.api.ev.Executable;
-import com.betfair.cougar.core.api.ev.ExecutionTimingRecorder;
-import com.betfair.cougar.core.api.ev.ExecutionObserver;
-import com.betfair.cougar.core.api.ev.ExecutionPostProcessor;
-import com.betfair.cougar.core.api.ev.ExecutionPreProcessor;
-import com.betfair.cougar.core.api.ev.ExecutionResult;
-import com.betfair.cougar.core.api.ev.ExecutionVenue;
-import com.betfair.cougar.core.api.ev.OperationDefinition;
-import com.betfair.cougar.core.api.ev.OperationKey;
-import com.betfair.cougar.core.api.ev.SimpleOperationDefinition;
-import com.betfair.cougar.core.api.ev.TimeConstraints;
-import com.betfair.cougar.core.api.exception.CougarException;
-import com.betfair.cougar.core.api.transcription.Parameter;
-import com.betfair.cougar.core.api.transcription.ParameterType;
-import com.betfair.cougar.core.impl.DefaultTimeConstraints;
-import com.betfair.cougar.util.RequestUUIDImpl;
+import uk.co.exemel.disco.api.ExecutionContext;
+import uk.co.exemel.disco.api.RequestUUID;
+import uk.co.exemel.disco.api.ResponseCode;
+import uk.co.exemel.disco.api.geolocation.GeoLocationDetails;
+import uk.co.exemel.disco.api.security.IdentityChain;
+import uk.co.exemel.disco.core.api.ServiceVersion;
+import uk.co.exemel.disco.core.api.ev.Executable;
+import uk.co.exemel.disco.core.api.ev.ExecutionTimingRecorder;
+import uk.co.exemel.disco.core.api.ev.ExecutionObserver;
+import uk.co.exemel.disco.core.api.ev.ExecutionPostProcessor;
+import uk.co.exemel.disco.core.api.ev.ExecutionPreProcessor;
+import uk.co.exemel.disco.core.api.ev.ExecutionResult;
+import uk.co.exemel.disco.core.api.ev.ExecutionVenue;
+import uk.co.exemel.disco.core.api.ev.OperationDefinition;
+import uk.co.exemel.disco.core.api.ev.OperationKey;
+import uk.co.exemel.disco.core.api.ev.SimpleOperationDefinition;
+import uk.co.exemel.disco.core.api.ev.TimeConstraints;
+import uk.co.exemel.disco.core.api.exception.DiscoException;
+import uk.co.exemel.disco.core.api.transcription.Parameter;
+import uk.co.exemel.disco.core.api.transcription.ParameterType;
+import uk.co.exemel.disco.core.impl.DefaultTimeConstraints;
+import uk.co.exemel.disco.util.RequestUUIDImpl;
 
 public class TestClient {
 
@@ -295,7 +295,7 @@ public void onResult(ExecutionResult executionResult) {
 					System.out.println("FAIL");
 				}
 				else {
-					CougarException ce = executionResult.getFault();
+					DiscoException ce = executionResult.getFault();
 					if (ResponseCode.BadRequest.equals(ce.getResponseCode())) {
 						System.out.println("PASS");
 					}

baseline-client/binaryclient-app/src/main/resources/conf/application-spring.xml

@@ -19,19 +19,19 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="clientSocketMarshaller" class="com.betfair.cougar.netutil.nio.marshalling.SocketRMIMarshaller">
+    <bean id="clientSocketMarshaller" class="uk.co.exemel.disco.netutil.nio.marshalling.SocketRMIMarshaller">
     </bean>
 
-    <bean id="nioClient" parent="cougar.client.AbstractSocketTransport">
+    <bean id="nioClient" parent="disco.client.AbstractSocketTransport">
         <constructor-arg index="5" value="127.0.0.1:9003"/>
     </bean>
 
-    <bean id="clientNioConfig" class="com.betfair.cougar.netutil.nio.NioConfig">
+    <bean id="clientNioConfig" class="uk.co.exemel.disco.netutil.nio.NioConfig">
         <property name="nioLogger" ref="clientNioLogger"/>
     </bean>
 
 
-    <bean id="clientNioLogger" class="com.betfair.cougar.netutil.nio.NioLogger">
+    <bean id="clientNioLogger" class="uk.co.exemel.disco.netutil.nio.NioLogger">
         <constructor-arg value="SESSION"/>
     </bean>
 

baseline-client/client-app/pom.xml

@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.betfair.cougar</groupId>
+		<groupId>uk.co.exemel.disco</groupId>
 		<artifactId>baseline-client</artifactId>
 		<version>3.3-SNAPSHOT</version>
 	</parent>
@@ -30,57 +30,57 @@
 
 	<dependencies>
             <dependency>
-                  <groupId>com.betfair.cougar</groupId>
+                  <groupId>uk.co.exemel.disco</groupId>
                   <artifactId>baseline-security</artifactId>
                   <version>${project.version}</version>
             </dependency>
             <dependency>
-                  <groupId>com.betfair.cougar</groupId>
-                  <artifactId>cougar-util</artifactId>
+                  <groupId>uk.co.exemel.disco</groupId>
+                  <artifactId>disco-util</artifactId>
             </dependency>
             <dependency>
-                  <groupId>com.betfair.cougar</groupId>
-                  <artifactId>cougar-core-impl</artifactId>
+                  <groupId>uk.co.exemel.disco</groupId>
+                  <artifactId>disco-core-impl</artifactId>
             </dependency>
             <dependency>
-                  <groupId>com.betfair.cougar</groupId>
-                  <artifactId>cougar-transport-api</artifactId>
+                  <groupId>uk.co.exemel.disco</groupId>
+                  <artifactId>disco-transport-api</artifactId>
             </dependency>
 
             <dependency>
-                  <groupId>com.betfair.cougar</groupId>
-                  <artifactId>cougar-standalone-ev</artifactId>
+                  <groupId>uk.co.exemel.disco</groupId>
+                  <artifactId>disco-standalone-ev</artifactId>
                   <version>${project.version}</version>
                   <scope>runtime</scope>
             </dependency>
             <dependency>
-                  <groupId>com.betfair.cougar</groupId>
-                  <artifactId>cougar-client</artifactId>
+                  <groupId>uk.co.exemel.disco</groupId>
+                  <artifactId>disco-client</artifactId>
                   <version>${project.version}</version>
             </dependency>
             <dependency>
-              <groupId>com.betfair.cougar</groupId>
+              <groupId>uk.co.exemel.disco</groupId>
               <artifactId>activemq-transport</artifactId>
               <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
             <dependency>
-                  <groupId>com.betfair.cougar</groupId>
-                  <artifactId>cougar-api</artifactId>
+                  <groupId>uk.co.exemel.disco</groupId>
+                  <artifactId>disco-api</artifactId>
                   <version>${project.version}</version>
             </dependency>
             <dependency>
-                  <groupId>com.betfair.cougar</groupId>
-                  <artifactId>cougar-core-api</artifactId>
+                  <groupId>uk.co.exemel.disco</groupId>
+                  <artifactId>disco-core-api</artifactId>
                   <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.betfair.cougar</groupId>
+                <groupId>uk.co.exemel.disco</groupId>
                 <artifactId>client-idd</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.betfair.cougar</groupId>
+                <groupId>uk.co.exemel.disco</groupId>
                 <artifactId>net-util</artifactId>
             </dependency>
 	</dependencies>