From c44aae129fd07f9ce7f51f6e98da74165f3a73ef Mon Sep 17 00:00:00 2001
From: Peter Lawrey <peter.lawrey@higherfrequencytrading.com>
Date: Fri, 24 Oct 2014 11:23:15 +0100
Subject: [PATCH 1/3] Support read/write locking.

---
 .../chronicle/map/ReplicatedChronicleMap.java | 38 ++++++----
 .../openhft/chronicle/map/SharedSegment.java  |  8 +-
 .../chronicle/map/VanillaChronicleMap.java    | 73 +++++++++++++------
 3 files changed, 79 insertions(+), 40 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index 0f5f3ad69..e421278c4 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -607,7 +607,10 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
          */
         V acquire(ThreadLocalCopies copies, MKI metaKeyWriter, KI keyWriter,
                   K key, V usingValue, int hash2, boolean create, long timestamp) {
-            lock();
+            if (create)
+                writeLock();
+            else
+                readLock();
             try {
                 long keySize = metaKeyWriter.size(keyWriter, key);
                 MultiStoreBytes entry = tmpBytes;
@@ -636,7 +639,10 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                     }
                 }
             } finally {
-                unlock();
+                if (create)
+                    writeUnlock();
+                else
+                    readUnlock();
             }
         }
 
@@ -654,7 +660,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
          */
         private void remoteRemove(Bytes keyBytes, int hash2,
                                   final long timestamp, final byte identifier) {
-            lock();
+            writeLock();
             try {
                 long keySize = keyBytes.remaining();
                 hashLookupLiveAndDeleted.startSearch(hash2);
@@ -693,7 +699,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                     LOG.debug("Segment.remoteRemove() : key=" + keyBytes.toString().trim() + " was not " +
                             "found");
             } finally {
-                unlock();
+                writeUnlock();
             }
         }
 
@@ -704,7 +710,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
         private void remotePut(@NotNull final Bytes inBytes, int hash2,
                                final byte identifier, final long timestamp,
                                long valuePos, long valueLimit) {
-            lock();
+            writeLock();
             try {
                 // inBytes position and limit correspond to the key
                 final long keySize = inBytes.remaining();
@@ -784,7 +790,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                 incrementSize();
 
             } finally {
-                unlock();
+                writeUnlock();
             }
         }
 
@@ -795,7 +801,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
         V put(ThreadLocalCopies copies, MKI metaKeyWriter, KI keyWriter,
               K key, V value, int hash2, boolean replaceIfPresent,
               final byte identifier, final long timestamp) {
-            lock();
+            writeLock();
             try {
                 IntIntMultiMap hashLookup = hashLookupLiveAndDeleted;
                 long keySize = metaKeyWriter.size(keyWriter, key);
@@ -850,7 +856,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                 notifyPut(offset, true, key, value, posFromOffset(offset));
                 return null;
             } finally {
-                unlock();
+                writeUnlock();
             }
         }
 
@@ -961,7 +967,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                  K key, V expectedValue, int hash2,
                  final long timestamp, final byte identifier) {
             assert identifier > 0;
-            lock();
+            writeLock();
             try {
                 long keySize = metaKeyWriter.size(keyWriter, key);
                 final IntIntMultiMap multiMap = hashLookupLiveAndDeleted;
@@ -1015,7 +1021,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                 // key is not found
                 return null;
             } finally {
-                unlock();
+                writeUnlock();
             }
         }
 
@@ -1029,7 +1035,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
          */
         V replace(ThreadLocalCopies copies, MKI metaKeyWriter, KI keyWriter,
                   K key, V expectedValue, V newValue, int hash2, long timestamp) {
-            lock();
+            writeLock();
             try {
                 long keySize = metaKeyWriter.size(keyWriter, key);
                 hashLookupLiveOnly.startSearch(hash2);
@@ -1052,7 +1058,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                 // key is not found
                 return null;
             } finally {
-                unlock();
+                writeUnlock();
             }
         }
 
@@ -1068,7 +1074,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
         public void dirtyEntries(final long timeStamp,
                                  final ModificationIterator.EntryModifiableCallback callback) {
 
-            this.lock();
+            this.readLock();
             try {
                 final int index = Segment.this.getIndex();
                 hashLookupLiveAndDeleted.forEach(new IntIntMultiMap.EntryConsumer() {
@@ -1088,7 +1094,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                 });
 
             } finally {
-                unlock();
+                readUnlock();
             }
         }
 
@@ -1452,7 +1458,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
 
                 this.position = position;
                 final SharedSegment segment = segment((int) (position >>> segmentIndexShift));
-                segment.lock();
+                segment.readLock();
                 try {
                     if (changes.clearIfSet(position)) {
 
@@ -1473,7 +1479,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                     // while we were trying to obtain segment lock (for example, in onReplication()),
                     // go to pick up next (next iteration in while (true) loop)
                 } finally {
-                    segment.unlock();
+                    segment.readUnlock();
                 }
             }
         }
diff --git a/src/main/java/net/openhft/chronicle/map/SharedSegment.java b/src/main/java/net/openhft/chronicle/map/SharedSegment.java
index 03c05d430..5e87e98ef 100644
--- a/src/main/java/net/openhft/chronicle/map/SharedSegment.java
+++ b/src/main/java/net/openhft/chronicle/map/SharedSegment.java
@@ -26,11 +26,15 @@ import java.util.Map;
  */
 interface SharedSegment<K, V> {
 
-    void lock();
+    void readLock();
+
+    void writeLock();
 
     Map.Entry<K, V> getEntry(long pos);
 
-    void unlock();
+    void readUnlock();
+
+    void writeUnlock();
 
     NativeBytes entry(long pos);
 
diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index e6bb3a8b1..13775f0a5 100644
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -627,9 +627,9 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
         }
 
 
-        public void lock() throws IllegalStateException {
+        public void readLock() throws IllegalStateException {
             while (true) {
-                final boolean success = bytes.tryLockNanosLong(LOCK_OFFSET, lockTimeOutNS);
+                final boolean success = bytes.tryRWReadLock(LOCK_OFFSET, lockTimeOutNS);
                 if (success) return;
                 if (currentThread().isInterrupted()) {
                     throw new IllegalStateException(new InterruptedException("Unable to obtain lock, interrupted"));
@@ -640,9 +640,30 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
             }
         }
 
-        public void unlock() {
+        public void writeLock() throws IllegalStateException {
+            while (true) {
+                final boolean success = bytes.tryRWWriteLock(LOCK_OFFSET, lockTimeOutNS);
+                if (success) return;
+                if (currentThread().isInterrupted()) {
+                    throw new IllegalStateException(new InterruptedException("Unable to obtain lock, interrupted"));
+                } else {
+                    errorListener.onLockTimeout(bytes.threadIdForLockLong(LOCK_OFFSET));
+                    bytes.resetLockLong(LOCK_OFFSET);
+                }
+            }
+        }
+
+        public void readUnlock() {
             try {
-                bytes.unlockLong(LOCK_OFFSET);
+                bytes.unlockRWReadLock(LOCK_OFFSET);
+            } catch (IllegalMonitorStateException e) {
+                errorListener.errorOnUnlock(e);
+            }
+        }
+
+        public void writeUnlock() {
+            try {
+                bytes.unlockRWWriteLock(LOCK_OFFSET);
             } catch (IllegalMonitorStateException e) {
                 errorListener.errorOnUnlock(e);
             }
@@ -705,7 +726,10 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
          */
         V acquire(ThreadLocalCopies copies, MKI metaKeyInterop, KI keyInterop, K key, V usingValue,
                   int hash2, boolean create) {
-            lock();
+            if (create)
+                writeLock();
+            else
+                readLock();
             try {
                 long keySize = metaKeyInterop.size(keyInterop, key);
                 MultiStoreBytes entry = tmpBytes;
@@ -732,7 +756,10 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                     }
                 }
             } finally {
-                unlock();
+                if (create)
+                    writeUnlock();
+                else
+                    readUnlock();
             }
         }
 
@@ -788,7 +815,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
 
         V put(ThreadLocalCopies copies, MKI metaKeyInterop, KI keyInterop, K key, V value,
               int hash2, boolean replaceIfPresent) {
-            lock();
+            writeLock();
             try {
                 long keySize = metaKeyInterop.size(keyInterop, key);
                 hashLookup.startSearch(hash2);
@@ -813,7 +840,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                 notifyPut(offset, true, key, value, posFromOffset(offset));
                 return null;
             } finally {
-                unlock();
+                writeUnlock();
             }
         }
 
@@ -980,7 +1007,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
          */
         V remove(ThreadLocalCopies copies, MKI metaKeyInterop, KI keyInterop, K key,
                  V expectedValue, int hash2) {
-            lock();
+            writeLock();
             try {
                 long keySize = metaKeyInterop.size(keyInterop, key);
                 hashLookup.startSearch(hash2);
@@ -1006,12 +1033,12 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                 // key is not found
                 return null;
             } finally {
-                unlock();
+                writeUnlock();
             }
         }
 
         boolean containsKey(KI keyInterop, MKI metaKeyInterop, K key, int hash2) {
-            lock();
+            readLock();
             try {
                 long keySize = metaKeyInterop.size(keyInterop, key);
                 IntIntMultiMap hashLookup = containsKeyHashLookup();
@@ -1023,7 +1050,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                 }
                 return false;
             } finally {
-                unlock();
+                readUnlock();
             }
         }
 
@@ -1041,7 +1068,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
          */
         V replace(ThreadLocalCopies copies, MKI metaKeyInterop, KI keyInterop, K key,
                   V expectedValue, V newValue, int hash2) {
-            lock();
+            writeLock();
             try {
                 long keySize = metaKeyInterop.size(keyInterop, key);
                 hashLookup.startSearch(hash2);
@@ -1058,7 +1085,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                 // key is not found
                 return null;
             } finally {
-                unlock();
+                writeUnlock();
             }
         }
 
@@ -1199,14 +1226,14 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
         }
 
         void clear() {
-            lock();
+            writeLock();
             try {
                 hashLookup.clear();
                 freeList.clear();
                 nextPosToSearchFrom = 0;
                 resetSize();
             } finally {
-                unlock();
+                writeUnlock();
             }
         }
 
@@ -1229,7 +1256,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
          * Check there is no garbage in freeList.
          */
         void checkConsistency() {
-            lock();
+            readLock();
             try {
                 IntIntMultiMap hashLookup = checkConsistencyHashLookup();
                 for (int pos = 0; (pos = (int) freeList.nextSetBit(pos)) >= 0; ) {
@@ -1250,7 +1277,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                     pos += entrySizeInBlocks;
                 }
             } finally {
-                unlock();
+                readUnlock();
             }
         }
 
@@ -1318,7 +1345,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                     throw new NoSuchElementException();
                 final Segment segment = segments[segIndex];
                 try {
-                    segment.lock();
+                    segment.readLock();
                     if (segment.getHashLookup().getPositions().isClear(pos)) {
                         // the pos was removed after the previous advance
                         advance(segIndex, pos);
@@ -1327,7 +1354,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
                     advance(returnedSeg = segIndex, returnedPos = pos);
                     return returnedEntry = segment.getEntry(pos);
                 } finally {
-                    segment.unlock();
+                    segment.readUnlock();
                 }
             }
         }
@@ -1340,21 +1367,23 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
             final Segment segment = segments[segIndex];
             final int pos = (int) returnedPos;
             try {
-                segment.lock();
+                segment.writeLock();
                 if (segment.getHashLookup().getPositions().isClear(pos)) {
                     // The case:
                     // 1. iterator.next() - thread 1
                     // 2. map.put() which cause relocation of the key, returned in above - thread 2
                     // OR map.remove() which remove this key - thread 2
                     // 3. iterator.remove() - thread 1
+                    segment.writeUnlock(); // not re-entrant.
                     VanillaChronicleMap.this.remove(returnedEntry.getKey());
+                    segment.writeLock();
                 } else {
                     removePresent(segment, pos);
                 }
                 returnedSeg = -1;
                 returnedEntry = null;
             } finally {
-                segment.unlock();
+                segment.writeUnlock();
             }
         }
 

From ea779997cfe0b96b54abe05f19a2a4f6a84d876e Mon Sep 17 00:00:00 2001
From: Peter Lawrey <peter.lawrey@higherfrequencytrading.com>
Date: Fri, 24 Oct 2014 11:30:24 +0100
Subject: [PATCH 2/3] Remove <p/> from copyright messages

---
 pom.xml                                        |  4 +++-
 .../chronicle/common/ChronicleHash.java        |  4 +++-
 .../chronicle/common/ChronicleHashBuilder.java | 18 ++++++++++++++++++
 .../common/ChronicleHashErrorListener.java     |  4 +++-
 .../common/ChronicleHashErrorListeners.java    |  4 +++-
 .../chronicle/common/StatelessBuilder.java     | 18 ++++++++++++++++++
 .../openhft/chronicle/common/TimeProvider.java |  4 +++-
 .../common/exceptions/IORuntimeException.java  | 18 ++++++++++++++++++
 .../exceptions/TimeoutRuntimeException.java    | 18 ++++++++++++++++++
 .../serialization/AgileBytesMarshaller.java    |  4 +++-
 .../common/serialization/BytesInterop.java     |  4 +++-
 .../common/serialization/BytesReader.java      |  4 +++-
 .../common/serialization/BytesReaders.java     |  4 +++-
 .../common/serialization/BytesWriter.java      |  4 +++-
 .../serialization/CopyingMetaBytesInterop.java |  4 +++-
 .../DelegatingMetaBytesInterop.java            |  4 +++-
 .../DelegatingMetaBytesInteropProvider.java    |  4 +++-
 .../chronicle/common/serialization/Hasher.java |  4 +++-
 .../common/serialization/MetaBytesInterop.java |  4 +++-
 .../common/serialization/MetaBytesWriter.java  |  4 +++-
 .../common/serialization/MetaProvider.java     |  4 +++-
 .../common/serialization/SizeMarshaller.java   |  4 +++-
 .../common/serialization/SizeMarshallers.java  |  4 +++-
 .../impl/ByteArrayMarshaller.java              |  4 +++-
 .../serialization/impl/ByteableMarshaller.java |  4 +++-
 .../impl/CharArrayMarshaller.java              |  4 +++-
 .../serialization/impl/CharSequenceReader.java |  4 +++-
 .../serialization/impl/CharSequenceWriter.java |  4 +++-
 .../serialization/impl/DoubleMarshaller.java   |  4 +++-
 .../serialization/impl/IntegerMarshaller.java  |  4 +++-
 .../serialization/impl/LongMarshaller.java     |  4 +++-
 .../serialization/impl/VoidMarshaller.java     |  4 +++-
 .../chronicle/common/threadlocal/Provider.java |  4 +++-
 .../common/threadlocal/StatefulCopyable.java   |  4 +++-
 .../common/threadlocal/ThreadLocalCopies.java  |  4 +++-
 .../map/AbstractChannelReplicator.java         |  4 +++-
 .../net/openhft/chronicle/map/Alignment.java   |  4 +++-
 .../openhft/chronicle/map/ChannelProvider.java |  4 +++-
 .../chronicle/map/ChannelProviderBuilder.java  |  4 +++-
 .../openhft/chronicle/map/ChronicleMap.java    |  4 +++-
 .../chronicle/map/ChronicleMapBuilder.java     |  4 +++-
 .../chronicle/map/CloseablesManager.java       |  4 +++-
 .../chronicle/map/ConstantValueProvider.java   |  4 +++-
 .../chronicle/map/DefaultValueProvider.java    |  4 +++-
 .../chronicle/map/IdentifierListener.java      | 18 ++++++++++++++++++
 .../openhft/chronicle/map/IntIntMultiMap.java  |  4 +++-
 .../chronicle/map/MapEventListener.java        |  4 +++-
 .../chronicle/map/MapEventListeners.java       |  4 +++-
 .../openhft/chronicle/map/NodeDiscovery.java   | 18 ++++++++++++++++++
 .../chronicle/map/NullValueProvider.java       |  4 +++-
 .../net/openhft/chronicle/map/Objects.java     |  4 +++-
 .../net/openhft/chronicle/map/Replica.java     |  4 +++-
 .../chronicle/map/ReplicatedChronicleMap.java  |  4 +++-
 .../chronicle/map/ReplicationConfig.java       | 18 ++++++++++++++++++
 .../chronicle/map/SerializationBuilder.java    |  4 +++-
 .../net/openhft/chronicle/map/Serializer.java  | 18 ++++++++++++++++++
 .../openhft/chronicle/map/SharedSegment.java   |  4 +++-
 .../chronicle/map/StatelessChronicleMap.java   | 18 ++++++++++++++++++
 .../chronicle/map/TcpReplicationConfig.java    |  4 +++-
 .../openhft/chronicle/map/TcpReplicator.java   |  4 +++-
 .../chronicle/map/ThrottlingConfig.java        |  4 +++-
 .../chronicle/map/UdpChannelReplicator.java    |  4 +++-
 .../chronicle/map/UdpReplicationConfig.java    |  4 +++-
 .../map/UdpReplicationConfigBean.java          | 18 ++++++++++++++++++
 .../openhft/chronicle/map/UdpReplicator.java   |  4 +++-
 .../chronicle/map/VanillaChronicleMap.java     |  4 +++-
 .../chronicle/map/VanillaIntIntMultiMap.java   |  4 +++-
 .../map/VanillaShortShortMultiMap.java         |  4 +++-
 .../openhft/chronicle/set/ChronicleSet.java    | 18 ++++++++++++++++++
 .../chronicle/set/ChronicleSetBuilder.java     |  4 +++-
 .../net/openhft/chronicle/set/DummyValue.java  |  4 +++-
 .../chronicle/set/DummyValueMarshaller.java    |  4 +++-
 .../net/openhft/chronicle/set/SetFromMap.java  |  4 +++-
 src/test/java/eg/BigData.java                  |  4 +++-
 .../chronicle/map/AcquireGetUsingMain.java     |  4 +++-
 .../net/openhft/chronicle/map/BitUnitTest.java |  4 +++-
 .../net/openhft/chronicle/map/Builder.java     |  4 +++-
 .../map/ByteableIntValueMarshaller.java        |  4 +++-
 .../map/ByteableLongValueMarshaller.java       |  4 +++-
 .../chronicle/map/CHMLatencyTestMain.java      |  4 +++-
 .../openhft/chronicle/map/CHMMetaDataTest.java |  4 +++-
 .../net/openhft/chronicle/map/CHMTest5.java    |  4 +++-
 .../chronicle/map/CHMTestIterator1.java        |  4 +++-
 .../chronicle/map/ChannelReplicationTest.java  |  4 +++-
 .../chronicle/map/ChronicleMapTest.java        |  4 +++-
 .../chronicle/map/ConcurrentMap8Test.java      |  4 +++-
 .../map/ConstantSizeBySampleTest.java          |  4 +++-
 .../chronicle/map/DefaultValueTest.java        |  4 +++-
 .../chronicle/map/EntryCountMapTest.java       | 18 ++++++++++++++++++
 .../net/openhft/chronicle/map/GuavaTest.java   |  4 +++-
 .../net/openhft/chronicle/map/Histogram.java   |  4 +++-
 .../openhft/chronicle/map/HistogramTest.java   |  4 +++-
 .../chronicle/map/IntIntMultiMapTest.java      |  4 +++-
 .../openhft/chronicle/map/IntValueMapTest.java |  4 +++-
 .../java/net/openhft/chronicle/map/Issue3.java | 18 ++++++++++++++++++
 .../net/openhft/chronicle/map/Issue42.java     |  4 +++-
 .../openhft/chronicle/map/KeySizesTest.java    |  4 +++-
 .../map/NodeDiscoveryBroadcasterTest.java      | 18 ++++++++++++++++++
 .../openhft/chronicle/map/OSResizesMain.java   |  4 +++-
 .../openhft/chronicle/map/PageLatencyMain.java |  4 +++-
 .../chronicle/map/PostChannelCreationTest.java |  4 +++-
 .../map/ProcessInstanceLimiterMain.java        |  4 +++-
 .../map/RecursiveRefereneChMapTest.java        |  4 +++-
 .../map/ReplicatedChronicleMapTest.java        |  4 +++-
 .../chronicle/map/ReplicationCheckingMap.java  |  4 +++-
 .../openhft/chronicle/map/SampleValues.java    |  4 +++-
 .../openhft/chronicle/map/SerializerTest.java  | 18 ++++++++++++++++++
 .../chronicle/map/SingleMapChannelTest.java    |  4 +++-
 .../chronicle/map/StatelessClientTest.java     | 18 ++++++++++++++++++
 .../map/TCPSocketReplication4WayMapTest.java   |  4 +++-
 .../TCPSocketReplicationBootStrapTests.java    |  4 +++-
 .../map/TCPSocketReplicationIntValueTest.java  |  4 +++-
 .../map/TCPSocketReplicationTest.java          |  4 +++-
 ...TCPSocketReplicationTest3VoidValueTest.java |  4 +++-
 .../map/TCPSocketReplicationTest3way.java      |  4 +++-
 ...ocketReplicationTest3wayPutReturnsNull.java |  4 +++-
 ...TCPSocketReplicationTestPostConnection.java |  4 +++-
 .../chronicle/map/TestBooleanValues.java       | 18 ++++++++++++++++++
 .../map/TimeBasedReplicationTests.java         |  4 +++-
 .../map/TwoMapOnDifferentServers.java          |  4 +++-
 .../map/UDPSocketReplicationTest.java          |  4 +++-
 .../map/example/DistributedSequenceMain.java   | 18 ++++++++++++++++++
 .../map/fromdocs/BondVOInterface.java          |  4 +++-
 .../OpenJDKAndHashMapExamplesTest.java         |  4 +++-
 .../map/fromdocs/StringEncodingExamples.java   |  4 +++-
 .../pingpong_latency/PingPongAddLeft.java      |  4 +++-
 .../pingpong_latency/PingPongAddRight.java     |  4 +++-
 .../pingpong_latency/PingPongCASLeft.java      |  4 +++-
 .../pingpong_latency/PingPongCASRight.java     |  4 +++-
 .../pingpong_latency/PingPongLockLeft.java     |  4 +++-
 .../pingpong_latency/PingPongLockRight.java    |  4 +++-
 .../chronicle/map/ipc/StateMachineData.java    |  4 +++-
 .../map/ipc/StateMachineProcessor.java         |  4 +++-
 .../chronicle/map/ipc/StateMachineState.java   |  4 +++-
 .../map/ipc/StateMachineTutorial.java          |  4 +++-
 .../chronicle/map/jrs166/JSR166TestCase.java   |  4 +++-
 .../map/jrs166/map/ChronicleMapTest.java       |  4 +++-
 .../chronicle/map/jrs166/map/LoopHelpers.java  |  4 +++-
 .../chronicle/map/jrs166/map/MapCheck.java     |  4 +++-
 .../jrs166/map/StatelessChronicleMapTest.java  |  4 +++-
 .../map/utility/ProcessInstanceLimiter.java    |  4 +++-
 .../chronicle/set/ChronicleSetBuilderTest.java | 18 ++++++++++++++++++
 .../SetForTCPSocketReplicationTest3way.java    |  4 +++-
 .../openhft/lang/values/IntValue$$Native.java  |  4 +++-
 .../openhft/lang/values/LongValue$$Native.java |  4 +++-
 145 files changed, 720 insertions(+), 126 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8862cc7c4..b428f1ef5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+  ~ Copyright 2014 Higher Frequency Trading
+  ~
+  ~ http://www.higherfrequencytrading.com
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/ChronicleHash.java b/src/main/java/net/openhft/chronicle/common/ChronicleHash.java
index 5dad9e451..d28cf798f 100644
--- a/src/main/java/net/openhft/chronicle/common/ChronicleHash.java
+++ b/src/main/java/net/openhft/chronicle/common/ChronicleHash.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/ChronicleHashBuilder.java b/src/main/java/net/openhft/chronicle/common/ChronicleHashBuilder.java
index e7238f618..0d9519491 100644
--- a/src/main/java/net/openhft/chronicle/common/ChronicleHashBuilder.java
+++ b/src/main/java/net/openhft/chronicle/common/ChronicleHashBuilder.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.common;
 
 import net.openhft.chronicle.map.*;
diff --git a/src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListener.java b/src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListener.java
index 900f0166f..2e6a08185 100644
--- a/src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListener.java
+++ b/src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListener.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListeners.java b/src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListeners.java
index e86eaee7b..8d7976088 100644
--- a/src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListeners.java
+++ b/src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListeners.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/StatelessBuilder.java b/src/main/java/net/openhft/chronicle/common/StatelessBuilder.java
index 4098b6b9e..ddc3c8a13 100644
--- a/src/main/java/net/openhft/chronicle/common/StatelessBuilder.java
+++ b/src/main/java/net/openhft/chronicle/common/StatelessBuilder.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.common;
 
 import java.net.InetSocketAddress;
diff --git a/src/main/java/net/openhft/chronicle/common/TimeProvider.java b/src/main/java/net/openhft/chronicle/common/TimeProvider.java
index 8dbda2f29..6c80de2cb 100644
--- a/src/main/java/net/openhft/chronicle/common/TimeProvider.java
+++ b/src/main/java/net/openhft/chronicle/common/TimeProvider.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/exceptions/IORuntimeException.java b/src/main/java/net/openhft/chronicle/common/exceptions/IORuntimeException.java
index a654ca675..5a6f58bd1 100644
--- a/src/main/java/net/openhft/chronicle/common/exceptions/IORuntimeException.java
+++ b/src/main/java/net/openhft/chronicle/common/exceptions/IORuntimeException.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.common.exceptions;
 
 import java.io.IOException;
diff --git a/src/main/java/net/openhft/chronicle/common/exceptions/TimeoutRuntimeException.java b/src/main/java/net/openhft/chronicle/common/exceptions/TimeoutRuntimeException.java
index ad4c45d81..3493a9074 100644
--- a/src/main/java/net/openhft/chronicle/common/exceptions/TimeoutRuntimeException.java
+++ b/src/main/java/net/openhft/chronicle/common/exceptions/TimeoutRuntimeException.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.common.exceptions;
 
 /**
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/AgileBytesMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/AgileBytesMarshaller.java
index 08ca9ddbf..1a9250042 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/AgileBytesMarshaller.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/AgileBytesMarshaller.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java b/src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java
index b9602fd50..dd92e4401 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/BytesReader.java b/src/main/java/net/openhft/chronicle/common/serialization/BytesReader.java
index 1ea181716..ddbd3fd15 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/BytesReader.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/BytesReader.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/BytesReaders.java b/src/main/java/net/openhft/chronicle/common/serialization/BytesReaders.java
index 83f9514a3..fb87264cf 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/BytesReaders.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/BytesReaders.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/BytesWriter.java b/src/main/java/net/openhft/chronicle/common/serialization/BytesWriter.java
index bccbefd99..dce454a0d 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/BytesWriter.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/BytesWriter.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/CopyingMetaBytesInterop.java b/src/main/java/net/openhft/chronicle/common/serialization/CopyingMetaBytesInterop.java
index f7264d2d9..21edd4e8e 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/CopyingMetaBytesInterop.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/CopyingMetaBytesInterop.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInterop.java b/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInterop.java
index 3f8f476f4..8eccff07b 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInterop.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInterop.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInteropProvider.java b/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInteropProvider.java
index f0b0e8863..948da2a2b 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInteropProvider.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInteropProvider.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/Hasher.java b/src/main/java/net/openhft/chronicle/common/serialization/Hasher.java
index 12b69be1d..365a6eb6a 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/Hasher.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/Hasher.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesInterop.java b/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesInterop.java
index 9d2e3446e..b4e75c4c7 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesInterop.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesInterop.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesWriter.java b/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesWriter.java
index e99f844d6..bc7b0ccff 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesWriter.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesWriter.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/MetaProvider.java b/src/main/java/net/openhft/chronicle/common/serialization/MetaProvider.java
index 54553f6f6..0b48dd847 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/MetaProvider.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/MetaProvider.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshaller.java
index cb1449db8..bbce57e4c 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshaller.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshaller.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshallers.java b/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshallers.java
index 2a4274a3d..ba7de3954 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshallers.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshallers.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteArrayMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteArrayMarshaller.java
index 98c839205..0762bfc09 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteArrayMarshaller.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteArrayMarshaller.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteableMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteableMarshaller.java
index fd9fdb7dd..fc2929e04 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteableMarshaller.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteableMarshaller.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/CharArrayMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/CharArrayMarshaller.java
index b7cdbca60..6a0e0a034 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/impl/CharArrayMarshaller.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/CharArrayMarshaller.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceReader.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceReader.java
index 44d405ac7..c47902ccb 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceReader.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceReader.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceWriter.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceWriter.java
index aff02a086..17900819f 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceWriter.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceWriter.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/DoubleMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/DoubleMarshaller.java
index 7bcf301ec..21b0ea376 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/impl/DoubleMarshaller.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/DoubleMarshaller.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/IntegerMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/IntegerMarshaller.java
index 2eb344f53..7c316eb4a 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/impl/IntegerMarshaller.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/IntegerMarshaller.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/LongMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/LongMarshaller.java
index fe39508d9..902862c31 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/impl/LongMarshaller.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/LongMarshaller.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/VoidMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/VoidMarshaller.java
index 4e36d1e66..2dbeb61a6 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/impl/VoidMarshaller.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/VoidMarshaller.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/threadlocal/Provider.java b/src/main/java/net/openhft/chronicle/common/threadlocal/Provider.java
index acbdd8be9..9d7bd3f3d 100644
--- a/src/main/java/net/openhft/chronicle/common/threadlocal/Provider.java
+++ b/src/main/java/net/openhft/chronicle/common/threadlocal/Provider.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/threadlocal/StatefulCopyable.java b/src/main/java/net/openhft/chronicle/common/threadlocal/StatefulCopyable.java
index 460451697..8b80b7c1c 100644
--- a/src/main/java/net/openhft/chronicle/common/threadlocal/StatefulCopyable.java
+++ b/src/main/java/net/openhft/chronicle/common/threadlocal/StatefulCopyable.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/common/threadlocal/ThreadLocalCopies.java b/src/main/java/net/openhft/chronicle/common/threadlocal/ThreadLocalCopies.java
index 8c137cb25..b8713182c 100644
--- a/src/main/java/net/openhft/chronicle/common/threadlocal/ThreadLocalCopies.java
+++ b/src/main/java/net/openhft/chronicle/common/threadlocal/ThreadLocalCopies.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java
index 9cae22389..b0fc6df1c 100644
--- a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/Alignment.java b/src/main/java/net/openhft/chronicle/map/Alignment.java
index 764cd33d2..d2ef30ae0 100644
--- a/src/main/java/net/openhft/chronicle/map/Alignment.java
+++ b/src/main/java/net/openhft/chronicle/map/Alignment.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/ChannelProvider.java b/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
index a59519c97..9114bd353 100644
--- a/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
+++ b/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/ChannelProviderBuilder.java b/src/main/java/net/openhft/chronicle/map/ChannelProviderBuilder.java
index 38726cbff..c002db915 100644
--- a/src/main/java/net/openhft/chronicle/map/ChannelProviderBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChannelProviderBuilder.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java
index fac994855..0649643ef 100644
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
index aa579a5f3..ed40a3ad5 100644
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/CloseablesManager.java b/src/main/java/net/openhft/chronicle/map/CloseablesManager.java
index da397ea7a..d2fb0517d 100644
--- a/src/main/java/net/openhft/chronicle/map/CloseablesManager.java
+++ b/src/main/java/net/openhft/chronicle/map/CloseablesManager.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java b/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java
index 977b81985..c4dedf426 100644
--- a/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java
+++ b/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/DefaultValueProvider.java b/src/main/java/net/openhft/chronicle/map/DefaultValueProvider.java
index a179e12ee..f56d9428e 100644
--- a/src/main/java/net/openhft/chronicle/map/DefaultValueProvider.java
+++ b/src/main/java/net/openhft/chronicle/map/DefaultValueProvider.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/IdentifierListener.java b/src/main/java/net/openhft/chronicle/map/IdentifierListener.java
index 65d59d1a0..d1b12f369 100644
--- a/src/main/java/net/openhft/chronicle/map/IdentifierListener.java
+++ b/src/main/java/net/openhft/chronicle/map/IdentifierListener.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.map;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/net/openhft/chronicle/map/IntIntMultiMap.java b/src/main/java/net/openhft/chronicle/map/IntIntMultiMap.java
index daf585ea1..e51c4f9ae 100644
--- a/src/main/java/net/openhft/chronicle/map/IntIntMultiMap.java
+++ b/src/main/java/net/openhft/chronicle/map/IntIntMultiMap.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/MapEventListener.java b/src/main/java/net/openhft/chronicle/map/MapEventListener.java
index 36a6450d7..98ace6a80 100644
--- a/src/main/java/net/openhft/chronicle/map/MapEventListener.java
+++ b/src/main/java/net/openhft/chronicle/map/MapEventListener.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/MapEventListeners.java b/src/main/java/net/openhft/chronicle/map/MapEventListeners.java
index 4f23ffa18..5c1b728c1 100644
--- a/src/main/java/net/openhft/chronicle/map/MapEventListeners.java
+++ b/src/main/java/net/openhft/chronicle/map/MapEventListeners.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
index ad2723a86..7368359c7 100644
--- a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
+++ b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.map;
 
 import net.openhft.lang.collection.ATSDirectBitSet;
diff --git a/src/main/java/net/openhft/chronicle/map/NullValueProvider.java b/src/main/java/net/openhft/chronicle/map/NullValueProvider.java
index c92ec6948..f37e7e185 100644
--- a/src/main/java/net/openhft/chronicle/map/NullValueProvider.java
+++ b/src/main/java/net/openhft/chronicle/map/NullValueProvider.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/Objects.java b/src/main/java/net/openhft/chronicle/map/Objects.java
index 44b6ee82b..f3058681c 100644
--- a/src/main/java/net/openhft/chronicle/map/Objects.java
+++ b/src/main/java/net/openhft/chronicle/map/Objects.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/Replica.java b/src/main/java/net/openhft/chronicle/map/Replica.java
index fcc698273..d118ead99 100644
--- a/src/main/java/net/openhft/chronicle/map/Replica.java
+++ b/src/main/java/net/openhft/chronicle/map/Replica.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index e421278c4..a26724629 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/ReplicationConfig.java b/src/main/java/net/openhft/chronicle/map/ReplicationConfig.java
index a72abed48..1547343c4 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicationConfig.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicationConfig.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.map;
 
 /**
diff --git a/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java b/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java
index 7a63bf17e..a235cc686 100644
--- a/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/Serializer.java b/src/main/java/net/openhft/chronicle/map/Serializer.java
index fc2b37a5f..fe62c2bdf 100644
--- a/src/main/java/net/openhft/chronicle/map/Serializer.java
+++ b/src/main/java/net/openhft/chronicle/map/Serializer.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.map;
 
 import net.openhft.chronicle.common.threadlocal.Provider;
diff --git a/src/main/java/net/openhft/chronicle/map/SharedSegment.java b/src/main/java/net/openhft/chronicle/map/SharedSegment.java
index 5e87e98ef..bb2c5113b 100644
--- a/src/main/java/net/openhft/chronicle/map/SharedSegment.java
+++ b/src/main/java/net/openhft/chronicle/map/SharedSegment.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
index 6695a20a1..878f5947b 100644
--- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.map;
 
 import com.sun.jdi.connect.spi.ClosedConnectionException;
diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicationConfig.java b/src/main/java/net/openhft/chronicle/map/TcpReplicationConfig.java
index 5bce434ab..9e6039500 100644
--- a/src/main/java/net/openhft/chronicle/map/TcpReplicationConfig.java
+++ b/src/main/java/net/openhft/chronicle/map/TcpReplicationConfig.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
index 0fe9fd7f0..b19c9765e 100644
--- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/ThrottlingConfig.java b/src/main/java/net/openhft/chronicle/map/ThrottlingConfig.java
index 234cbcaa2..103b46356 100644
--- a/src/main/java/net/openhft/chronicle/map/ThrottlingConfig.java
+++ b/src/main/java/net/openhft/chronicle/map/ThrottlingConfig.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java
index 26c20d123..532129b75 100644
--- a/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/UdpReplicationConfig.java b/src/main/java/net/openhft/chronicle/map/UdpReplicationConfig.java
index 15a3382d7..9d8a2c983 100644
--- a/src/main/java/net/openhft/chronicle/map/UdpReplicationConfig.java
+++ b/src/main/java/net/openhft/chronicle/map/UdpReplicationConfig.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/UdpReplicationConfigBean.java b/src/main/java/net/openhft/chronicle/map/UdpReplicationConfigBean.java
index 441aa4eac..2b61ed402 100644
--- a/src/main/java/net/openhft/chronicle/map/UdpReplicationConfigBean.java
+++ b/src/main/java/net/openhft/chronicle/map/UdpReplicationConfigBean.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.map;
 
 import java.net.InetAddress;
diff --git a/src/main/java/net/openhft/chronicle/map/UdpReplicator.java b/src/main/java/net/openhft/chronicle/map/UdpReplicator.java
index e32fac525..5ff69f913 100644
--- a/src/main/java/net/openhft/chronicle/map/UdpReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/UdpReplicator.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index 13775f0a5..650b84b6a 100644
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/VanillaIntIntMultiMap.java b/src/main/java/net/openhft/chronicle/map/VanillaIntIntMultiMap.java
index aff236ba7..a10c620ee 100644
--- a/src/main/java/net/openhft/chronicle/map/VanillaIntIntMultiMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaIntIntMultiMap.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/map/VanillaShortShortMultiMap.java b/src/main/java/net/openhft/chronicle/map/VanillaShortShortMultiMap.java
index 09a8f7171..4e7526985 100644
--- a/src/main/java/net/openhft/chronicle/map/VanillaShortShortMultiMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaShortShortMultiMap.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/set/ChronicleSet.java b/src/main/java/net/openhft/chronicle/set/ChronicleSet.java
index 13d184cbf..14c87cbeb 100644
--- a/src/main/java/net/openhft/chronicle/set/ChronicleSet.java
+++ b/src/main/java/net/openhft/chronicle/set/ChronicleSet.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.set;
 
 import net.openhft.chronicle.common.ChronicleHash;
diff --git a/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java b/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java
index 036140fd6..d841202fb 100644
--- a/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java
+++ b/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/set/DummyValue.java b/src/main/java/net/openhft/chronicle/set/DummyValue.java
index 1d73a070b..5145f9239 100644
--- a/src/main/java/net/openhft/chronicle/set/DummyValue.java
+++ b/src/main/java/net/openhft/chronicle/set/DummyValue.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java b/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java
index a07d8f71c..fcafdccf0 100644
--- a/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java
+++ b/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/openhft/chronicle/set/SetFromMap.java b/src/main/java/net/openhft/chronicle/set/SetFromMap.java
index cb513154c..639184432 100644
--- a/src/main/java/net/openhft/chronicle/set/SetFromMap.java
+++ b/src/main/java/net/openhft/chronicle/set/SetFromMap.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eg/BigData.java b/src/test/java/eg/BigData.java
index 3dce277f5..423b014f5 100644
--- a/src/test/java/eg/BigData.java
+++ b/src/test/java/eg/BigData.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/AcquireGetUsingMain.java b/src/test/java/net/openhft/chronicle/map/AcquireGetUsingMain.java
index 0f961d832..db8ae2328 100644
--- a/src/test/java/net/openhft/chronicle/map/AcquireGetUsingMain.java
+++ b/src/test/java/net/openhft/chronicle/map/AcquireGetUsingMain.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/BitUnitTest.java b/src/test/java/net/openhft/chronicle/map/BitUnitTest.java
index 2a86710a3..8341c13c2 100644
--- a/src/test/java/net/openhft/chronicle/map/BitUnitTest.java
+++ b/src/test/java/net/openhft/chronicle/map/BitUnitTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/Builder.java b/src/test/java/net/openhft/chronicle/map/Builder.java
index b8c713e97..e220bc2a1 100644
--- a/src/test/java/net/openhft/chronicle/map/Builder.java
+++ b/src/test/java/net/openhft/chronicle/map/Builder.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/ByteableIntValueMarshaller.java b/src/test/java/net/openhft/chronicle/map/ByteableIntValueMarshaller.java
index 31331bfe3..f7d2d05ad 100644
--- a/src/test/java/net/openhft/chronicle/map/ByteableIntValueMarshaller.java
+++ b/src/test/java/net/openhft/chronicle/map/ByteableIntValueMarshaller.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/ByteableLongValueMarshaller.java b/src/test/java/net/openhft/chronicle/map/ByteableLongValueMarshaller.java
index e35eacb91..7190d4fd9 100644
--- a/src/test/java/net/openhft/chronicle/map/ByteableLongValueMarshaller.java
+++ b/src/test/java/net/openhft/chronicle/map/ByteableLongValueMarshaller.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/CHMLatencyTestMain.java b/src/test/java/net/openhft/chronicle/map/CHMLatencyTestMain.java
index 310c3fecf..6b22de110 100644
--- a/src/test/java/net/openhft/chronicle/map/CHMLatencyTestMain.java
+++ b/src/test/java/net/openhft/chronicle/map/CHMLatencyTestMain.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java b/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java
index 759678342..66f884ec4 100644
--- a/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java
+++ b/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/CHMTest5.java b/src/test/java/net/openhft/chronicle/map/CHMTest5.java
index fe653bb5e..7520aeb13 100644
--- a/src/test/java/net/openhft/chronicle/map/CHMTest5.java
+++ b/src/test/java/net/openhft/chronicle/map/CHMTest5.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/CHMTestIterator1.java b/src/test/java/net/openhft/chronicle/map/CHMTestIterator1.java
index e5781f76d..e4b9c1e56 100644
--- a/src/test/java/net/openhft/chronicle/map/CHMTestIterator1.java
+++ b/src/test/java/net/openhft/chronicle/map/CHMTestIterator1.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java b/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java
index d16f18319..ff82cb2dc 100644
--- a/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java
+++ b/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
index 36b245765..db04d7d83 100644
--- a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/ConcurrentMap8Test.java b/src/test/java/net/openhft/chronicle/map/ConcurrentMap8Test.java
index 0bf73407a..1d1596e20 100644
--- a/src/test/java/net/openhft/chronicle/map/ConcurrentMap8Test.java
+++ b/src/test/java/net/openhft/chronicle/map/ConcurrentMap8Test.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/ConstantSizeBySampleTest.java b/src/test/java/net/openhft/chronicle/map/ConstantSizeBySampleTest.java
index 46b902b24..5bbea3e17 100644
--- a/src/test/java/net/openhft/chronicle/map/ConstantSizeBySampleTest.java
+++ b/src/test/java/net/openhft/chronicle/map/ConstantSizeBySampleTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/DefaultValueTest.java b/src/test/java/net/openhft/chronicle/map/DefaultValueTest.java
index d21f46c2e..ddcbcb58a 100644
--- a/src/test/java/net/openhft/chronicle/map/DefaultValueTest.java
+++ b/src/test/java/net/openhft/chronicle/map/DefaultValueTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java b/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java
index d51c6f0b7..e8095922d 100644
--- a/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.map;
 
 import net.openhft.lang.values.LongValue;
diff --git a/src/test/java/net/openhft/chronicle/map/GuavaTest.java b/src/test/java/net/openhft/chronicle/map/GuavaTest.java
index 021ca0e8c..4c096767d 100644
--- a/src/test/java/net/openhft/chronicle/map/GuavaTest.java
+++ b/src/test/java/net/openhft/chronicle/map/GuavaTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/Histogram.java b/src/test/java/net/openhft/chronicle/map/Histogram.java
index 23b052db5..e2b1124d1 100644
--- a/src/test/java/net/openhft/chronicle/map/Histogram.java
+++ b/src/test/java/net/openhft/chronicle/map/Histogram.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/HistogramTest.java b/src/test/java/net/openhft/chronicle/map/HistogramTest.java
index 9d8809ae0..0ccbf415f 100644
--- a/src/test/java/net/openhft/chronicle/map/HistogramTest.java
+++ b/src/test/java/net/openhft/chronicle/map/HistogramTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/IntIntMultiMapTest.java b/src/test/java/net/openhft/chronicle/map/IntIntMultiMapTest.java
index e5381c27f..f1e48373d 100644
--- a/src/test/java/net/openhft/chronicle/map/IntIntMultiMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/IntIntMultiMapTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/IntValueMapTest.java b/src/test/java/net/openhft/chronicle/map/IntValueMapTest.java
index eccda7174..59a14633b 100644
--- a/src/test/java/net/openhft/chronicle/map/IntValueMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/IntValueMapTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/Issue3.java b/src/test/java/net/openhft/chronicle/map/Issue3.java
index faf02b435..e622a4afc 100644
--- a/src/test/java/net/openhft/chronicle/map/Issue3.java
+++ b/src/test/java/net/openhft/chronicle/map/Issue3.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.map;
 
 import net.openhft.chronicle.set.ChronicleSet;
diff --git a/src/test/java/net/openhft/chronicle/map/Issue42.java b/src/test/java/net/openhft/chronicle/map/Issue42.java
index e60ce5cc3..cd06fd5d4 100644
--- a/src/test/java/net/openhft/chronicle/map/Issue42.java
+++ b/src/test/java/net/openhft/chronicle/map/Issue42.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/KeySizesTest.java b/src/test/java/net/openhft/chronicle/map/KeySizesTest.java
index 0135a53c6..b9af5ffc1 100644
--- a/src/test/java/net/openhft/chronicle/map/KeySizesTest.java
+++ b/src/test/java/net/openhft/chronicle/map/KeySizesTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java
index 051b8440b..b309b8166 100644
--- a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java
+++ b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.map;
 
 import junit.framework.TestCase;
diff --git a/src/test/java/net/openhft/chronicle/map/OSResizesMain.java b/src/test/java/net/openhft/chronicle/map/OSResizesMain.java
index 9d116eaa9..da15a2848 100644
--- a/src/test/java/net/openhft/chronicle/map/OSResizesMain.java
+++ b/src/test/java/net/openhft/chronicle/map/OSResizesMain.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/PageLatencyMain.java b/src/test/java/net/openhft/chronicle/map/PageLatencyMain.java
index fe3f73efe..c1caf3d7e 100644
--- a/src/test/java/net/openhft/chronicle/map/PageLatencyMain.java
+++ b/src/test/java/net/openhft/chronicle/map/PageLatencyMain.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java b/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java
index a75138d6a..fa61053bf 100644
--- a/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java
+++ b/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java b/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java
index bccc6f57c..5bea1f6ae 100644
--- a/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java
+++ b/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/RecursiveRefereneChMapTest.java b/src/test/java/net/openhft/chronicle/map/RecursiveRefereneChMapTest.java
index ce3aa3de2..790b84265 100644
--- a/src/test/java/net/openhft/chronicle/map/RecursiveRefereneChMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/RecursiveRefereneChMapTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java
index 5a7a69c24..a7d5d7d50 100644
--- a/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java b/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java
index cf06064cc..886219c97 100644
--- a/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java
+++ b/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/SampleValues.java b/src/test/java/net/openhft/chronicle/map/SampleValues.java
index bc2ac49d7..f0b149287 100644
--- a/src/test/java/net/openhft/chronicle/map/SampleValues.java
+++ b/src/test/java/net/openhft/chronicle/map/SampleValues.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/SerializerTest.java b/src/test/java/net/openhft/chronicle/map/SerializerTest.java
index f6f1a00df..fbf37079c 100644
--- a/src/test/java/net/openhft/chronicle/map/SerializerTest.java
+++ b/src/test/java/net/openhft/chronicle/map/SerializerTest.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.map;
 
 import net.openhft.lang.io.ByteBufferBytes;
diff --git a/src/test/java/net/openhft/chronicle/map/SingleMapChannelTest.java b/src/test/java/net/openhft/chronicle/map/SingleMapChannelTest.java
index f5162928f..c82e03cc3 100644
--- a/src/test/java/net/openhft/chronicle/map/SingleMapChannelTest.java
+++ b/src/test/java/net/openhft/chronicle/map/SingleMapChannelTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
index ff1a990f6..f216190f7 100644
--- a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
+++ b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.map;
 
 import org.junit.Ignore;
diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java
index 15033398e..2eec55000 100644
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationBootStrapTests.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationBootStrapTests.java
index 70873cbee..115eb6718 100644
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationBootStrapTests.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationBootStrapTests.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationIntValueTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationIntValueTest.java
index 1342d146d..3c34e0d2a 100644
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationIntValueTest.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationIntValueTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java
index 7b619711f..7ba19246e 100644
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3VoidValueTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3VoidValueTest.java
index 50015ce16..10311205b 100644
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3VoidValueTest.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3VoidValueTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3way.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3way.java
index 519b225bf..28c8a5eb8 100644
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3way.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3way.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java
index 19a100e13..a26b74b8b 100644
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTestPostConnection.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTestPostConnection.java
index 9f1f4f25e..c2656ddd5 100644
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTestPostConnection.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTestPostConnection.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/TestBooleanValues.java b/src/test/java/net/openhft/chronicle/map/TestBooleanValues.java
index 2dc3fb34e..eff5fa333 100644
--- a/src/test/java/net/openhft/chronicle/map/TestBooleanValues.java
+++ b/src/test/java/net/openhft/chronicle/map/TestBooleanValues.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.map;
 
 import org.junit.Assert;
diff --git a/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTests.java b/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTests.java
index 405ed630c..f273856a6 100644
--- a/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTests.java
+++ b/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTests.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java b/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java
index 6ea3a06cd..be2c08117 100644
--- a/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java
+++ b/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java b/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java
index 3c0c72e91..37a5cc17a 100644
--- a/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java
+++ b/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/example/DistributedSequenceMain.java b/src/test/java/net/openhft/chronicle/map/example/DistributedSequenceMain.java
index eb9346b6e..562ad1a71 100644
--- a/src/test/java/net/openhft/chronicle/map/example/DistributedSequenceMain.java
+++ b/src/test/java/net/openhft/chronicle/map/example/DistributedSequenceMain.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.map.example;
 
 import net.openhft.chronicle.map.ChronicleMap;
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/BondVOInterface.java b/src/test/java/net/openhft/chronicle/map/fromdocs/BondVOInterface.java
index d38903b09..d1b5e4814 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/BondVOInterface.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/BondVOInterface.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java b/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java
index b83270074..4cb1b3a38 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamples.java b/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamples.java
index 83cbc8eec..57e214c9f 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamples.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamples.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongAddLeft.java b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongAddLeft.java
index e7beb0025..80e8d3164 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongAddLeft.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongAddLeft.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongAddRight.java b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongAddRight.java
index bfd65d81d..82cc6d708 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongAddRight.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongAddRight.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongCASLeft.java b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongCASLeft.java
index 47ec2aaa0..df78c1860 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongCASLeft.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongCASLeft.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongCASRight.java b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongCASRight.java
index ab699a942..17371d3ed 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongCASRight.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongCASRight.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongLockLeft.java b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongLockLeft.java
index a10437ba0..2fa0ae23a 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongLockLeft.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongLockLeft.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongLockRight.java b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongLockRight.java
index 8faccb20e..5e425790d 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongLockRight.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongLockRight.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/ipc/StateMachineData.java b/src/test/java/net/openhft/chronicle/map/ipc/StateMachineData.java
index ab91c933a..360b8ea36 100644
--- a/src/test/java/net/openhft/chronicle/map/ipc/StateMachineData.java
+++ b/src/test/java/net/openhft/chronicle/map/ipc/StateMachineData.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/ipc/StateMachineProcessor.java b/src/test/java/net/openhft/chronicle/map/ipc/StateMachineProcessor.java
index 8c4d83c2b..84b5aa578 100644
--- a/src/test/java/net/openhft/chronicle/map/ipc/StateMachineProcessor.java
+++ b/src/test/java/net/openhft/chronicle/map/ipc/StateMachineProcessor.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/ipc/StateMachineState.java b/src/test/java/net/openhft/chronicle/map/ipc/StateMachineState.java
index 859a317ae..68d0b8338 100644
--- a/src/test/java/net/openhft/chronicle/map/ipc/StateMachineState.java
+++ b/src/test/java/net/openhft/chronicle/map/ipc/StateMachineState.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/ipc/StateMachineTutorial.java b/src/test/java/net/openhft/chronicle/map/ipc/StateMachineTutorial.java
index b1ff1d727..9abbd9dd4 100644
--- a/src/test/java/net/openhft/chronicle/map/ipc/StateMachineTutorial.java
+++ b/src/test/java/net/openhft/chronicle/map/ipc/StateMachineTutorial.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/JSR166TestCase.java b/src/test/java/net/openhft/chronicle/map/jrs166/JSR166TestCase.java
index 5856e652b..6b6b9519f 100644
--- a/src/test/java/net/openhft/chronicle/map/jrs166/JSR166TestCase.java
+++ b/src/test/java/net/openhft/chronicle/map/jrs166/JSR166TestCase.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java
index b422a87b4..93a67c1ea 100644
--- a/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/map/LoopHelpers.java b/src/test/java/net/openhft/chronicle/map/jrs166/map/LoopHelpers.java
index f3dd5efcc..6d0279a4a 100644
--- a/src/test/java/net/openhft/chronicle/map/jrs166/map/LoopHelpers.java
+++ b/src/test/java/net/openhft/chronicle/map/jrs166/map/LoopHelpers.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/map/MapCheck.java b/src/test/java/net/openhft/chronicle/map/jrs166/map/MapCheck.java
index 702b041ab..155b4bd0a 100644
--- a/src/test/java/net/openhft/chronicle/map/jrs166/map/MapCheck.java
+++ b/src/test/java/net/openhft/chronicle/map/jrs166/map/MapCheck.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java
index 458c87052..04dada102 100644
--- a/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java b/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java
index 80ce0fcca..f9b927cf8 100644
--- a/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java
+++ b/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/set/ChronicleSetBuilderTest.java b/src/test/java/net/openhft/chronicle/set/ChronicleSetBuilderTest.java
index fbfc46d15..7bab578b6 100644
--- a/src/test/java/net/openhft/chronicle/set/ChronicleSetBuilderTest.java
+++ b/src/test/java/net/openhft/chronicle/set/ChronicleSetBuilderTest.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.openhft.chronicle.set;
 
 import org.junit.Assert;
diff --git a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java
index b78669206..599874b91 100644
--- a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java
+++ b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/lang/values/IntValue$$Native.java b/src/test/java/net/openhft/lang/values/IntValue$$Native.java
index e01dc0782..686a4ec49 100644
--- a/src/test/java/net/openhft/lang/values/IntValue$$Native.java
+++ b/src/test/java/net/openhft/lang/values/IntValue$$Native.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/lang/values/LongValue$$Native.java b/src/test/java/net/openhft/lang/values/LongValue$$Native.java
index 3e20fc0a9..9cdfd314f 100644
--- a/src/test/java/net/openhft/lang/values/LongValue$$Native.java
+++ b/src/test/java/net/openhft/lang/values/LongValue$$Native.java
@@ -1,5 +1,7 @@
 /*
- * Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
+ * Copyright 2014 Higher Frequency Trading
+ *
+ * http://www.higherfrequencytrading.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 9ace610ca5bb156aa7a9d004eab3774829cf1cdc Mon Sep 17 00:00:00 2001
From: Peter Lawrey <peter.lawrey@higherfrequencytrading.com>
Date: Fri, 24 Oct 2014 11:48:51 +0100
Subject: [PATCH 3/3] Fixed Javadoc errors for Java 8

---
 .../chronicle/common/ChronicleHash.java       |  2 +-
 .../common/ChronicleHashBuilder.java          |  1 +
 .../common/serialization/BytesInterop.java    |  2 +-
 .../chronicle/map/ChannelProvider.java        |  1 +
 .../chronicle/map/ChronicleMapBuilder.java    | 52 +++++++++----------
 .../net/openhft/chronicle/map/Replica.java    |  4 +-
 .../chronicle/map/ReplicatedChronicleMap.java | 33 +++++++-----
 .../openhft/chronicle/map/TcpReplicator.java  |  2 +-
 .../chronicle/map/ThrottlingConfig.java       |  2 +-
 .../chronicle/map/VanillaChronicleMap.java    | 10 ++--
 .../chronicle/map/jrs166/JSR166TestCase.java  | 30 +++++------
 .../map/utility/ProcessInstanceLimiter.java   | 18 +++----
 12 files changed, 84 insertions(+), 73 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/common/ChronicleHash.java b/src/main/java/net/openhft/chronicle/common/ChronicleHash.java
index d28cf798f..c582f9e30 100644
--- a/src/main/java/net/openhft/chronicle/common/ChronicleHash.java
+++ b/src/main/java/net/openhft/chronicle/common/ChronicleHash.java
@@ -37,7 +37,7 @@ public interface ChronicleHash extends Closeable {
      *
      * @return the file this {@link ChronicleMap} or {@link ChronicleSet} is mapped to,
      *         or {@code null} if it is not mapped to any file
-     * @see ChronicleHashBuilder#create(File)
+     * @see ChronicleHashBuilder#file(java.io.File)
      * @see ChronicleHashBuilder#create()
      */
     File file();
diff --git a/src/main/java/net/openhft/chronicle/common/ChronicleHashBuilder.java b/src/main/java/net/openhft/chronicle/common/ChronicleHashBuilder.java
index 0d9519491..8632672c4 100644
--- a/src/main/java/net/openhft/chronicle/common/ChronicleHashBuilder.java
+++ b/src/main/java/net/openhft/chronicle/common/ChronicleHashBuilder.java
@@ -390,6 +390,7 @@ public interface ChronicleHashBuilder<K, C extends ChronicleHash,
      * @param file the file with existing hash container or a desired location of a new off-heap
      *             persisted hash container
      * @return this builder back
+     * @throws IOException If the file cannot be created and read.
      * @see ChronicleHash#file()
      * @see ChronicleHash#close()
      */
diff --git a/src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java b/src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java
index dd92e4401..f9431ff2f 100644
--- a/src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java
+++ b/src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java
@@ -25,7 +25,7 @@ import net.openhft.lang.model.Byteable;
  * Marshaller for byte sequences, which are copied to off-heap {@link Bytes}
  * in a very straightforward manner, e. g. {@link Byteable Byteables}, {@code byte[]} arrays,
  * {@code Bytes} themselves. The criterion of this interface applicability --
- * {@link #equals} implementation shouldn't require deserialization and any garbage creation.
+ * {@link Object#equals(Object)} implementation shouldn't require deserialization and any garbage creation.
  *
  * @param <E> type of marshalled objects
  */
diff --git a/src/main/java/net/openhft/chronicle/map/ChannelProvider.java b/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
index 9114bd353..d6f2a61e2 100644
--- a/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
+++ b/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
@@ -211,6 +211,7 @@ public final class ChannelProvider implements Closeable {
      * per channel could be obtained from a single {@code ReplicatingChannel}. The returned replicator could
      * be applied to a map at most once.
      *
+     * @param channel number to create
      * @return a replicator, dedicated to the specified channel
      */
     public ChronicleChannel createChannel(short channel) {
diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
index ed40a3ad5..2d1518502 100644
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
@@ -63,21 +63,21 @@ import static net.openhft.chronicle.map.Objects.builderEquals;
  * ChronicleMap<Key, Value> map1 = builder.create();
  * ChronicleMap<Key, Value> map2 = builder.create();}</pre>
  * i. e. created {@code ChronicleMap} instances don't depend on the builder.
- * <p/>
+ *
  * <p>Use static {@link #of(Class, Class)} method to obtain a {@code ChronicleMapBuilder} instance.
- * <p/>
+ *
  * <p>{@code ChronicleMapBuilder} is mutable, see a note in {@link net.openhft.chronicle.common.ChronicleHashBuilder}
  * interface documentation.
- * <p/>
+ *
  * <p>Later in this documentation, "ChronicleMap" means "ChronicleMaps, created by {@code
  * ChronicleMapBuilder}", unless specified different, because theoretically someone might provide
  * {@code ChronicleMap} implementations with completely different properties.
- * <p/>
+ *
  * <p>{@code ChronicleMap} ("ChronicleMaps, created by {@code ChronicleMapBuilder}") currently
  * doesn't support resizing. That is why you should <i>always</i> configure {@linkplain
  * #entries(long) number of entries} you are going to insert into the created map <i>at most</i>.
  * See {@link #entries(long)} method documentation for more information on this.
- * <p/>
+ *
  * <p>{@code ChronicleMap} allocates memory by equally sized chunks. This size is called {@linkplain
  * #entrySize(int) entry size}, you are strongly recommended to configure it to achieve least memory
  * consumption and best speed. See {@link #entrySize(int)} method documentation for more information
@@ -187,7 +187,7 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
 
     /**
      * {@inheritDoc}
-     * <p/>
+     *
      * <p>Example: if keys in your map(s) are English words in {@link String} form, keys size 10
      * (a bit more than average English word length) would be a good choice: <pre>{@code
      * ChronicleMap<String, LongValue> wordFrequencies = ChronicleMapBuilder
@@ -214,7 +214,7 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
 
     /**
      * {@inheritDoc}
-     * <p/>
+     *
      * <p>For example, if your keys are Git commit hashes:<pre>{@code
      * Map<byte[], String> gitCommitMessagesByHash =
      *     ChronicleMapBuilder.of(byte[].class, String.class)
@@ -238,10 +238,10 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
      * Configures the optimal number of bytes, taken by serialized form of values, put into maps,
      * created by this builder. If value size is always the same, call {@link
      * #constantValueSizeBySample(Object)} method instead of this one.
-     * <p/>
+     *
      * <p>If value is a boxed primitive type or {@link Byteable} subclass, i. e. if value size is
      * known statically, it is automatically accounted and shouldn't be specified by user.
-     * <p/>
+     *
      * <p>If value size varies moderately, specify the size higher than average, but lower than the
      * maximum possible, to minimize average memory overuse. If value size varies in a wide range,
      * it's better to use {@linkplain #entrySize(int) entry size} in "chunk" mode and configure it
@@ -263,10 +263,10 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
      * Configures the constant number of bytes, taken by serialized form of values, put into maps,
      * created by this builder. This is done by providing the {@code sampleValue}, all values should
      * take the same number of bytes in serialized form, as this sample object.
-     * <p/>
+     *
      * <p>If values are of boxed primitive type or {@link Byteable} subclass, i. e. if value size is
      * known statically, it is automatically accounted and this method shouldn't be called.
-     * <p/>
+     *
      * <p>If value size varies, method {@link #valueSize(int)} or {@link #entrySize(int)} should be
      * called instead of this one.
      *
@@ -295,16 +295,16 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
 
     /**
      * {@inheritDoc}
-     * <p/>
+     *
      * <p>In fully default case you can expect entry size to be about 256 bytes. But it is strongly
      * recommended always to configure {@linkplain #keySize(int) key size} and {@linkplain
      * #valueSize(int) value size}, if they couldn't be derived statically.
-     * <p/>
+     *
      * <p>If entry size is not configured explicitly by calling this method, it is computed based on
      * {@linkplain #metaDataBytes(int) meta data bytes}, plus {@linkplain #keySize(int) key size},
      * plus {@linkplain #valueSize(int) value size}, plus a few bytes required by implementations,
      * with respect to {@linkplain #entryAndValueAlignment(Alignment) alignment}.
-     * <p/>
+     *
      * <p>Note that the actual entrySize will be aligned to 4 (default {@linkplain
      * #entryAndValueAlignment(Alignment) entry alignment}). I. e. if you set entry size to 30, the
      * actual entry size will be 32 (30 aligned to 4 bytes). If you don't want entry size to be
@@ -352,15 +352,15 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
     /**
      * Configures alignment strategy of address in memory of entries and independently of address in
      * memory of values within entries in ChronicleMaps, created by this builder.
-     * <p/>
+     *
      * <p>Useful when values of the map are updated intensively, particularly fields with volatile
      * access, because it doesn't work well if the value crosses cache lines. Also, on some
      * (nowadays rare) architectures any misaligned memory access is more expensive than aligned.
-     * <p/>
+     *
      * <p>Note that {@linkplain #entrySize(int) entry size} will be aligned according to this
      * alignment. I. e. if you set {@code entrySize(20)} and {@link Alignment#OF_8_BYTES}, actual
      * entry size will be 24 (20 aligned to 8 bytes).
-     * <p/>
+     *
      * <p>Default is {@link Alignment#OF_4_BYTES}.
      *
      * @param alignment the new alignment of the maps constructed by this builder
@@ -449,12 +449,12 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
      * Configures if the maps created by this builder should return {@code null} instead of previous
      * mapped values on {@link ChronicleMap#put(Object, Object) ChornicleMap.put(key, value)}
      * calls.
-     * <p/>
+     *
      * <p>{@link Map#put(Object, Object) Map.put()} returns the previous value, functionality which
      * is rarely used but fairly cheap for {@link HashMap}. In the case, for an off heap collection,
      * it has to create a new object and deserialize the data from off-heap memory. It's expensive
      * for something you probably don't use.
-     * <p/>
+     *
      * <p>By default, of cause, {@code ChronicleMap} conforms the general {@code Map} contract and
      * returns the previous mapped value on {@code put()} calls.
      *
@@ -476,7 +476,7 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
     /**
      * Configures if the maps created by this builder should return {@code null} instead of the last
      * mapped value on {@link ChronicleMap#remove(Object) ChronicleMap.remove(key)} calls.
-     * <p/>
+     *
      * <p>{@link Map#remove(Object) Map.remove()} returns the previous value, functionality which is
      * rarely used but fairly cheap for {@link HashMap}. In the case, for an off heap collection, it
      * has to create a new object and deserialize the data from off-heap memory. It's expensive for
@@ -637,7 +637,7 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
 
     /**
      * {@inheritDoc}
-     * <p/>
+     *
      * <p>Example: <pre>{@code Map<Key, Value> map =
      *     ChronicleMapBuilder.of(Key.class, Value.class)
      *     .entries(1_000_000)
@@ -645,7 +645,7 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
      *     // this class hasn't implemented yet, just for example
      *     .objectSerializer(new KryoObjectSerializer())
      *     .create();}</pre>
-     * <p/>
+     *
      * <p>This serializer is used to serialize both keys and values, if they both require this:
      * loosely typed, nullable, and custom {@linkplain #keyMarshaller(BytesMarshaller) key} and
      * {@linkplain #valueMarshallerAndFactory(BytesMarshaller, ObjectFactory) value} marshallers are
@@ -660,7 +660,7 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
 
     /**
      * {@inheritDoc}
-     * <p/>
+     *
      * <p>Example:
      */
     @Override
@@ -719,10 +719,10 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
      * Specifies the value to be put for each key queried in {@link ChronicleMap#get get()} and
      * {@link ChronicleMap#getUsing(Object, Object) getUsing()} methods, if the key is absent in the
      * map. Then this default value is returned from query method.
-     * <p/>
+     *
      * <p>Setting default value to {@code null} is interpreted as map shouldn't put any default
      * value for absent keys. This is by default.
-     * <p/>
+     *
      * <p>This configuration overrides any previous {@link #defaultValueProvider(DefaultValueProvider)}
      * configuration to this {@code ChronicleMapBuilder}.
      *
@@ -741,7 +741,7 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
      * and {@link ChronicleMap#getUsing(Object, Object) getUsing()} calls, if the key is absent in
      * the map. If the obtained value is non-null, it is put for the key in the map and then
      * returned from current {@code get()} or {@code getUsing()} call.
-     * <p/>
+     *
      * <p>This configuration overrides any previous {@link #defaultValue(Object)} configuration to
      * this {@code ChronicleMapBuilder}.
      *
diff --git a/src/main/java/net/openhft/chronicle/map/Replica.java b/src/main/java/net/openhft/chronicle/map/Replica.java
index d118ead99..b4664a1c5 100644
--- a/src/main/java/net/openhft/chronicle/map/Replica.java
+++ b/src/main/java/net/openhft/chronicle/map/Replica.java
@@ -58,7 +58,7 @@ public interface Replica extends Closeable {
 
     /**
      * Returns the timestamp of the last change from the specified remote node, already replicated to this
-     * Replica. <p/> <p>Used in conjunction with replication, to back fill data from a remote node. This node
+     * Replica.  <p>Used in conjunction with replication, to back fill data from a remote node. This node
      * may have missed updates while it was not been running or connected via TCP.
      *
      * @param remoteIdentifier the identifier of the remote node to check last replicated update time from
@@ -110,7 +110,7 @@ public interface Replica extends Closeable {
         /**
          * Dirties all entries with a modification time equal to {@code fromTimeStamp} or newer. It means all
          * these entries will be considered as "new" by this ModificationIterator and iterated once again no
-         * matter if they have already been. <p/> <p>This functionality is used to publish recently modified
+         * matter if they have already been.  <p>This functionality is used to publish recently modified
          * entries to a new remote node as it connects.
          *
          * @param fromTimeStamp the timestamp from which all entries should be dirty
diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index a26724629..24e3a811c 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -44,7 +44,8 @@ import static net.openhft.chronicle.common.serialization.Hasher.hash;
 import static net.openhft.lang.collection.DirectBitSet.NOT_FOUND;
 
 /**
- * A Replicating Multi Master HashMap <p/> <p>Each remote hash map, mirrors its changes over to
+ * <h2>A Replicating Multi Master HashMap</h2>
+ * <p>Each remote hash map, mirrors its changes over to
  * another remote hash map, neither hash map is considered the master store of data, each hash map
  * uses timestamps to reconcile changes. We refer to an instance of a remote hash-map as a node. A
  * node will be connected to any number of other nodes, for the first implementation the maximum
@@ -56,8 +57,10 @@ import static net.openhft.lang.collection.DirectBitSet.NOT_FOUND;
  * nature of this multi master implementation,  this return value will only be the old value on the
  * nodes local data store. In other words the nodes are only concurrent locally. Its worth realising
  * that another node performing exactly the same operation may return a different value. However
- * reconciliation will ensure the maps themselves become eventually consistent. <p/>
- * <p>Reconciliation <p/> <p>If two ( or more nodes ) were to receive a change to their maps for the
+ * reconciliation will ensure the maps themselves become eventually consistent.
+ * </p>
+ * <h2>Reconciliation </h2>
+ * <p>If two ( or more nodes ) were to receive a change to their maps for the
  * same key but different values, say by a user of the maps, calling the put(key, value). Then,
  * initially each node will update its local store and each local store will hold a different value,
  * but the aim of multi master replication is to provide eventual consistency across the nodes. So,
@@ -67,7 +70,8 @@ import static net.openhft.lang.collection.DirectBitSet.NOT_FOUND;
  * and value. Eventual consistency is achieved by looking at the timestamp from the remote node, if
  * for a given key, the remote nodes timestamp is newer than the local nodes timestamp, then the
  * event from the remote node will be applied to the local node, otherwise the event will be
- * ignored. <p/> <p>However there is an edge case that we have to concern ourselves with, If two
+ * ignored. </p>
+ * <p>However there is an edge case that we have to concern ourselves with, If two
  * nodes update their map at the same time with different values, we have to deterministically
  * resolve which update wins, because of eventual consistency both nodes should end up locally
  * holding the same data. Although it is rare two remote nodes could receive an update to their maps
@@ -77,6 +81,7 @@ import static net.openhft.lang.collection.DirectBitSet.NOT_FOUND;
  * made to one node should be identical to the decision made to the other. We resolve this simple
  * dilemma by using a node identifier, each node will have a unique identifier, the update from the
  * node with the smallest identifier wins.
+ * </p>
  *
  * @param <K> the entries key type
  * @param <V> the entries value type
@@ -865,7 +870,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
         /**
          * Used only with replication, its sometimes possible to receive an old ( or stale update )
          * from a remote map. This method is used to determine if we should ignore such updates.
-         * <p/> <p>We can reject put() and removes() when comparing times stamps with remote
+         *  <p>We can reject put() and removes() when comparing times stamps with remote
          * systems
          *
          * @param entry      the maps entry
@@ -1339,15 +1344,18 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
     }
 
     /**
-     * Once a change occurs to a map, map replication requires that these changes are picked up by
-     * another thread, this class provides an iterator like interface to poll for such changes. <p/>
+     * <p>Once a change occurs to a map, map replication requires that these changes are picked up by
+     * another thread, this class provides an iterator like interface to poll for such changes.
+     * </p>
      * <p>In most cases the thread that adds data to the node is unlikely to be the same thread that
      * replicates the data over to the other nodes, so data will have to be marshaled between the
-     * main thread storing data to the map, and the thread running the replication. <p/> <p>One way
-     * to perform this marshalling, would be to pipe the data into a queue. However, This class
+     * main thread storing data to the map, and the thread running the replication.
+     * </p>
+     * <p>One way to perform this marshalling, would be to pipe the data into a queue. However, This class
      * takes another approach. It uses a bit set, and marks bits which correspond to the indexes of
      * the entries that have changed. It then provides an iterator like interface to poll for such
      * changes.
+     * </p>
      *
      * @author Rob Austin.
      */
@@ -1543,7 +1551,7 @@ abstract class Replicator {
 
     /**
      * Applies the replicator to the map instance and returns a Closeable token to manage resources,
-     * associated with the replication. <p/> <p>This method isn't intended to be called from the
+     * associated with the replication.  <p>This method isn't intended to be called from the
      * client code.
      *
      * @param builder             the builder from which the map was constructed. The replicator may
@@ -1552,7 +1560,7 @@ abstract class Replicator {
      * @param map                 a replicated map instance. Provides basic tools for replication
      *                            implementation.
      * @param entryExternalizable the callback for ser/deser implementation in the replicator
-     * @param chronicleMap
+     * @param chronicleMap        to wrap.
      * @return a {@code Closeable} token to control replication resources. It should be closed on
      * closing the replicated map.
      * @throws java.io.IOException   if an io error occurred during the replicator setup
@@ -1562,7 +1570,8 @@ abstract class Replicator {
      *                               maps)
      */
     protected abstract Closeable applyTo(ChronicleMapBuilder builder,
-                                         Replica map, Replica.EntryExternalizable entryExternalizable, final ChronicleMap chronicleMap)
+                                         Replica map, Replica.EntryExternalizable entryExternalizable,
+                                         final ChronicleMap chronicleMap)
             throws IOException;
 }
 
diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
index b19c9765e..6b9982367 100644
--- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
@@ -41,7 +41,7 @@ import static net.openhft.chronicle.map.StatelessChronicleMap.EventId.HEARTBEAT;
 
 /**
  * Used with a {@see net.openhft.map.ReplicatedSharedHashMap} to send data between the maps using a
- * socket connection <p/> {@see net.openhft.map.OutSocketReplicator}
+ * socket connection  {@see net.openhft.map.OutSocketReplicator}
  *
  * @author Rob Austin.
  */
diff --git a/src/main/java/net/openhft/chronicle/map/ThrottlingConfig.java b/src/main/java/net/openhft/chronicle/map/ThrottlingConfig.java
index 103b46356..c11658266 100644
--- a/src/main/java/net/openhft/chronicle/map/ThrottlingConfig.java
+++ b/src/main/java/net/openhft/chronicle/map/ThrottlingConfig.java
@@ -108,7 +108,7 @@ public class ThrottlingConfig {
 
 
     /**
-     * Returns the throttle bucketing interval in the given time units. <p/> <p>Default throttle bucketing
+     * Returns the throttle bucketing interval in the given time units.  <p>Default throttle bucketing
      * interval is 100 millis.
      *
      * @param unit the time unit of the interval
diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index 650b84b6a..60db05846 100644
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -715,10 +715,10 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
         }
 
         /**
-         * Used to acquire an object of type V from the Segment. <p/> {@code usingValue} is reused to read the
-         * value if key is present in this Segment, if key is absent in this Segment: <p/> <ol><li>If {@code
+         * Used to acquire an object of type V from the Segment.  {@code usingValue} is reused to read the
+         * value if key is present in this Segment, if key is absent in this Segment:  <ol><li>If {@code
          * create == false}, just {@code null} is returned (except when event listener provides a value "on
-         * get missing" - then it is put into this Segment for the key).</li> <p/> <li>If {@code create ==
+         * get missing" - then it is put into this Segment for the key).</li>  <li>If {@code create ==
          * true}, {@code usingValue} or a newly created instance of value class, if {@code usingValue ==
          * null}, is put into this Segment for the key.</li></ol>
          *
@@ -999,7 +999,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
 
         /**
          * Removes a key (or key-value pair) from the Segment.
-         * <p/>
+         *
          * <p>The entry will only be removed if {@code expectedValue} equals to {@code null}
          * or the value previously corresponding to the specified key.
          *
@@ -1061,7 +1061,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
         }
 
         /**
-         * Replaces the specified value for the key with the given value. <p/> {@code newValue} is set only if
+         * Replaces the specified value for the key with the given value.  {@code newValue} is set only if
          * the existing value corresponding to the specified key is equal to {@code expectedValue} or {@code
          * expectedValue == null}.
          *
diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/JSR166TestCase.java b/src/test/java/net/openhft/chronicle/map/jrs166/JSR166TestCase.java
index 6b6b9519f..0f0f9445e 100644
--- a/src/test/java/net/openhft/chronicle/map/jrs166/JSR166TestCase.java
+++ b/src/test/java/net/openhft/chronicle/map/jrs166/JSR166TestCase.java
@@ -42,9 +42,9 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
  * cause the associated test that generated them to itself Assert.fail (which
  * JUnit does not otherwise arrange).  The rules for creating such
  * tests are:
- * <p/>
+ *
  * <ol>
- * <p/>
+ *
  * <li> All assertions in code running in generated threads must use
  * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
  * #threadAssertEquals}, or {@link #threadAssertNull}, (not
@@ -52,12 +52,12 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
  * particularly recommended) for other code to use these forms too.
  * Only the most typically used JUnit assertion methods are defined
  * this way, but enough to live with.</li>
- * <p/>
+ *
  * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
  * to invoke {@code super.setUp} and {@code super.tearDown} within
  * them. These methods are used to clear and check for thread
  * assertion Assert.failures.</li>
- * <p/>
+ *
  * <li>All delays and timeouts must use one of the constants {@code
  * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
  * {@code LONG_DELAY_MS}. The idea here is that a SHORT is always
@@ -68,17 +68,17 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
  * MEDIUM.  And so on. These constants are set to conservative values,
  * but even so, if there is ever any doubt, they can all be increased
  * in one spot to rerun tests on slower platforms.</li>
- * <p/>
+ *
  * <li> All threads generated must be joined inside each test case
  * method (or {@code Assert.fail} to do so) before returning from the
  * method. The {@code joinPool} method can be used to do this when
  * using Executors.</li>
- * <p/>
+ *
  * </ol>
- * <p/>
+ *
  * <p><b>Other notes</b>
  * <ul>
- * <p/>
+ *
  * <li> Usually, there is one testcase method per JSR166 method
  * covering "normal" operation, and then as many exception-testing
  * methods as there are exceptions the method can throw. Sometimes
@@ -86,26 +86,26 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
  * "normal" behaviors differ significantly. And sometimes testcases
  * cover multiple methods when they cannot be tested in
  * isolation.</li>
- * <p/>
+ *
  * <li> The documentation style for testcases is to provide as javadoc
  * a simple sentence or two describing the property that the testcase
  * method purports to test. The javadocs do not say anything about how
  * the property is tested. To find out, read the code.</li>
- * <p/>
+ *
  * <li> These tests are "conformance tests", and do not attempt to
  * test throughput, latency, scalability or other performance factors
  * (see the separate "jtreg" tests for a set intended to check these
  * for the most central aspects of functionality.) So, most tests use
  * the smallest sensible numbers of threads, collection sizes, etc
  * needed to check basic conformance.</li>
- * <p/>
+ *
  * <li>The test classes currently do not declare inclusion in
  * any particular package to simplify things for people integrating
  * them in TCK test suites.</li>
- * <p/>
+ *
  * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
  * runs all JSR166 unit tests.</li>
- * <p/>
+ *
  * </ul>
  */
 public class JSR166TestCase {
@@ -255,11 +255,11 @@ public class JSR166TestCase {
 
     /**
      * Extra checks that get done for all test cases.
-     * <p/>
+     *
      * Triggers test case Assert.failure if any thread assertions have Assert.failed,
      * by rethrowing, in the test harness thread, any exception recorded
      * earlier by threadRecordFailure.
-     * <p/>
+     *
      * Triggers test case Assert.failure if interrupt status is set in the main thread.
      */
     @After
diff --git a/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java b/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java
index f9b927cf8..4997e3c36 100644
--- a/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java
+++ b/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java
@@ -38,13 +38,13 @@ import java.util.concurrent.ConcurrentHashMap;
  * shared map (using ChronicleMap) to maintain shared data across any processes
  * which use a ProcessInstanceLimiter, and checking on startup and regularly
  * after whether it is allowed to run.
- * <p/>
+ *
  * Typically, you need to specify two things to create an instance of
  * ProcessInstanceLimiter: a path to a file that will hold the shared map; and a
  * callback object (an instance implementing ProcessInstanceLimiter.Callback) to
  * handle the various possible callback messages that the ProcessInstanceLimiter
  * can generate.
- * <p/>
+ *
  * Once you have a ProcessInstanceLimiter instance, you specify a type of
  * process (any string) which will be limited to up to N processes running at
  * the same time by calling the setMaxNumberOfProcessesOfType() method. Finally
@@ -52,18 +52,18 @@ import java.util.concurrent.ConcurrentHashMap;
  * startingProcessOfType(X). This last is deliberately not done automatically as
  * you may wish for one type of process to define limitations on other types of
  * processes.
- * <p/>
+ *
  * The are some convenience methods which allow you to quickly specify a limit
  * without consideration of the above. For example, if during your application
  * startup you call ProcessInstanceLimiter.limitTo(2), then you need not call
  * anything else and you have limited your application to running at most 2 JVM
  * instances of your application. Under the covers, this call is identical to
  * the sequence:
- * <p/>
+ *
  * ProcessInstanceLimiter limiter = new ProcessInstanceLimiter();
  * limiter.setMaxNumberOfProcessesOfType(processType,numProcesses);
  * limiter.startingProcessOfType(processType);
- * <p/>
+ *
  * This:
  * 1. Creates a shared file called ProcessInstanceLimiter_DEFAULT_SHARED_MAP_ in
  * the temp directory to hold an instance of ChronicleMap
@@ -152,7 +152,7 @@ public class ProcessInstanceLimiter implements Runnable {
 
     /**
      * Convenience method.
-     * <p/>
+     *
      * Create a ProcessInstanceLimiter instance which is limited to one OS
      * process instance of the DEFAULT type. This will enforce that any JVM on
      * the same box which runs the code
@@ -168,7 +168,7 @@ public class ProcessInstanceLimiter implements Runnable {
 
     /**
      * Convenience method.
-     * <p/>
+     *
      * Create a ProcessInstanceLimiter instance which is limited to
      * "numProcesses" OS process instances of the DEFAULT type. This will
      * enforce that any JVM on the same box which runs the code
@@ -187,7 +187,7 @@ public class ProcessInstanceLimiter implements Runnable {
 
     /**
      * Convenience method.
-     * <p/>
+     *
      * Create a ProcessInstanceLimiter instance which is limited to
      * "numProcesses" OS process instances of the "processType" type. This will
      * enforce that any JVM on the same box which runs the code
@@ -519,7 +519,7 @@ public class ProcessInstanceLimiter implements Runnable {
     /**
      * The Data object holds an array of timestamps and a maximum number of
      * processes allowed to be running concurrently
-     * <p/>
+     *
      * The Timelock field is just for locking the time field
      */
     public static interface Data {