From 6892254209fd5ceec47b51e2635becc94e801dfa Mon Sep 17 00:00:00 2001
From: Carlos Macasaet <github@carlos-m.net>
Date: Tue, 4 Aug 2015 18:14:18 -0700
Subject: [PATCH 01/15] Fixes #114 - BatchApnsService should allow
 ScheduledExecutorService to be passed into constructor

---
 .../com/notnoop/apns/ApnsServiceBuilder.java  | 37 ++++++++++++++++---
 .../apns/internal/BatchApnsService.java       | 15 ++++++--
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java b/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
index f0188925..9280f6a2 100644
--- a/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
+++ b/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
@@ -30,6 +30,7 @@
  */
 package com.notnoop.apns;
 
+import static java.util.concurrent.Executors.defaultThreadFactory;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
@@ -40,6 +41,8 @@
 import java.security.KeyStore;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadFactory;
 
 import javax.net.ssl.SSLContext;
@@ -94,7 +97,7 @@ public class ApnsServiceBuilder {
     private boolean isBatched = false;
     private int batchWaitTimeInSec;
     private int batchMaxWaitTimeInSec;
-    private ThreadFactory batchThreadFactory = null;
+    private ScheduledExecutorService batchThreadPoolExecutor = null;
     
     private ApnsDelegate delegate = ApnsDelegate.EMPTY;
     private Proxy proxy = null;
@@ -529,7 +532,7 @@ public ApnsServiceBuilder asBatched() {
      *            maximum wait time for batch before executing
      */
     public ApnsServiceBuilder asBatched(int waitTimeInSec, int maxWaitTimeInSec) {
-        return asBatched(waitTimeInSec, maxWaitTimeInSec, null);
+        return asBatched(waitTimeInSec, maxWaitTimeInSec, (ThreadFactory)null);
     }
     
     /**
@@ -552,14 +555,36 @@ public ApnsServiceBuilder asBatched(int waitTimeInSec, int maxWaitTimeInSec) {
      *            thread factory to use for batch processing
      */
     public ApnsServiceBuilder asBatched(int waitTimeInSec, int maxWaitTimeInSec, ThreadFactory threadFactory) {
+        return asBatched(waitTimeInSec, maxWaitTimeInSec, new ScheduledThreadPoolExecutor(1, threadFactory != null ? threadFactory : defaultThreadFactory()));
+    }
+
+    /**
+     * Construct service which will process notification requests in batch.
+     * After each request batch will wait <code>waitTimeInSec</code> for more request to come
+     * before executing but not more than <code>maxWaitTimeInSec</code>
+     * 
+     * Each batch creates new connection and close it after finished.
+     * In case reconnect policy is specified it will be applied by batch processing. 
+     * E.g.: {@link ReconnectPolicy.Provided#EVERY_HALF_HOUR} will reconnect the connection in case batch is running for more than half an hour
+     * 
+     * Note: It is not recommended to use pooled connection
+     * 
+     * @param waitTimeInSec
+     *            time to wait for more notification request before executing
+     *            batch
+     * @param maxWaitTimeInSec
+     *            maximum wait time for batch before executing
+     * @param batchThreadPoolExecutor
+     *            executor for batched processing (may be null)
+     */
+    public ApnsServiceBuilder asBatched(int waitTimeInSec, int maxWaitTimeInSec, ScheduledExecutorService batchThreadPoolExecutor) {
         this.isBatched = true;
         this.batchWaitTimeInSec = waitTimeInSec;
         this.batchMaxWaitTimeInSec = maxWaitTimeInSec;
-        this.batchThreadFactory = threadFactory;
+        this.batchThreadPoolExecutor = batchThreadPoolExecutor;
         return this;
     }
-    
-    
+
     /**
      * Sets the delegate of the service, that gets notified of the
      * status of message delivery.
@@ -629,7 +654,7 @@ public ApnsService build() {
         }
         
         if (isBatched) {
-            service = new BatchApnsService(conn, feedback, batchWaitTimeInSec, batchMaxWaitTimeInSec, batchThreadFactory);
+            service = new BatchApnsService(conn, feedback, batchWaitTimeInSec, batchMaxWaitTimeInSec, batchThreadPoolExecutor);
         }
 
         service.start();
diff --git a/src/main/java/com/notnoop/apns/internal/BatchApnsService.java b/src/main/java/com/notnoop/apns/internal/BatchApnsService.java
index cd38855f..e8c31c00 100644
--- a/src/main/java/com/notnoop/apns/internal/BatchApnsService.java
+++ b/src/main/java/com/notnoop/apns/internal/BatchApnsService.java
@@ -1,8 +1,9 @@
 package com.notnoop.apns.internal;
 
+import static java.util.concurrent.Executors.defaultThreadFactory;
+
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -40,15 +41,21 @@ public class BatchApnsService extends AbstractApnsService {
 
 	private ScheduledExecutorService scheduleService;
 	private ScheduledFuture<?> taskFuture;
-	
+
 	private Runnable batchRunner = new SendMessagesBatch();
 
-	public BatchApnsService(ApnsConnection prototype, ApnsFeedbackConnection feedback, int batchWaitTimeInSec, int maxBachWaitTimeInSec, ThreadFactory tf) {
+    public BatchApnsService(ApnsConnection prototype, ApnsFeedbackConnection feedback, int batchWaitTimeInSec, int maxBachWaitTimeInSec, ThreadFactory tf) {
+        this(prototype, feedback, batchWaitTimeInSec, maxBachWaitTimeInSec,
+                new ScheduledThreadPoolExecutor(1,
+                        tf != null ? tf : defaultThreadFactory()));
+    }
+
+    public BatchApnsService(ApnsConnection prototype, ApnsFeedbackConnection feedback, int batchWaitTimeInSec, int maxBachWaitTimeInSec, ScheduledExecutorService executor) {
 		super(feedback);
 		this.prototype = prototype;
 		this.batchWaitTimeInSec = batchWaitTimeInSec;
 		this.maxBatchWaitTimeInSec = maxBachWaitTimeInSec;
-		this.scheduleService = new ScheduledThreadPoolExecutor(1, tf == null ? Executors.defaultThreadFactory() : tf);
+		this.scheduleService = executor != null ? executor : new ScheduledThreadPoolExecutor(1, defaultThreadFactory());
 	}
 
 	public void start() {

From fc66d1e37763fc666703bd0c9a8e94dadc574eaa Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Fri, 20 Nov 2015 16:28:30 +0100
Subject: [PATCH 02/15] Use a builder pattern for the SSLContext

---
 .../com/notnoop/apns/ApnsServiceBuilder.java  | 15 ++--
 .../apns/internal/SSLContextBuilder.java      | 79 +++++++++++++++++++
 .../com/notnoop/apns/internal/Utilities.java  | 39 ---------
 .../notnoop/apns/ApnsServerSocketBuilder.java | 15 +++-
 .../notnoop/apns/utils/FixedCertificates.java | 22 +++---
 5 files changed, 113 insertions(+), 57 deletions(-)
 create mode 100644 src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java

diff --git a/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java b/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
index 9280f6a2..00ba66c9 100644
--- a/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
+++ b/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
@@ -174,9 +174,11 @@ public ApnsServiceBuilder withCert(String fileName, String password)
     public ApnsServiceBuilder withCert(InputStream stream, String password)
     throws InvalidSSLConfig {
         assertPasswordNotEmpty(password);
-        return withSSLContext(
-                newSSLContext(stream, password,
-                        KEYSTORE_TYPE, KEY_ALGORITHM));
+        return withSSLContext(new SSLContextBuilder()
+                .withAlgorithm(KEY_ALGORITHM)
+                .withCertificateKeyStore(stream, password, KEYSTORE_TYPE)
+                .withDefaultTrustKeyStore()
+                .build());
     }
 
     /**
@@ -200,8 +202,11 @@ public ApnsServiceBuilder withCert(InputStream stream, String password)
     public ApnsServiceBuilder withCert(KeyStore keyStore, String password)
     throws InvalidSSLConfig {
         assertPasswordNotEmpty(password);
-        return withSSLContext(
-                newSSLContext(keyStore, password, KEY_ALGORITHM));
+        return withSSLContext(new SSLContextBuilder()
+                .withAlgorithm(KEY_ALGORITHM)
+                .withCertificateKeyStore(keyStore, password)
+                .withDefaultTrustKeyStore()
+                .build());
     }
     
 	private void assertPasswordNotEmpty(String password) {
diff --git a/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java b/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java
new file mode 100644
index 00000000..2bc6d410
--- /dev/null
+++ b/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java
@@ -0,0 +1,79 @@
+package com.notnoop.apns.internal;
+
+import com.notnoop.exceptions.InvalidSSLConfig;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+
+public class SSLContextBuilder {
+    private String algorithm = "sunx509";
+    private KeyManagerFactory keyManagerFactory;
+    private TrustManager[] trustManagers;
+
+    public SSLContextBuilder withAlgorithm(String algorithm) {
+        this.algorithm = algorithm;
+        return this;
+    }
+
+    public SSLContextBuilder withDefaultTrustKeyStore() throws InvalidSSLConfig {
+        try {
+            TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(algorithm);
+            trustManagerFactory.init((KeyStore)null);
+            trustManagers = trustManagerFactory.getTrustManagers();
+            return this;
+        } catch (GeneralSecurityException e) {
+            throw new InvalidSSLConfig(e);
+        }
+    }
+
+    public SSLContextBuilder withTrustManager(TrustManager trustManager) {
+        trustManagers = new TrustManager[] { trustManager };
+        return this;
+    }
+
+    public SSLContextBuilder withCertificateKeyStore(InputStream keyStoreStream, String keyStorePassword, String keyStoreType) throws InvalidSSLConfig {
+        try {
+            final KeyStore ks = KeyStore.getInstance(keyStoreType);
+            ks.load(keyStoreStream, keyStorePassword.toCharArray());
+            return withCertificateKeyStore(ks, keyStorePassword);
+        } catch (GeneralSecurityException e) {
+            throw new InvalidSSLConfig(e);
+        } catch (IOException e) {
+            throw new InvalidSSLConfig(e);
+        }
+    }
+
+    public SSLContextBuilder withCertificateKeyStore(KeyStore keyStore, String keyStorePassword) throws InvalidSSLConfig {
+        try {
+            keyManagerFactory = KeyManagerFactory.getInstance(algorithm);
+            keyManagerFactory.init(keyStore, keyStorePassword.toCharArray());
+            return this;
+        } catch (GeneralSecurityException e) {
+            throw new InvalidSSLConfig(e);
+        }
+    }
+
+    public SSLContext build() throws InvalidSSLConfig {
+        if (keyManagerFactory == null) {
+            throw new InvalidSSLConfig("Missing KeyManagerFactory");
+        }
+
+        if (trustManagers == null) {
+            throw new InvalidSSLConfig("Missing TrustManagers");
+        }
+
+        try {
+            final SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(keyManagerFactory.getKeyManagers(), trustManagers, null);
+            return sslContext;
+        } catch (GeneralSecurityException e) {
+            throw new InvalidSSLConfig(e);
+        }
+    }
+}
diff --git a/src/main/java/com/notnoop/apns/internal/Utilities.java b/src/main/java/com/notnoop/apns/internal/Utilities.java
index 55afc4cd..7a62ab19 100644
--- a/src/main/java/com/notnoop/apns/internal/Utilities.java
+++ b/src/main/java/com/notnoop/apns/internal/Utilities.java
@@ -47,7 +47,6 @@
 import java.util.regex.Pattern;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManagerFactory;
 import com.notnoop.exceptions.InvalidSSLConfig;
 import com.notnoop.exceptions.NetworkIOException;
@@ -73,44 +72,6 @@ public final class Utilities {
 
     private Utilities() { throw new AssertionError("Uninstantiable class"); }
 
-    public static SSLSocketFactory newSSLSocketFactory(final InputStream cert, final String password,
-         final String ksType, final String ksAlgorithm) throws InvalidSSLConfig {
-        final SSLContext context = newSSLContext(cert, password, ksType, ksAlgorithm);
-        return context.getSocketFactory();
-    }
-
-    public static SSLContext newSSLContext(final InputStream cert, final String password,
-            final String ksType, final String ksAlgorithm) throws InvalidSSLConfig {
-           try {
-               final KeyStore ks = KeyStore.getInstance(ksType);
-               ks.load(cert, password.toCharArray());
-               return newSSLContext(ks, password, ksAlgorithm);
-           } catch (final Exception e) {
-               throw new InvalidSSLConfig(e);
-           }
-       }
-    
-    public static SSLContext newSSLContext(final KeyStore ks, final String password,
-            final String ksAlgorithm) throws InvalidSSLConfig {
-           try {
-               // Get a KeyManager and initialize it
-               final KeyManagerFactory kmf = KeyManagerFactory.getInstance(ksAlgorithm);
-               kmf.init(ks, password.toCharArray());
-
-               // Get a TrustManagerFactory with the DEFAULT KEYSTORE, so we have all
-               // the certificates in cacerts trusted
-               final TrustManagerFactory tmf = TrustManagerFactory.getInstance(ksAlgorithm);
-               tmf.init((KeyStore)null);
-
-               // Get the SSLContext to help create SSLSocketFactory
-               final SSLContext sslContext = SSLContext.getInstance("TLS");
-               sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-               return sslContext;
-           } catch (final GeneralSecurityException e) {
-               throw new InvalidSSLConfig(e);
-           }
-       }
-
     private static final Pattern pattern = Pattern.compile("[ -]");
     public static byte[] decodeHex(final String deviceToken) {
         final String hex = pattern.matcher(deviceToken).replaceAll("");
diff --git a/src/test/java/com/notnoop/apns/ApnsServerSocketBuilder.java b/src/test/java/com/notnoop/apns/ApnsServerSocketBuilder.java
index ced5cca1..66c88760 100644
--- a/src/test/java/com/notnoop/apns/ApnsServerSocketBuilder.java
+++ b/src/test/java/com/notnoop/apns/ApnsServerSocketBuilder.java
@@ -40,6 +40,8 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import javax.net.ssl.SSLContext;
+
+import com.notnoop.apns.internal.SSLContextBuilder;
 import com.notnoop.apns.internal.Utilities;
 import com.notnoop.exceptions.InvalidSSLConfig;
 import com.notnoop.exceptions.RuntimeIOException;
@@ -145,8 +147,11 @@ public ApnsServerSocketBuilder withCert(String fileName, String password)
 	public ApnsServerSocketBuilder withCert(InputStream stream, String password)
 			throws InvalidSSLConfig {
 		assertPasswordNotEmpty(password);
-		return withSSLContext(newSSLContext(stream, password, KEYSTORE_TYPE,
-				KEY_ALGORITHM));
+		return withSSLContext(new SSLContextBuilder()
+				.withAlgorithm(KEY_ALGORITHM)
+				.withCertificateKeyStore(stream, password, KEYSTORE_TYPE)
+				.withDefaultTrustKeyStore()
+				.build());
 	}
 
 	/**
@@ -170,7 +175,11 @@ public ApnsServerSocketBuilder withCert(InputStream stream, String password)
 	public ApnsServerSocketBuilder withCert(KeyStore keyStore, String password)
 			throws InvalidSSLConfig {
 		assertPasswordNotEmpty(password);
-		return withSSLContext(newSSLContext(keyStore, password, KEY_ALGORITHM));
+		return withSSLContext(new SSLContextBuilder()
+				.withAlgorithm(KEY_ALGORITHM)
+				.withCertificateKeyStore(keyStore, password)
+				.withDefaultTrustKeyStore()
+				.build());
 	}
 
 	private void assertPasswordNotEmpty(String password) {
diff --git a/src/test/java/com/notnoop/apns/utils/FixedCertificates.java b/src/test/java/com/notnoop/apns/utils/FixedCertificates.java
index 9a25bae6..8b215094 100644
--- a/src/test/java/com/notnoop/apns/utils/FixedCertificates.java
+++ b/src/test/java/com/notnoop/apns/utils/FixedCertificates.java
@@ -1,13 +1,10 @@
 package com.notnoop.apns.utils;
 
-import java.io.InputStream;
-import java.security.SecureRandom;
+import com.notnoop.apns.internal.SSLContextBuilder;
 
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
-
-import com.notnoop.apns.internal.Utilities;
+import java.io.InputStream;
 
 public class FixedCertificates {
 
@@ -21,10 +18,13 @@ public class FixedCertificates {
 
     public static SSLContext serverContext() {
         try {
-            //System.setProperty("javax.net.ssl.trustStore", ClassLoader.getSystemResource(CLIENT_STORE).getPath());
             InputStream stream = FixedCertificates.class.getResourceAsStream("/" + SERVER_STORE);
             assert stream != null;
-            return Utilities.newSSLContext(stream, SERVER_PASSWORD, "PKCS12", "sunx509");
+            return new SSLContextBuilder()
+                    .withAlgorithm("sunx509")
+                    .withCertificateKeyStore(stream, SERVER_PASSWORD, "PKCS12")
+                    .withTrustManager(new X509TrustManagerTrustAll())
+                    .build();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -34,9 +34,11 @@ public static SSLContext clientContext() {
         try {
             InputStream stream = FixedCertificates.class.getResourceAsStream("/" + CLIENT_STORE);
             assert stream != null;
-            SSLContext context = Utilities.newSSLContext(stream, CLIENT_PASSWORD, "PKCS12", "sunx509");
-            context.init(null, new TrustManager[] { new X509TrustManagerTrustAll() }, new SecureRandom());
-            return context;
+            return new SSLContextBuilder()
+                    .withAlgorithm("sunx509")
+                    .withCertificateKeyStore(stream, CLIENT_PASSWORD, "PKCS12")
+                    .withTrustManager(new X509TrustManagerTrustAll())
+                    .build();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

From 9401bfa2dbefa4c98d37d6bf1afc41568a4bffe4 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Fri, 20 Nov 2015 16:55:44 +0100
Subject: [PATCH 03/15] The test server should require and validate client
 certificates

Add updated versions of the certifcates as the current ones are expired.
---
 .../apns/internal/SSLContextBuilder.java      |  23 ++++++++++++++++++
 .../notnoop/apns/utils/ApnsServerStub.java    |  18 ++++++++------
 .../notnoop/apns/utils/FixedCertificates.java |   6 ++++-
 src/test/resources/clientStore.p12            | Bin 2483 -> 2516 bytes
 src/test/resources/serverStore.p12            | Bin 2483 -> 1764 bytes
 src/test/resources/serverTrustStore.p12       | Bin 0 -> 1740 bytes
 6 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 src/test/resources/serverTrustStore.p12

diff --git a/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java b/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java
index 2bc6d410..3fbfa973 100644
--- a/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java
+++ b/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java
@@ -32,6 +32,29 @@ public SSLContextBuilder withDefaultTrustKeyStore() throws InvalidSSLConfig {
         }
     }
 
+    public SSLContextBuilder withTrustKeyStore(InputStream keyStoreStream, String keyStorePassword, String keyStoreType) throws InvalidSSLConfig {
+        try {
+            final KeyStore ks = KeyStore.getInstance(keyStoreType);
+            ks.load(keyStoreStream, keyStorePassword.toCharArray());
+            return withTrustKeyStore(ks, keyStorePassword);
+        } catch (GeneralSecurityException e) {
+            throw new InvalidSSLConfig(e);
+        } catch (IOException e) {
+            throw new InvalidSSLConfig(e);
+        }
+
+    }
+    public SSLContextBuilder withTrustKeyStore(KeyStore keyStore, String keyStorePassword) throws InvalidSSLConfig {
+        try {
+            TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(algorithm);
+            trustManagerFactory.init(keyStore);
+            trustManagers = trustManagerFactory.getTrustManagers();
+            return this;
+        } catch (GeneralSecurityException e) {
+            throw new InvalidSSLConfig(e);
+        }
+    }
+
     public SSLContextBuilder withTrustManager(TrustManager trustManager) {
         trustManagers = new TrustManager[] { trustManager };
         return this;
diff --git a/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java b/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java
index bf1dff18..a608e691 100644
--- a/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java
+++ b/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java
@@ -1,16 +1,16 @@
 package com.notnoop.apns.utils;
 
+import javax.net.ServerSocketFactory;
+import javax.net.ssl.SSLServerSocket;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.net.ServerSocketFactory;
 
 public class ApnsServerStub {
 
@@ -70,8 +70,8 @@ public ApnsServerStub(ServerSocketFactory sslFactory, int gatewayPort, int feedb
 
     Thread gatewayThread;
     Thread feedbackThread;
-    ServerSocket gatewaySocket;
-    ServerSocket feedbackSocket;
+    SSLServerSocket gatewaySocket;
+    SSLServerSocket feedbackSocket;
 
     public void start() {
         gatewayThread = new GatewayRunner();
@@ -152,10 +152,10 @@ private class GatewayRunner extends Thread {
 
         @SuppressWarnings("InfiniteLoopStatement")
         public void run() {
-
-
+            Thread.currentThread().setName("GatewayThread");
             try {
-                gatewaySocket = sslFactory.createServerSocket(gatewayPort);
+                gatewaySocket = (SSLServerSocket)sslFactory.createServerSocket(gatewayPort);
+                gatewaySocket.setNeedClientAuth(true);
             } catch (IOException e) {
                 messages.release();
                 throw new RuntimeException(e);
@@ -215,8 +215,10 @@ public void run() {
     private class FeedbackRunner extends Thread {
 
         public void run() {
+            Thread.currentThread().setName("FeedbackThread");
             try {
-                feedbackSocket = sslFactory.createServerSocket(feedbackPort);
+                feedbackSocket = (SSLServerSocket)sslFactory.createServerSocket(feedbackPort);
+                feedbackSocket.setNeedClientAuth(true);
             } catch (IOException e) {
                 e.printStackTrace();
                 messages.release();
diff --git a/src/test/java/com/notnoop/apns/utils/FixedCertificates.java b/src/test/java/com/notnoop/apns/utils/FixedCertificates.java
index 8b215094..18b229a5 100644
--- a/src/test/java/com/notnoop/apns/utils/FixedCertificates.java
+++ b/src/test/java/com/notnoop/apns/utils/FixedCertificates.java
@@ -14,16 +14,20 @@ public class FixedCertificates {
     public static final String SERVER_STORE = "serverStore.p12";
     public static final String SERVER_PASSWORD = "123456";
 
+    public static final String SERVER_TRUST_STORE = "serverTrustStore.p12";
+    public static final String SERVER_TRUST_PASSWORD = "123456";
+
     public static final String LOCALHOST = "localhost";
 
     public static SSLContext serverContext() {
         try {
             InputStream stream = FixedCertificates.class.getResourceAsStream("/" + SERVER_STORE);
+            InputStream trustStream = FixedCertificates.class.getResourceAsStream("/" + SERVER_TRUST_STORE);
             assert stream != null;
             return new SSLContextBuilder()
                     .withAlgorithm("sunx509")
                     .withCertificateKeyStore(stream, SERVER_PASSWORD, "PKCS12")
-                    .withTrustManager(new X509TrustManagerTrustAll())
+                    .withTrustKeyStore(trustStream, SERVER_TRUST_PASSWORD, "PKCS12")
                     .build();
         } catch (Exception e) {
             throw new RuntimeException(e);
diff --git a/src/test/resources/clientStore.p12 b/src/test/resources/clientStore.p12
index 28ab70a12d6c8cbfe79a0765b5237f89d48db9d0..ef8243e15a1ccd24b12faaeddd1a030c7bdd0800 100644
GIT binary patch
literal 2516
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
OVu40p>Yn-iD*gi}36Jss

literal 2483
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

diff --git a/src/test/resources/serverStore.p12 b/src/test/resources/serverStore.p12
index b375de78b57744e2103ec1f822fcc1075f6f7645..808062693b31c8218b87a40c42f39a9131171ebd 100644
GIT binary patch
literal 1764
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

literal 2483
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

diff --git a/src/test/resources/serverTrustStore.p12 b/src/test/resources/serverTrustStore.p12
new file mode 100644
index 0000000000000000000000000000000000000000..458b8b6347976368995a3151541bca9b090ec363
GIT binary patch
literal 1740
zcmY+DdpOhy7su!N!we(Su#xLhI~g<>mNcdr6=P(}dfPFhrCeIMjcX}|pIag1@>VXB
zFp3?QOva_cj@+ZQ?opdXOu{o^hRx2tdY|{*efE!Y&hvcF_j~?2A0i0!z@Ts<2!Mc+
zaf(xlOa-a{EdhZD1PFxg$bm!<j{nCBu89EQ>N~R9PN@Ls|D}{sP*@2Ft0#i68X_J*
z{a@ZWu7$t>=-S19#|F2!5PU1W?Y{f-<ZKrS217s)AS_;6<iB0v<h|EMeor<`UWi`5
z`}<a;|9*6>!cRAQf?nM~B3#QRQc}P2DC5r6ZhWm*@+$Y;o%zQVqv0nry$y@K-+jL+
zZ?^Y+$!TK^4#%wh$$IEE-X;`haq5vl$2G&4iWx>c>tWYz*}?6!`YU4L+d=hsK^!}w
zxiCNS0{K&5!#e-DHZyR5dif72S43Oh`t6icosDZ=Jm2<*_V7~a4Z*SPwQ4+p?|`)a
z%@d}ab?9TM#GRY+<zP_ow3{?wnNr|K+_wsDOrnAo(KC9Kml}q&qCuPy#8Lpc8jHhf
zSHPesVe;5MyvJ}As;6;H*lk{om{lDjr#te*>;_Jm@{+n`qm&yXU_4#Gx8iNEluDEt
zW!2cs@4GdS2XqUkeVfm#-iWXSN2POZI<Q086na+m)SMH0I`Kopw+z+rrTR<S;n%0u
z+8?7nGLq{!_5?(C!MHZGRW2&Q9QVXxO&)JtGahlalu788PraJZ9C6>Lcw%4ngQ}Wn
zvFbc5q~s{8E3IbeeQ^SFS%UU@uEQ>Ku3eCor+{(IzwXsht)1Qy!|%4)9P(Dt({Rq$
z$z^8x7f?+G0!ve(hP-x<X3t!QaQbzG6@xB@4!F#3*~mfi#AK2UbICR0yz)0+xJ=@M
z+P^GPQ*#XuQ=6L>*Ejr&KGKP}KQY^4h1*v+n8={V1%W2WqWKEq0po*5sgw@?P%2*+
zhetQsznS@E-tBk{ch9X|)UY={v|-omw_m^0<MuY6u5?zb7RM>or{@PxG6y7j*1XNt
z7pdCvyP=_rDl~(D2WK*FzSbL=a(B4wA6IU~$lFT%Mv}8Tn{cO&!Ea6MUpIFm8vga+
zN;q>3T^u9?5(<g@Zx4lVAf^x>$XTMn-zIf)90Kbe5bURKP9oV5EiJ9BtSl@@J3!d|
zWl{i2K)A_gd|*(>&iFg70R0Cbz-K@N-f#D|m`C5MgHoK_)t4-<9M;Et1|%MYEe;;E
zPa>9#=H}5e9~${DrJV!PNAP(bmp_*O>`<G8;pM@z^961Pvdk~)%9DZukFM{r>cku&
zQ<bR}Hi@&Fin)As)A_a6j&Ya`VVRbfakRas7S<`90~Qd>y7alarlC)7!xwTE@%sxd
z8U^h!WTCbOO8hiejE8AaERUDwbGr9VA}ODw($;`P(?`bhZwkc9Y0}%d7CeR3Cm-ap
zSmM%(BSdo5OcFe#GxBT8Ol^~{vZljq_i3_r4n2crH9%jWCKmvyNwU;FZQv1;bcA5y
z*qJc<_FQ{T|MTczR)g}Tg!yAg=D}Z>!O)el1Cf_EE?pSuL%hs4k+bD0geuHA(&_D9
z)uPVAo+z2ai^ChIG716c?-=|@uAR)QXU(U7({OXhwx!v&{g&yJ_thJ&2zKRUo8gqt
zEl1LrbJMA0wQ??<%Q<nBv%ERGYxx~+e2QkE)U?$x{>-54E8`<NKJyiBF}5~Ix}wHM
zql<R&qw;zF05bjvSW46MhmbYWXo|xNvWO|BbQeXdJN12-#JW85HS+dQf6a>11C$2?
zy#fm!JI3pbklqwk(*kU=el)W7?bsVDA#v}<;#BzyP_ZDQsmAkRS4&0q_Y)f{0?sPI
z$mQAiZsE|1V%17-`Llq@lVnEDiw8B)&UDqHRoU}StpwjHk&^_#lvZ<;9DMJDY}+yp
zUqv=XaqENzb0IV14jC7eBFQHDb^yOW-}7{Yr*$`L>)HiF+QRh#oj*dDK2?|}y~Xbz
zT}*|ko}iwI5la{@PpE2XDrWLzuQoETvQPzV*)>>q_UBYla%Xifb>A%(dy5Gly#@+z
zHlbX86txs-bim*2R|qRlem{pvBdEmYO<)_zq%-<?n2W{UXK^!T(C!iUro-HB`>fkV
z6ZaKMMIKN4#%*6@3wGzK_@&#K?9p%h7<|?ddM;D{>p8>m;(WYUb<_vzhpjw6cA+u1
zFDzFfbP+vHBohsYN&u38fy1<r5CpEuuOn@`1y^GMl;<<LST*bC*>(tA0GoGZOnRdJ
T6y?>@A{=`^tE@BSGb;Z9Vq6m}

literal 0
HcmV?d00001


From d9f3b688b61166499cfbcdea08b6ecb1ec894ee5 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Fri, 20 Nov 2015 17:19:40 +0100
Subject: [PATCH 04/15] Immediately fail if the SSL handshake fails

---
 .../java/com/notnoop/apns/internal/ApnsConnectionImpl.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java b/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java
index b7a36397..8c819d2d 100644
--- a/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java
+++ b/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java
@@ -44,6 +44,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.net.SocketFactory;
+import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.SSLSocketFactory;
 import com.notnoop.apns.ApnsDelegate;
 import com.notnoop.apns.StartSendingApnsDelegate;
@@ -334,6 +335,9 @@ private synchronized void sendMessage(ApnsNotification m, boolean fromBuffer) th
                 //logger.debug("Message \"{}\" sent", m);
                 attempts = 0;
                 break;
+            } catch (SSLHandshakeException e) {
+                // No use retrying this, it's dead Jim
+                throw new NetworkIOException(e);
             } catch (IOException e) {
                 Utilities.close(socket);
                 if (attempts >= RETRIES) {

From 000b707794cb29db89bea97b26410c4cf3d3a2d3 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Fri, 20 Nov 2015 17:35:40 +0100
Subject: [PATCH 05/15] Allow JKS files with multiple certificates and
 selection by alias

---
 .../com/notnoop/apns/ApnsServiceBuilder.java  | 101 ++++++++++++++++--
 .../apns/internal/SSLContextBuilder.java      |  48 +++++++++
 .../apns/integration/ApnsConnectionTest.java  |  37 ++++++-
 .../notnoop/apns/utils/FixedCertificates.java |  17 +++
 src/test/resources/clientStore.jks            | Bin 0 -> 4209 bytes
 5 files changed, 190 insertions(+), 13 deletions(-)
 create mode 100644 src/test/resources/clientStore.jks

diff --git a/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java b/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
index 00ba66c9..a1d39de5 100644
--- a/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
+++ b/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
@@ -30,14 +30,26 @@
  */
 package com.notnoop.apns;
 
-import static java.util.concurrent.Executors.defaultThreadFactory;
+import com.notnoop.apns.internal.ApnsConnection;
+import com.notnoop.apns.internal.ApnsConnectionImpl;
+import com.notnoop.apns.internal.ApnsFeedbackConnection;
+import com.notnoop.apns.internal.ApnsPooledConnection;
+import com.notnoop.apns.internal.ApnsServiceImpl;
+import com.notnoop.apns.internal.BatchApnsService;
+import com.notnoop.apns.internal.QueuedApnsService;
+import com.notnoop.apns.internal.SSLContextBuilder;
+import com.notnoop.apns.internal.Utilities;
+import com.notnoop.exceptions.InvalidSSLConfig;
+import com.notnoop.exceptions.RuntimeIOException;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.Socket;
-
 import java.security.KeyStore;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -45,14 +57,15 @@
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadFactory;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-
-import com.notnoop.apns.internal.*;
-import com.notnoop.exceptions.InvalidSSLConfig;
-import com.notnoop.exceptions.RuntimeIOException;
-
-import static com.notnoop.apns.internal.Utilities.*;
+import static com.notnoop.apns.internal.Utilities.PRODUCTION_FEEDBACK_HOST;
+import static com.notnoop.apns.internal.Utilities.PRODUCTION_FEEDBACK_PORT;
+import static com.notnoop.apns.internal.Utilities.PRODUCTION_GATEWAY_HOST;
+import static com.notnoop.apns.internal.Utilities.PRODUCTION_GATEWAY_PORT;
+import static com.notnoop.apns.internal.Utilities.SANDBOX_FEEDBACK_HOST;
+import static com.notnoop.apns.internal.Utilities.SANDBOX_FEEDBACK_PORT;
+import static com.notnoop.apns.internal.Utilities.SANDBOX_GATEWAY_HOST;
+import static com.notnoop.apns.internal.Utilities.SANDBOX_GATEWAY_PORT;
+import static java.util.concurrent.Executors.defaultThreadFactory;
 
 /**
  * The class is used to create instances of {@link ApnsService}.
@@ -208,7 +221,73 @@ public ApnsServiceBuilder withCert(KeyStore keyStore, String password)
                 .withDefaultTrustKeyStore()
                 .build());
     }
-    
+
+    /**
+     * Specify the certificate store used to connect to Apple APNS
+     * servers.  This relies on the stream of keystore (*.p12 | *.jks)
+     * containing the keys and certificates, along with the given
+     * password and alias.
+     *
+     * The keystore can be either PKCS12 or JKS and the keystore
+     * needs to be encrypted using the SunX509 algorithm.
+     *
+     * This library does not support password-less p12 certificates, due to a
+     * Oracle Java library <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6415637">
+     * Bug 6415637</a>.  There are three workarounds: use a password-protected
+     * certificate, use a different boot Java SDK implementation, or constract
+     * the `SSLContext` yourself!  Needless to say, the password-protected
+     * certificate is most recommended option.
+     *
+     * @param stream    the keystore represented as input stream
+     * @param password  the password of the keystore
+     * @param alias     the alias identifing the key to be used
+     * @return  this
+     * @throws InvalidSSLConfig if stream is an invalid Keystore,
+     *  the password is invalid or the alias is not found
+     */
+    public ApnsServiceBuilder withCert(InputStream stream, String password, String alias)
+            throws InvalidSSLConfig {
+        assertPasswordNotEmpty(password);
+        return withSSLContext(new SSLContextBuilder()
+                .withAlgorithm(KEY_ALGORITHM)
+                .withCertificateKeyStore(stream, password, KEYSTORE_TYPE, alias)
+                .withDefaultTrustKeyStore()
+                .build());
+    }
+
+    /**
+     * Specify the certificate store used to connect to Apple APNS
+     * servers.  This relies on the stream of keystore (*.p12 | *.jks)
+     * containing the keys and certificates, along with the given
+     * password and alias.
+     *
+     * The keystore can be either PKCS12 or JKS and the keystore
+     * needs to be encrypted using the SunX509 algorithm.
+     *
+     * This library does not support password-less p12 certificates, due to a
+     * Oracle Java library <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6415637">
+     * Bug 6415637</a>.  There are three workarounds: use a password-protected
+     * certificate, use a different boot Java SDK implementation, or constract
+     * the `SSLContext` yourself!  Needless to say, the password-protected
+     * certificate is most recommended option.
+     *
+     * @param keyStore  the keystore
+     * @param password  the password of the keystore
+     * @param alias     the alias identifing the key to be used
+     * @return  this
+     * @throws InvalidSSLConfig if stream is an invalid Keystore,
+     *  the password is invalid or the alias is not found
+     */
+    public ApnsServiceBuilder withCert(KeyStore keyStore, String password, String alias)
+            throws InvalidSSLConfig {
+        assertPasswordNotEmpty(password);
+        return withSSLContext(new SSLContextBuilder()
+                .withAlgorithm(KEY_ALGORITHM)
+                .withCertificateKeyStore(keyStore, password, alias)
+                .withDefaultTrustKeyStore()
+                .build());
+    }
+
 	private void assertPasswordNotEmpty(String password) {
 		if (password == null || password.length() == 0) {
             throw new IllegalArgumentException("Passwords must be specified." +
diff --git a/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java b/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java
index 3fbfa973..88c9dd26 100644
--- a/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java
+++ b/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java
@@ -9,7 +9,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
+import java.security.Key;
 import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
 
 public class SSLContextBuilder {
     private String algorithm = "sunx509";
@@ -72,6 +78,18 @@ public SSLContextBuilder withCertificateKeyStore(InputStream keyStoreStream, Str
         }
     }
 
+    public SSLContextBuilder withCertificateKeyStore(InputStream keyStoreStream, String keyStorePassword, String keyStoreType, String keyAlias) throws InvalidSSLConfig {
+        try {
+            final KeyStore ks = KeyStore.getInstance(keyStoreType);
+            ks.load(keyStoreStream, keyStorePassword.toCharArray());
+            return withCertificateKeyStore(ks, keyStorePassword, keyAlias);
+        } catch (GeneralSecurityException e) {
+            throw new InvalidSSLConfig(e);
+        } catch (IOException e) {
+            throw new InvalidSSLConfig(e);
+        }
+    }
+
     public SSLContextBuilder withCertificateKeyStore(KeyStore keyStore, String keyStorePassword) throws InvalidSSLConfig {
         try {
             keyManagerFactory = KeyManagerFactory.getInstance(algorithm);
@@ -82,6 +100,36 @@ public SSLContextBuilder withCertificateKeyStore(KeyStore keyStore, String keySt
         }
     }
 
+    public SSLContextBuilder withCertificateKeyStore(KeyStore keyStore, String keyStorePassword, String keyAlias) throws InvalidSSLConfig {
+        try {
+            if (!keyStore.containsAlias(keyAlias)) {
+                throw new InvalidSSLConfig("No key with alias " + keyAlias);
+            }
+            KeyStore singleKeyKeyStore = getKeyStoreWithSingleKey(keyStore, keyStorePassword, keyAlias);
+            return withCertificateKeyStore(singleKeyKeyStore, keyStorePassword);
+        } catch (GeneralSecurityException e) {
+            throw new InvalidSSLConfig(e);
+        } catch (IOException e) {
+            throw new InvalidSSLConfig(e);
+        }
+    }
+
+    /*
+     * Workaround for keystores containing multiple keys. Java will take the first key that matches
+     * and this way we can still offer configuration for a keystore with multiple keys and a selection
+     * based on alias. Also much easier than making a subclass of a KeyManagerFactory
+     */
+    private KeyStore getKeyStoreWithSingleKey(KeyStore keyStore, String keyStorePassword, String keyAlias)
+            throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException {
+        KeyStore singleKeyKeyStore = KeyStore.getInstance(keyStore.getType(), keyStore.getProvider());
+        final char[] password = keyStorePassword.toCharArray();
+        singleKeyKeyStore.load(null, password);
+        Key key = keyStore.getKey(keyAlias, password);
+        Certificate[] chain = keyStore.getCertificateChain(keyAlias);
+        singleKeyKeyStore.setKeyEntry(keyAlias, key, password, chain);
+        return singleKeyKeyStore;
+    }
+
     public SSLContext build() throws InvalidSSLConfig {
         if (keyManagerFactory == null) {
             throw new InvalidSSLConfig("Missing KeyManagerFactory");
diff --git a/src/test/java/com/notnoop/apns/integration/ApnsConnectionTest.java b/src/test/java/com/notnoop/apns/integration/ApnsConnectionTest.java
index 9ac4cd6e..c348b77a 100644
--- a/src/test/java/com/notnoop/apns/integration/ApnsConnectionTest.java
+++ b/src/test/java/com/notnoop/apns/integration/ApnsConnectionTest.java
@@ -8,14 +8,19 @@
 import com.notnoop.apns.utils.junit.DumpThreadsOnErrorRule;
 import com.notnoop.apns.utils.junit.Repeat;
 import com.notnoop.apns.utils.junit.RepeatRule;
+import com.notnoop.exceptions.NetworkIOException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
 
-import static com.notnoop.apns.utils.FixedCertificates.*;
-import static org.junit.Assert.*;
+import static com.notnoop.apns.utils.FixedCertificates.LOCALHOST;
+import static com.notnoop.apns.utils.FixedCertificates.clientContext;
+import static com.notnoop.apns.utils.FixedCertificates.clientMultiKeyContext;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 
 @SuppressWarnings("ALL")
@@ -122,4 +127,32 @@ public void sendOneSimpleWithTimeout() throws InterruptedException {
         assertArrayEquals(msg1.marshall(), server.getReceived().toByteArray());
     }
 
+    @Test(timeout = 2000)
+    public void sendOneSimpleMultiKey() throws InterruptedException {
+        ApnsService service =
+                APNS.newService().withSSLContext(clientMultiKeyContext("notnoop-client"))
+                        .withGatewayDestination(LOCALHOST, gatewayPort)
+                        .build();
+        server.stopAt(msg1.length());
+        service.push(msg1);
+        server.getMessages().acquire();
+
+        assertArrayEquals(msg1.marshall(), server.getReceived().toByteArray());
+    }
+
+    @Test(timeout = 2000)
+    public void sendOneSimpleClientCertFail() throws InterruptedException {
+        ApnsService service =
+                APNS.newService().withSSLContext(clientMultiKeyContext("notused"))
+                        .withGatewayDestination(LOCALHOST, gatewayPort)
+                        .build();
+        server.stopAt(msg1.length());
+        try {
+            service.push(msg1);
+            fail();
+        } catch (NetworkIOException e) {
+            assertTrue("Expected bad_certifcate exception", e.getMessage().contains("bad_certificate"));
+        }
+    }
+
 }
diff --git a/src/test/java/com/notnoop/apns/utils/FixedCertificates.java b/src/test/java/com/notnoop/apns/utils/FixedCertificates.java
index 18b229a5..8af23561 100644
--- a/src/test/java/com/notnoop/apns/utils/FixedCertificates.java
+++ b/src/test/java/com/notnoop/apns/utils/FixedCertificates.java
@@ -11,6 +11,9 @@ public class FixedCertificates {
     public static final String CLIENT_STORE = "clientStore.p12";
     public static final String CLIENT_PASSWORD = "123456";
 
+    public static final String CLIENT_MULTI_KEY_STORE = "clientStore.jks";
+    public static final String CLIENT_MULTI_KEY_PASSWORD = "123456";
+
     public static final String SERVER_STORE = "serverStore.p12";
     public static final String SERVER_PASSWORD = "123456";
 
@@ -48,6 +51,20 @@ public static SSLContext clientContext() {
         }
     }
 
+    public static SSLContext clientMultiKeyContext(String keyAlias) {
+        try {
+            InputStream stream = FixedCertificates.class.getResourceAsStream("/" + CLIENT_MULTI_KEY_STORE);
+            assert stream != null;
+            return new SSLContextBuilder()
+                    .withAlgorithm("sunx509")
+                    .withCertificateKeyStore(stream, CLIENT_MULTI_KEY_PASSWORD, "JKS", keyAlias)
+                    .withTrustManager(new X509TrustManagerTrustAll())
+                    .build();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public static String clientCertPath() {
         return ClassLoader.getSystemResource(CLIENT_STORE).getPath();
     }
diff --git a/src/test/resources/clientStore.jks b/src/test/resources/clientStore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..8564ff4a209a78b1d18f45f748d5e921493235f4
GIT binary patch
literal 4209
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

literal 0
HcmV?d00001


From c179d5e1b4e0a9ffefc6dcb52d9f62c21af377cd Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Fri, 20 Nov 2015 17:48:47 +0100
Subject: [PATCH 06/15] Add a shell script to recreate the certificate stores

---
 tools/generate_test_stores.sh | 57 +++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 tools/generate_test_stores.sh

diff --git a/tools/generate_test_stores.sh b/tools/generate_test_stores.sh
new file mode 100644
index 00000000..2d3899b5
--- /dev/null
+++ b/tools/generate_test_stores.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+KEYSIZE=1024
+VALIDITY=1460
+rm -f serverStore.p12 serverTrustStore.p12 caKey.pem caCert.pem request.crs clientStore.p12 clientCert.crt clientStore.jks
+
+echo ---=== Generating Certificates ===---
+echo This tools will request several parameters.
+echo The names are free, but it is recommended
+echo to enter a name that identifies the certificate
+echo for example TestServer, TestCA, TestClient, TestInvalidClient
+echo Enter 123456 when asked for a password
+echo
+
+# Server Cert
+echo --== Generating Server Certificate ==--
+keytool -genkey -keyalg RSA -alias notnoop-server \
+  -keystore serverStore.p12 -storepass 123456 -storetype PKCS12 \
+  -validity ${VALIDITY} -keysize ${KEYSIZE}
+keytool -exportcert -alias notnoop-server \
+  -keystore serverStore.p12 -storepass 123456 -storetype PKCS12 | keytool -printcert
+
+# Client Cert CA
+echo --== Generating Client CA Certificate ==--
+keytool -genkey -keyalg RSA -alias notnoop-ca \
+  -keystore serverTrustStore.p12 -storetype pkcs12 -storepass 123456 \
+  -validity ${VALIDITY} -keysize ${KEYSIZE}
+keytool -exportcert -alias notnoop-ca \
+  -keystore serverTrustStore.p12 -storepass 123456 -storetype PKCS12 | keytool -printcert
+
+openssl pkcs12 -in serverTrustStore.p12 -nocerts -out caKey.pem 
+openssl pkcs12 -in serverTrustStore.p12 -clcerts -nokeys -out caCert.pem 
+
+echo --== Generating Client Certificate ==--
+keytool -genkey -keyalg RSA -keystore clientStore.p12 -storepass 123456 -storetype PKCS12 -alias notnoop-client \
+  -validity ${VALIDITY} -keysize ${KEYSIZE}
+keytool -certreq -keystore clientStore.p12 -storepass 123456 -storetype PKCS12 -alias notnoop-client -file request.crs
+
+echo --== Signing Client Certificate with CA ==--
+openssl x509 -req -CA CACert.pem -CAkey CAKey.pem -in request.crs -out clientCert.crt \
+  -days ${VALIDITY} -CAcreateserial -outform PEM -set_serial 1
+cat caCert.pem >> clientCert.crt
+keytool -import -keystore clientStore.p12 -storepass 123456 -storetype PKCS12 -file clientCert.crt -alias notnoop-client
+keytool -exportcert -alias notnoop-client \
+  -keystore clientStore.p12 -storepass 123456 -storetype PKCS12 | keytool -printcert
+
+echo --== Generating JKS Client Keystore with Client Certificate ==--
+keytool -importkeystore \
+  -srckeystore clientStore.p12 -srcstorepass 123456 -srcstoretype PKCS12 -srcalias notnoop-client \
+  -destkeystore clientStore.jks -deststorepass 123456 -deststoretype JKS -destalias notnoop-client
+
+echo --== Generating Invalid Client Certificate ==--
+keytool -genkeypair -keyalg RSA -keystore clientStore.jks -storepass 123456 -storetype JKS -alias notused  
+
+keytool -list -keystore clientStore.jks -storepass 123456 -storetype JKS
+
+rm caKey.pem caCert.pem request.crs clientCert.crt
\ No newline at end of file

From cfa26bc7953125507a1a4b082039b13c57fe0cde Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Fri, 20 Nov 2015 18:10:33 +0100
Subject: [PATCH 07/15] Adding a space to trigger a retest with travis

---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 55b3519f..c78c07f4 100644
--- a/README.markdown
+++ b/README.markdown
@@ -160,4 +160,4 @@ Licensed under the [New 3-Clause BSD License](http://www.opensource.org/licenses
 
 Contact
 ---------------
-Support mailing list: http://groups.google.com/group/java-apns-discuss
+Support mailing list: http://groups.google.com/group/java-apns-discuss 

From 8342a68f772fc97e201e8927fde39c3babb878cd Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Mon, 23 Nov 2015 09:58:28 +0100
Subject: [PATCH 08/15] Add a check to the build to verify license details

---
 LICENSE.contributor | 27 +++++++++++++++++++++++++++
 pom.xml             | 31 +++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 LICENSE.contributor

diff --git a/LICENSE.contributor b/LICENSE.contributor
new file mode 100644
index 00000000..9713c165
--- /dev/null
+++ b/LICENSE.contributor
@@ -0,0 +1,27 @@
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following disclaimer
+     in the documentation and/or other materials provided with the
+     distribution.
+   * Neither the name of Mahmood Ali. nor the names of its
+     contributors may be used to endorse or promote products derived from
+     this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/pom.xml b/pom.xml
index 123fbe9a..84646588 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,37 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.mycila</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <version>2.11</version>
+                <executions>
+                    <execution>
+                        <id>default-cli</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <strictCheck>true</strictCheck>
+                    <aggregate>true</aggregate>
+                    <header>LICENSE</header>
+                    <validHeaders>
+                        <validHeader>LICENSE.contributor</validHeader>
+                    </validHeaders>
+                    <mapping>
+                        <xml>XML_STYLE</xml>
+                        <java>SLASHSTAR_STYLE</java>
+                        <clj>SEMICOLON_STYLE</clj>
+                    </mapping>
+                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <includes>
+                        <include>src/**/*.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
             <!--
 
             We need to wait for findbugs 3.0.0 to test on JDK 8

From a1f5a372a41b99b2b08fb4567ad4198a3269955d Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Mon, 23 Nov 2015 09:59:37 +0100
Subject: [PATCH 09/15] Add and or reformat all license headers so the
 license-maven-plugin will properly see them

---
 src/main/java/com/notnoop/apns/APNS.java      | 50 +++++++++---------
 .../java/com/notnoop/apns/ApnsDelegate.java   | 50 +++++++++---------
 .../com/notnoop/apns/ApnsDelegateAdapter.java | 30 +++++++++++
 .../com/notnoop/apns/ApnsNotification.java    | 50 +++++++++---------
 .../java/com/notnoop/apns/ApnsService.java    | 50 +++++++++---------
 .../com/notnoop/apns/ApnsServiceBuilder.java  | 50 +++++++++---------
 .../java/com/notnoop/apns/DeliveryError.java  | 50 +++++++++---------
 .../apns/EnhancedApnsNotification.java        | 50 +++++++++---------
 .../java/com/notnoop/apns/PayloadBuilder.java | 50 +++++++++---------
 .../com/notnoop/apns/ReconnectPolicy.java     | 50 +++++++++---------
 .../notnoop/apns/SimpleApnsNotification.java  | 50 +++++++++---------
 .../apns/StartSendingApnsDelegate.java        | 30 +++++++++++
 .../apns/internal/AbstractApnsService.java    | 50 +++++++++---------
 .../notnoop/apns/internal/ApnsConnection.java | 50 +++++++++---------
 .../apns/internal/ApnsConnectionImpl.java     | 52 +++++++++----------
 .../apns/internal/ApnsFeedbackConnection.java | 50 +++++++++---------
 .../apns/internal/ApnsPooledConnection.java   | 30 +++++++++++
 .../apns/internal/ApnsServiceImpl.java        | 50 +++++++++---------
 .../apns/internal/BatchApnsService.java       | 30 +++++++++++
 .../apns/internal/QueuedApnsService.java      | 50 +++++++++---------
 .../apns/internal/ReconnectPolicies.java      | 50 +++++++++---------
 .../apns/internal/SSLContextBuilder.java      | 29 +++++++++++
 .../apns/internal/TlsTunnelBuilder.java       | 51 +++++++++---------
 .../com/notnoop/apns/internal/Utilities.java  | 50 +++++++++---------
 .../ApnsDeliveryErrorException.java           | 30 +++++++++++
 .../com/notnoop/exceptions/ApnsException.java | 51 +++++++++---------
 .../notnoop/exceptions/InvalidSSLConfig.java  | 51 +++++++++---------
 .../exceptions/NetworkIOException.java        | 51 +++++++++---------
 .../exceptions/RuntimeIOException.java        | 51 +++++++++---------
 src/test/java/com/notnoop/apns/APNSTest.java  | 30 +++++++++++
 .../apns/AbstractApnsServerSocket.java        | 30 +++++++++++
 .../apns/ApnsFeedbackServerSocket.java        | 30 +++++++++++
 .../notnoop/apns/ApnsGatewayServerSocket.java | 30 +++++++++++
 .../apns/ApnsServerExceptionDelegate.java     | 30 +++++++++++
 .../com/notnoop/apns/ApnsServerService.java   | 30 +++++++++++
 .../notnoop/apns/ApnsServerSocketBuilder.java | 50 +++++++++---------
 .../com/notnoop/apns/ApnsSocketService.java   | 30 +++++++++++
 src/test/java/com/notnoop/apns/MainClass.java | 30 +++++++++++
 .../com/notnoop/apns/PayloadBuilderTest.java  | 30 +++++++++++
 .../integration/ApnsConnectionCacheTest.java  | 30 +++++++++++
 .../integration/ApnsConnectionResendTest.java | 30 +++++++++++
 .../apns/integration/ApnsConnectionTest.java  | 29 +++++++++++
 .../integration/ApnsDelegateRecorder.java     | 30 +++++++++++
 .../ApnsSimulatorLongRunningTest.java         | 30 +++++++++++
 .../apns/integration/ApnsSimulatorTest.java   | 30 +++++++++++
 .../integration/ApnsSimulatorTestBase.java    | 30 +++++++++++
 .../apns/integration/FeedbackTest.java        | 30 +++++++++++
 .../apns/internal/ApnsConnectionTest.java     | 30 +++++++++++
 .../internal/ApnsFeedbackConnectionTest.java  | 30 +++++++++++
 .../internal/ApnsFeedbackParsingUtils.java    | 30 +++++++++++
 .../internal/ApnsPooledConnectionTest.java    | 30 +++++++++++
 .../apns/internal/ApnsServiceImplTest.java    | 30 +++++++++++
 .../apns/internal/BatchApnsServiceTest.java   | 30 +++++++++++
 .../notnoop/apns/internal/MockingUtils.java   | 30 +++++++++++
 .../internal/QueuedApnsServiceTCTest.java     | 30 +++++++++++
 .../apns/internal/QueuedApnsServiceTest.java  | 30 +++++++++++
 .../com/notnoop/apns/internal/SillyTests.java | 30 +++++++++++
 .../internal/SimpleApnsNotificationTest.java  | 30 +++++++++++
 .../apns/internal/TlsTunnelBuilderTest.java   | 51 +++++++++---------
 .../notnoop/apns/internal/UtilitiesTest.java  | 50 +++++++++---------
 .../notnoop/apns/utils/ApnsServerStub.java    | 30 +++++++++++
 .../notnoop/apns/utils/FixedCertificates.java | 30 +++++++++++
 .../notnoop/apns/utils/Simulator/Action.java  | 30 +++++++++++
 .../apns/utils/Simulator/ApnsInputStream.java | 30 +++++++++++
 .../Simulator/ApnsNotificationWithAction.java | 30 +++++++++++
 .../apns/utils/Simulator/ApnsResponse.java    | 30 +++++++++++
 .../utils/Simulator/ApnsServerSimulator.java  | 30 +++++++++++
 .../ApnsSimulatorWithVerification.java        | 30 +++++++++++
 .../Simulator/FailingApnsServerSimulator.java | 30 +++++++++++
 .../utils/Simulator/InputOutputSocket.java    | 30 +++++++++++
 .../apns/utils/StringTruncationTest.java      | 30 +++++++++++
 .../utils/junit/DumpThreadsOnErrorRule.java   | 30 +++++++++++
 .../com/notnoop/apns/utils/junit/Repeat.java  | 30 +++++++++++
 .../notnoop/apns/utils/junit/RepeatRule.java  | 30 +++++++++++
 74 files changed, 2089 insertions(+), 657 deletions(-)

diff --git a/src/main/java/com/notnoop/apns/APNS.java b/src/main/java/com/notnoop/apns/APNS.java
index b8ec87a1..9b8f68c0 100644
--- a/src/main/java/com/notnoop/apns/APNS.java
+++ b/src/main/java/com/notnoop/apns/APNS.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2009, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns;
 
diff --git a/src/main/java/com/notnoop/apns/ApnsDelegate.java b/src/main/java/com/notnoop/apns/ApnsDelegate.java
index 77bfe281..f48738ce 100644
--- a/src/main/java/com/notnoop/apns/ApnsDelegate.java
+++ b/src/main/java/com/notnoop/apns/ApnsDelegate.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2010, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns;
 
diff --git a/src/main/java/com/notnoop/apns/ApnsDelegateAdapter.java b/src/main/java/com/notnoop/apns/ApnsDelegateAdapter.java
index bd6de4e8..d10a6755 100644
--- a/src/main/java/com/notnoop/apns/ApnsDelegateAdapter.java
+++ b/src/main/java/com/notnoop/apns/ApnsDelegateAdapter.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns;
 
 /**
diff --git a/src/main/java/com/notnoop/apns/ApnsNotification.java b/src/main/java/com/notnoop/apns/ApnsNotification.java
index 594d0b51..945acccf 100644
--- a/src/main/java/com/notnoop/apns/ApnsNotification.java
+++ b/src/main/java/com/notnoop/apns/ApnsNotification.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2010, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns;
 
diff --git a/src/main/java/com/notnoop/apns/ApnsService.java b/src/main/java/com/notnoop/apns/ApnsService.java
index bee830c3..2f34ed78 100644
--- a/src/main/java/com/notnoop/apns/ApnsService.java
+++ b/src/main/java/com/notnoop/apns/ApnsService.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2009, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns;
 
diff --git a/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java b/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
index a1d39de5..d3fffecf 100644
--- a/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
+++ b/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2009, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns;
 
diff --git a/src/main/java/com/notnoop/apns/DeliveryError.java b/src/main/java/com/notnoop/apns/DeliveryError.java
index 41f9cd01..4ba33f64 100644
--- a/src/main/java/com/notnoop/apns/DeliveryError.java
+++ b/src/main/java/com/notnoop/apns/DeliveryError.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2010, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns;
 
diff --git a/src/main/java/com/notnoop/apns/EnhancedApnsNotification.java b/src/main/java/com/notnoop/apns/EnhancedApnsNotification.java
index c2474ed9..f30fc912 100644
--- a/src/main/java/com/notnoop/apns/EnhancedApnsNotification.java
+++ b/src/main/java/com/notnoop/apns/EnhancedApnsNotification.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2010, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns;
 
diff --git a/src/main/java/com/notnoop/apns/PayloadBuilder.java b/src/main/java/com/notnoop/apns/PayloadBuilder.java
index a5869c38..798c22a0 100644
--- a/src/main/java/com/notnoop/apns/PayloadBuilder.java
+++ b/src/main/java/com/notnoop/apns/PayloadBuilder.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2009, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns;
 
diff --git a/src/main/java/com/notnoop/apns/ReconnectPolicy.java b/src/main/java/com/notnoop/apns/ReconnectPolicy.java
index 6361605e..bff7dd96 100644
--- a/src/main/java/com/notnoop/apns/ReconnectPolicy.java
+++ b/src/main/java/com/notnoop/apns/ReconnectPolicy.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2010, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns;
 
diff --git a/src/main/java/com/notnoop/apns/SimpleApnsNotification.java b/src/main/java/com/notnoop/apns/SimpleApnsNotification.java
index 5fd42e0a..20720be0 100644
--- a/src/main/java/com/notnoop/apns/SimpleApnsNotification.java
+++ b/src/main/java/com/notnoop/apns/SimpleApnsNotification.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2009, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns;
 
diff --git a/src/main/java/com/notnoop/apns/StartSendingApnsDelegate.java b/src/main/java/com/notnoop/apns/StartSendingApnsDelegate.java
index a77f862b..cf7d9577 100644
--- a/src/main/java/com/notnoop/apns/StartSendingApnsDelegate.java
+++ b/src/main/java/com/notnoop/apns/StartSendingApnsDelegate.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns;
 
 /**
diff --git a/src/main/java/com/notnoop/apns/internal/AbstractApnsService.java b/src/main/java/com/notnoop/apns/internal/AbstractApnsService.java
index 52d8e4ec..5f993649 100644
--- a/src/main/java/com/notnoop/apns/internal/AbstractApnsService.java
+++ b/src/main/java/com/notnoop/apns/internal/AbstractApnsService.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2010-2011, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns.internal;
 
diff --git a/src/main/java/com/notnoop/apns/internal/ApnsConnection.java b/src/main/java/com/notnoop/apns/internal/ApnsConnection.java
index 96020d9e..757a81b3 100644
--- a/src/main/java/com/notnoop/apns/internal/ApnsConnection.java
+++ b/src/main/java/com/notnoop/apns/internal/ApnsConnection.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2009, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns.internal;
 
diff --git a/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java b/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java
index 8c819d2d..6739c52d 100644
--- a/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java
+++ b/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java
@@ -1,32 +1,32 @@
- /*
- * Copyright 2009, Mahmood Ali.
- * All rights reserved.
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns.internal;
 
diff --git a/src/main/java/com/notnoop/apns/internal/ApnsFeedbackConnection.java b/src/main/java/com/notnoop/apns/internal/ApnsFeedbackConnection.java
index 483f1ce2..26db2086 100644
--- a/src/main/java/com/notnoop/apns/internal/ApnsFeedbackConnection.java
+++ b/src/main/java/com/notnoop/apns/internal/ApnsFeedbackConnection.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2009, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns.internal;
 
diff --git a/src/main/java/com/notnoop/apns/internal/ApnsPooledConnection.java b/src/main/java/com/notnoop/apns/internal/ApnsPooledConnection.java
index ae6a7c56..e27d1702 100644
--- a/src/main/java/com/notnoop/apns/internal/ApnsPooledConnection.java
+++ b/src/main/java/com/notnoop/apns/internal/ApnsPooledConnection.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import java.util.concurrent.*;
diff --git a/src/main/java/com/notnoop/apns/internal/ApnsServiceImpl.java b/src/main/java/com/notnoop/apns/internal/ApnsServiceImpl.java
index e6c231fa..387f5a8f 100644
--- a/src/main/java/com/notnoop/apns/internal/ApnsServiceImpl.java
+++ b/src/main/java/com/notnoop/apns/internal/ApnsServiceImpl.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2009, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns.internal;
 
diff --git a/src/main/java/com/notnoop/apns/internal/BatchApnsService.java b/src/main/java/com/notnoop/apns/internal/BatchApnsService.java
index e8c31c00..d7dcbefb 100644
--- a/src/main/java/com/notnoop/apns/internal/BatchApnsService.java
+++ b/src/main/java/com/notnoop/apns/internal/BatchApnsService.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import static java.util.concurrent.Executors.defaultThreadFactory;
diff --git a/src/main/java/com/notnoop/apns/internal/QueuedApnsService.java b/src/main/java/com/notnoop/apns/internal/QueuedApnsService.java
index d9ad4dc4..21cc8202 100644
--- a/src/main/java/com/notnoop/apns/internal/QueuedApnsService.java
+++ b/src/main/java/com/notnoop/apns/internal/QueuedApnsService.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2009, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns.internal;
 
diff --git a/src/main/java/com/notnoop/apns/internal/ReconnectPolicies.java b/src/main/java/com/notnoop/apns/internal/ReconnectPolicies.java
index 67eb5bb1..b6a70eb6 100644
--- a/src/main/java/com/notnoop/apns/internal/ReconnectPolicies.java
+++ b/src/main/java/com/notnoop/apns/internal/ReconnectPolicies.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2010, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns.internal;
 
diff --git a/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java b/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java
index 88c9dd26..5175bfd1 100644
--- a/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java
+++ b/src/main/java/com/notnoop/apns/internal/SSLContextBuilder.java
@@ -1,3 +1,32 @@
+/*
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import com.notnoop.exceptions.InvalidSSLConfig;
diff --git a/src/main/java/com/notnoop/apns/internal/TlsTunnelBuilder.java b/src/main/java/com/notnoop/apns/internal/TlsTunnelBuilder.java
index 6c24da83..5abf4b9f 100644
--- a/src/main/java/com/notnoop/apns/internal/TlsTunnelBuilder.java
+++ b/src/main/java/com/notnoop/apns/internal/TlsTunnelBuilder.java
@@ -1,33 +1,32 @@
 /*
- * Copyright 2012, Square, Inc.
- * Copyright 2012, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns.internal;
 
diff --git a/src/main/java/com/notnoop/apns/internal/Utilities.java b/src/main/java/com/notnoop/apns/internal/Utilities.java
index 7a62ab19..1849098b 100644
--- a/src/main/java/com/notnoop/apns/internal/Utilities.java
+++ b/src/main/java/com/notnoop/apns/internal/Utilities.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2009, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns.internal;
 
diff --git a/src/main/java/com/notnoop/exceptions/ApnsDeliveryErrorException.java b/src/main/java/com/notnoop/exceptions/ApnsDeliveryErrorException.java
index 8e6e4767..c9b3bea9 100644
--- a/src/main/java/com/notnoop/exceptions/ApnsDeliveryErrorException.java
+++ b/src/main/java/com/notnoop/exceptions/ApnsDeliveryErrorException.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
diff --git a/src/main/java/com/notnoop/exceptions/ApnsException.java b/src/main/java/com/notnoop/exceptions/ApnsException.java
index e8f23e9b..f1725e5c 100644
--- a/src/main/java/com/notnoop/exceptions/ApnsException.java
+++ b/src/main/java/com/notnoop/exceptions/ApnsException.java
@@ -1,34 +1,33 @@
 /*
- * Copyright 2010, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 package com.notnoop.exceptions;
 
 /**
diff --git a/src/main/java/com/notnoop/exceptions/InvalidSSLConfig.java b/src/main/java/com/notnoop/exceptions/InvalidSSLConfig.java
index 86b83925..be975789 100644
--- a/src/main/java/com/notnoop/exceptions/InvalidSSLConfig.java
+++ b/src/main/java/com/notnoop/exceptions/InvalidSSLConfig.java
@@ -1,34 +1,33 @@
 /*
- * Copyright 2010, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 package com.notnoop.exceptions;
 
 import java.io.IOException;
diff --git a/src/main/java/com/notnoop/exceptions/NetworkIOException.java b/src/main/java/com/notnoop/exceptions/NetworkIOException.java
index 03ef348b..df84eb5e 100644
--- a/src/main/java/com/notnoop/exceptions/NetworkIOException.java
+++ b/src/main/java/com/notnoop/exceptions/NetworkIOException.java
@@ -1,34 +1,33 @@
 /*
- * Copyright 2010, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 package com.notnoop.exceptions;
 
 import java.io.IOException;
diff --git a/src/main/java/com/notnoop/exceptions/RuntimeIOException.java b/src/main/java/com/notnoop/exceptions/RuntimeIOException.java
index 64e61475..1a447bd5 100644
--- a/src/main/java/com/notnoop/exceptions/RuntimeIOException.java
+++ b/src/main/java/com/notnoop/exceptions/RuntimeIOException.java
@@ -1,34 +1,33 @@
 /*
- * Copyright 2010, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 package com.notnoop.exceptions;
 
 import java.io.IOException;
diff --git a/src/test/java/com/notnoop/apns/APNSTest.java b/src/test/java/com/notnoop/apns/APNSTest.java
index bf5e8f9e..aefe16f2 100644
--- a/src/test/java/com/notnoop/apns/APNSTest.java
+++ b/src/test/java/com/notnoop/apns/APNSTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns;
 
 import org.junit.Test;
diff --git a/src/test/java/com/notnoop/apns/AbstractApnsServerSocket.java b/src/test/java/com/notnoop/apns/AbstractApnsServerSocket.java
index 2a82850e..7a1efdcd 100644
--- a/src/test/java/com/notnoop/apns/AbstractApnsServerSocket.java
+++ b/src/test/java/com/notnoop/apns/AbstractApnsServerSocket.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns;
 
 import java.io.IOException;
diff --git a/src/test/java/com/notnoop/apns/ApnsFeedbackServerSocket.java b/src/test/java/com/notnoop/apns/ApnsFeedbackServerSocket.java
index 792f59b4..254a108d 100644
--- a/src/test/java/com/notnoop/apns/ApnsFeedbackServerSocket.java
+++ b/src/test/java/com/notnoop/apns/ApnsFeedbackServerSocket.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns;
 
 import java.io.DataOutputStream;
diff --git a/src/test/java/com/notnoop/apns/ApnsGatewayServerSocket.java b/src/test/java/com/notnoop/apns/ApnsGatewayServerSocket.java
index d1a0cf21..3e04d5b0 100644
--- a/src/test/java/com/notnoop/apns/ApnsGatewayServerSocket.java
+++ b/src/test/java/com/notnoop/apns/ApnsGatewayServerSocket.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns;
 
 import java.io.BufferedOutputStream;
diff --git a/src/test/java/com/notnoop/apns/ApnsServerExceptionDelegate.java b/src/test/java/com/notnoop/apns/ApnsServerExceptionDelegate.java
index 981cd9a9..431f0d63 100644
--- a/src/test/java/com/notnoop/apns/ApnsServerExceptionDelegate.java
+++ b/src/test/java/com/notnoop/apns/ApnsServerExceptionDelegate.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns;
 
 /**
diff --git a/src/test/java/com/notnoop/apns/ApnsServerService.java b/src/test/java/com/notnoop/apns/ApnsServerService.java
index 58a8cfea..d7de5a24 100644
--- a/src/test/java/com/notnoop/apns/ApnsServerService.java
+++ b/src/test/java/com/notnoop/apns/ApnsServerService.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns;
 
 import java.util.Collections;
diff --git a/src/test/java/com/notnoop/apns/ApnsServerSocketBuilder.java b/src/test/java/com/notnoop/apns/ApnsServerSocketBuilder.java
index 66c88760..d2a9d7d9 100644
--- a/src/test/java/com/notnoop/apns/ApnsServerSocketBuilder.java
+++ b/src/test/java/com/notnoop/apns/ApnsServerSocketBuilder.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2009, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns;
 
diff --git a/src/test/java/com/notnoop/apns/ApnsSocketService.java b/src/test/java/com/notnoop/apns/ApnsSocketService.java
index bbbcdce8..25378490 100644
--- a/src/test/java/com/notnoop/apns/ApnsSocketService.java
+++ b/src/test/java/com/notnoop/apns/ApnsSocketService.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns;
 
 import java.io.IOException;
diff --git a/src/test/java/com/notnoop/apns/MainClass.java b/src/test/java/com/notnoop/apns/MainClass.java
index 91a03354..1c43993d 100644
--- a/src/test/java/com/notnoop/apns/MainClass.java
+++ b/src/test/java/com/notnoop/apns/MainClass.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns;
 
 import java.io.FileInputStream;
diff --git a/src/test/java/com/notnoop/apns/PayloadBuilderTest.java b/src/test/java/com/notnoop/apns/PayloadBuilderTest.java
index 10f332ad..95ebe28b 100644
--- a/src/test/java/com/notnoop/apns/PayloadBuilderTest.java
+++ b/src/test/java/com/notnoop/apns/PayloadBuilderTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns;
 
 import java.util.Arrays;
diff --git a/src/test/java/com/notnoop/apns/integration/ApnsConnectionCacheTest.java b/src/test/java/com/notnoop/apns/integration/ApnsConnectionCacheTest.java
index b34e589d..79aa042e 100644
--- a/src/test/java/com/notnoop/apns/integration/ApnsConnectionCacheTest.java
+++ b/src/test/java/com/notnoop/apns/integration/ApnsConnectionCacheTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.integration;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/src/test/java/com/notnoop/apns/integration/ApnsConnectionResendTest.java b/src/test/java/com/notnoop/apns/integration/ApnsConnectionResendTest.java
index 8703146d..f826146f 100644
--- a/src/test/java/com/notnoop/apns/integration/ApnsConnectionResendTest.java
+++ b/src/test/java/com/notnoop/apns/integration/ApnsConnectionResendTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.integration;
 
 import com.notnoop.apns.APNS;
diff --git a/src/test/java/com/notnoop/apns/integration/ApnsConnectionTest.java b/src/test/java/com/notnoop/apns/integration/ApnsConnectionTest.java
index c348b77a..d366e91c 100644
--- a/src/test/java/com/notnoop/apns/integration/ApnsConnectionTest.java
+++ b/src/test/java/com/notnoop/apns/integration/ApnsConnectionTest.java
@@ -1,3 +1,32 @@
+/*
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.integration;
 
 import com.notnoop.apns.APNS;
diff --git a/src/test/java/com/notnoop/apns/integration/ApnsDelegateRecorder.java b/src/test/java/com/notnoop/apns/integration/ApnsDelegateRecorder.java
index 9ba1ee24..1d3cdfba 100644
--- a/src/test/java/com/notnoop/apns/integration/ApnsDelegateRecorder.java
+++ b/src/test/java/com/notnoop/apns/integration/ApnsDelegateRecorder.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.integration;
 
 import com.notnoop.apns.ApnsDelegate;
diff --git a/src/test/java/com/notnoop/apns/integration/ApnsSimulatorLongRunningTest.java b/src/test/java/com/notnoop/apns/integration/ApnsSimulatorLongRunningTest.java
index d2f3554e..ec7ceaf1 100644
--- a/src/test/java/com/notnoop/apns/integration/ApnsSimulatorLongRunningTest.java
+++ b/src/test/java/com/notnoop/apns/integration/ApnsSimulatorLongRunningTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.integration;
 
 import org.junit.Test;
diff --git a/src/test/java/com/notnoop/apns/integration/ApnsSimulatorTest.java b/src/test/java/com/notnoop/apns/integration/ApnsSimulatorTest.java
index 76675801..194f8127 100644
--- a/src/test/java/com/notnoop/apns/integration/ApnsSimulatorTest.java
+++ b/src/test/java/com/notnoop/apns/integration/ApnsSimulatorTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.integration;
 
 import com.notnoop.apns.DeliveryError;
diff --git a/src/test/java/com/notnoop/apns/integration/ApnsSimulatorTestBase.java b/src/test/java/com/notnoop/apns/integration/ApnsSimulatorTestBase.java
index 11038eff..5461924a 100644
--- a/src/test/java/com/notnoop/apns/integration/ApnsSimulatorTestBase.java
+++ b/src/test/java/com/notnoop/apns/integration/ApnsSimulatorTestBase.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.integration;
 
 import com.notnoop.apns.*;
diff --git a/src/test/java/com/notnoop/apns/integration/FeedbackTest.java b/src/test/java/com/notnoop/apns/integration/FeedbackTest.java
index 0ebdfd8f..706bee06 100644
--- a/src/test/java/com/notnoop/apns/integration/FeedbackTest.java
+++ b/src/test/java/com/notnoop/apns/integration/FeedbackTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.integration;
 
 import java.io.IOException;
diff --git a/src/test/java/com/notnoop/apns/internal/ApnsConnectionTest.java b/src/test/java/com/notnoop/apns/internal/ApnsConnectionTest.java
index 1c78a354..e9964589 100644
--- a/src/test/java/com/notnoop/apns/internal/ApnsConnectionTest.java
+++ b/src/test/java/com/notnoop/apns/internal/ApnsConnectionTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import java.io.ByteArrayOutputStream;
diff --git a/src/test/java/com/notnoop/apns/internal/ApnsFeedbackConnectionTest.java b/src/test/java/com/notnoop/apns/internal/ApnsFeedbackConnectionTest.java
index 435f42e2..537ddd22 100644
--- a/src/test/java/com/notnoop/apns/internal/ApnsFeedbackConnectionTest.java
+++ b/src/test/java/com/notnoop/apns/internal/ApnsFeedbackConnectionTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import java.io.ByteArrayInputStream;
diff --git a/src/test/java/com/notnoop/apns/internal/ApnsFeedbackParsingUtils.java b/src/test/java/com/notnoop/apns/internal/ApnsFeedbackParsingUtils.java
index 24e6b8c8..fe84b89e 100644
--- a/src/test/java/com/notnoop/apns/internal/ApnsFeedbackParsingUtils.java
+++ b/src/test/java/com/notnoop/apns/internal/ApnsFeedbackParsingUtils.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import java.util.Arrays;
diff --git a/src/test/java/com/notnoop/apns/internal/ApnsPooledConnectionTest.java b/src/test/java/com/notnoop/apns/internal/ApnsPooledConnectionTest.java
index 87da197d..7071a85b 100644
--- a/src/test/java/com/notnoop/apns/internal/ApnsPooledConnectionTest.java
+++ b/src/test/java/com/notnoop/apns/internal/ApnsPooledConnectionTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import com.notnoop.apns.ApnsNotification;
diff --git a/src/test/java/com/notnoop/apns/internal/ApnsServiceImplTest.java b/src/test/java/com/notnoop/apns/internal/ApnsServiceImplTest.java
index 838f834b..e4b60ebf 100644
--- a/src/test/java/com/notnoop/apns/internal/ApnsServiceImplTest.java
+++ b/src/test/java/com/notnoop/apns/internal/ApnsServiceImplTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import org.junit.Test;
diff --git a/src/test/java/com/notnoop/apns/internal/BatchApnsServiceTest.java b/src/test/java/com/notnoop/apns/internal/BatchApnsServiceTest.java
index 2a685c54..70b62030 100644
--- a/src/test/java/com/notnoop/apns/internal/BatchApnsServiceTest.java
+++ b/src/test/java/com/notnoop/apns/internal/BatchApnsServiceTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import static org.mockito.Mockito.mock;
diff --git a/src/test/java/com/notnoop/apns/internal/MockingUtils.java b/src/test/java/com/notnoop/apns/internal/MockingUtils.java
index 032bd91b..0b1b3e81 100644
--- a/src/test/java/com/notnoop/apns/internal/MockingUtils.java
+++ b/src/test/java/com/notnoop/apns/internal/MockingUtils.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import java.io.IOException;
diff --git a/src/test/java/com/notnoop/apns/internal/QueuedApnsServiceTCTest.java b/src/test/java/com/notnoop/apns/internal/QueuedApnsServiceTCTest.java
index dfc70b51..d7374649 100644
--- a/src/test/java/com/notnoop/apns/internal/QueuedApnsServiceTCTest.java
+++ b/src/test/java/com/notnoop/apns/internal/QueuedApnsServiceTCTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/com/notnoop/apns/internal/QueuedApnsServiceTest.java b/src/test/java/com/notnoop/apns/internal/QueuedApnsServiceTest.java
index b2f9a7eb..846a9a6f 100644
--- a/src/test/java/com/notnoop/apns/internal/QueuedApnsServiceTest.java
+++ b/src/test/java/com/notnoop/apns/internal/QueuedApnsServiceTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/com/notnoop/apns/internal/SillyTests.java b/src/test/java/com/notnoop/apns/internal/SillyTests.java
index 5f8df3f7..f51da395 100644
--- a/src/test/java/com/notnoop/apns/internal/SillyTests.java
+++ b/src/test/java/com/notnoop/apns/internal/SillyTests.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import java.util.Collections;
diff --git a/src/test/java/com/notnoop/apns/internal/SimpleApnsNotificationTest.java b/src/test/java/com/notnoop/apns/internal/SimpleApnsNotificationTest.java
index 38e11f52..29660941 100644
--- a/src/test/java/com/notnoop/apns/internal/SimpleApnsNotificationTest.java
+++ b/src/test/java/com/notnoop/apns/internal/SimpleApnsNotificationTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.internal;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/com/notnoop/apns/internal/TlsTunnelBuilderTest.java b/src/test/java/com/notnoop/apns/internal/TlsTunnelBuilderTest.java
index 954fccf9..833bed55 100644
--- a/src/test/java/com/notnoop/apns/internal/TlsTunnelBuilderTest.java
+++ b/src/test/java/com/notnoop/apns/internal/TlsTunnelBuilderTest.java
@@ -1,33 +1,32 @@
 /*
- * Copyright 2012, Square, Inc.
- * Copyright 2012, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns.internal;
 
diff --git a/src/test/java/com/notnoop/apns/internal/UtilitiesTest.java b/src/test/java/com/notnoop/apns/internal/UtilitiesTest.java
index 32748d5d..251dc139 100644
--- a/src/test/java/com/notnoop/apns/internal/UtilitiesTest.java
+++ b/src/test/java/com/notnoop/apns/internal/UtilitiesTest.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2009, Mahmood Ali.
- * All rights reserved.
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
  *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following disclaimer
- *     in the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Mahmood Ali. nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.notnoop.apns.internal;
 
diff --git a/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java b/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java
index a608e691..c0568aff 100644
--- a/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java
+++ b/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils;
 
 import javax.net.ServerSocketFactory;
diff --git a/src/test/java/com/notnoop/apns/utils/FixedCertificates.java b/src/test/java/com/notnoop/apns/utils/FixedCertificates.java
index 8af23561..d9f69d33 100644
--- a/src/test/java/com/notnoop/apns/utils/FixedCertificates.java
+++ b/src/test/java/com/notnoop/apns/utils/FixedCertificates.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils;
 
 import com.notnoop.apns.internal.SSLContextBuilder;
diff --git a/src/test/java/com/notnoop/apns/utils/Simulator/Action.java b/src/test/java/com/notnoop/apns/utils/Simulator/Action.java
index cc0f5588..fdaddb6e 100644
--- a/src/test/java/com/notnoop/apns/utils/Simulator/Action.java
+++ b/src/test/java/com/notnoop/apns/utils/Simulator/Action.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils.Simulator;
 
 public enum Action {
diff --git a/src/test/java/com/notnoop/apns/utils/Simulator/ApnsInputStream.java b/src/test/java/com/notnoop/apns/utils/Simulator/ApnsInputStream.java
index 10c6f162..189ca3a4 100644
--- a/src/test/java/com/notnoop/apns/utils/Simulator/ApnsInputStream.java
+++ b/src/test/java/com/notnoop/apns/utils/Simulator/ApnsInputStream.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils.Simulator;
 
 import java.io.ByteArrayInputStream;
diff --git a/src/test/java/com/notnoop/apns/utils/Simulator/ApnsNotificationWithAction.java b/src/test/java/com/notnoop/apns/utils/Simulator/ApnsNotificationWithAction.java
index d0725b80..b05bc6ef 100644
--- a/src/test/java/com/notnoop/apns/utils/Simulator/ApnsNotificationWithAction.java
+++ b/src/test/java/com/notnoop/apns/utils/Simulator/ApnsNotificationWithAction.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils.Simulator;
 
 import com.notnoop.apns.utils.Simulator.ApnsServerSimulator.Notification;
diff --git a/src/test/java/com/notnoop/apns/utils/Simulator/ApnsResponse.java b/src/test/java/com/notnoop/apns/utils/Simulator/ApnsResponse.java
index 9d569c12..8fcc7d9d 100644
--- a/src/test/java/com/notnoop/apns/utils/Simulator/ApnsResponse.java
+++ b/src/test/java/com/notnoop/apns/utils/Simulator/ApnsResponse.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils.Simulator;
 
 import com.notnoop.apns.ApnsNotification;
diff --git a/src/test/java/com/notnoop/apns/utils/Simulator/ApnsServerSimulator.java b/src/test/java/com/notnoop/apns/utils/Simulator/ApnsServerSimulator.java
index 1fd1187f..cfa2ce61 100644
--- a/src/test/java/com/notnoop/apns/utils/Simulator/ApnsServerSimulator.java
+++ b/src/test/java/com/notnoop/apns/utils/Simulator/ApnsServerSimulator.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils.Simulator;
 
 import java.io.ByteArrayOutputStream;
diff --git a/src/test/java/com/notnoop/apns/utils/Simulator/ApnsSimulatorWithVerification.java b/src/test/java/com/notnoop/apns/utils/Simulator/ApnsSimulatorWithVerification.java
index bb5aa88f..b5e591bc 100644
--- a/src/test/java/com/notnoop/apns/utils/Simulator/ApnsSimulatorWithVerification.java
+++ b/src/test/java/com/notnoop/apns/utils/Simulator/ApnsSimulatorWithVerification.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils.Simulator;
 
 import com.google.common.base.Strings;
diff --git a/src/test/java/com/notnoop/apns/utils/Simulator/FailingApnsServerSimulator.java b/src/test/java/com/notnoop/apns/utils/Simulator/FailingApnsServerSimulator.java
index 0036f1fb..dda34b56 100644
--- a/src/test/java/com/notnoop/apns/utils/Simulator/FailingApnsServerSimulator.java
+++ b/src/test/java/com/notnoop/apns/utils/Simulator/FailingApnsServerSimulator.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils.Simulator;
 
 import org.slf4j.Logger;
diff --git a/src/test/java/com/notnoop/apns/utils/Simulator/InputOutputSocket.java b/src/test/java/com/notnoop/apns/utils/Simulator/InputOutputSocket.java
index fd4a1235..b55b0b6a 100644
--- a/src/test/java/com/notnoop/apns/utils/Simulator/InputOutputSocket.java
+++ b/src/test/java/com/notnoop/apns/utils/Simulator/InputOutputSocket.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils.Simulator;
 
 import java.io.DataOutputStream;
diff --git a/src/test/java/com/notnoop/apns/utils/StringTruncationTest.java b/src/test/java/com/notnoop/apns/utils/StringTruncationTest.java
index 5bf297a3..275e50e8 100644
--- a/src/test/java/com/notnoop/apns/utils/StringTruncationTest.java
+++ b/src/test/java/com/notnoop/apns/utils/StringTruncationTest.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils;
 
 import org.junit.Assert;
diff --git a/src/test/java/com/notnoop/apns/utils/junit/DumpThreadsOnErrorRule.java b/src/test/java/com/notnoop/apns/utils/junit/DumpThreadsOnErrorRule.java
index d90a8d67..9ac5565d 100644
--- a/src/test/java/com/notnoop/apns/utils/junit/DumpThreadsOnErrorRule.java
+++ b/src/test/java/com/notnoop/apns/utils/junit/DumpThreadsOnErrorRule.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils.junit;
 
 
diff --git a/src/test/java/com/notnoop/apns/utils/junit/Repeat.java b/src/test/java/com/notnoop/apns/utils/junit/Repeat.java
index 80cf10b1..382ace30 100644
--- a/src/test/java/com/notnoop/apns/utils/junit/Repeat.java
+++ b/src/test/java/com/notnoop/apns/utils/junit/Repeat.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils.junit;
 
 import java.lang.annotation.Retention;
diff --git a/src/test/java/com/notnoop/apns/utils/junit/RepeatRule.java b/src/test/java/com/notnoop/apns/utils/junit/RepeatRule.java
index f16de125..eeababe9 100644
--- a/src/test/java/com/notnoop/apns/utils/junit/RepeatRule.java
+++ b/src/test/java/com/notnoop/apns/utils/junit/RepeatRule.java
@@ -1,3 +1,33 @@
+/*
+ *  Copyright 2009, Mahmood Ali.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other materials provided with the
+ *      distribution.
+ *    * Neither the name of Mahmood Ali. nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.notnoop.apns.utils.junit;
 
 

From be65149cc1d14a5b19ba72abf202c6ae3d36bf69 Mon Sep 17 00:00:00 2001
From: Christian Ivan <christian.ivan@devfactory.com>
Date: Thu, 26 Nov 2015 20:26:51 +0700
Subject: [PATCH 10/15] Code quality fix - Redundant Field Initializer

---
 .../com/notnoop/apns/ApnsServiceBuilder.java  | 22 +++++++++----------
 .../apns/EnhancedApnsNotification.java        |  2 +-
 .../notnoop/apns/SimpleApnsNotification.java  |  2 +-
 .../notnoop/apns/ApnsServerSocketBuilder.java |  2 +-
 .../internal/ApnsFeedbackParsingUtils.java    |  2 +-
 .../notnoop/apns/utils/ApnsServerStub.java    |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java b/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
index d3fffecf..abc01f3b 100644
--- a/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
+++ b/src/main/java/com/notnoop/apns/ApnsServiceBuilder.java
@@ -90,8 +90,8 @@ public class ApnsServiceBuilder {
 
     private SSLContext sslContext;
 
-    private int readTimeout = 0;
-    private int connectTimeout = 0;
+    private int readTimeout;
+    private int connectTimeout;
 
     private String gatewayHost;
     private int gatewayPort = -1;
@@ -101,23 +101,23 @@ public class ApnsServiceBuilder {
     private int pooledMax = 1;
     private int cacheLength = ApnsConnection.DEFAULT_CACHE_LENGTH;
     private boolean autoAdjustCacheLength = true;
-    private ExecutorService executor = null;
+    private ExecutorService executor;
 
     private ReconnectPolicy reconnectPolicy = ReconnectPolicy.Provided.EVERY_HALF_HOUR.newObject();
-    private boolean isQueued = false;
-    private ThreadFactory queueThreadFactory = null;
+    private boolean isQueued;
+    private ThreadFactory queueThreadFactory;
     
-    private boolean isBatched = false;
+    private boolean isBatched;
     private int batchWaitTimeInSec;
     private int batchMaxWaitTimeInSec;
-    private ScheduledExecutorService batchThreadPoolExecutor = null;
+    private ScheduledExecutorService batchThreadPoolExecutor;
     
     private ApnsDelegate delegate = ApnsDelegate.EMPTY;
-    private Proxy proxy = null;
-    private String proxyUsername = null;
-    private String proxyPassword = null;
+    private Proxy proxy;
+    private String proxyUsername;
+    private String proxyPassword;
     private boolean errorDetection = true;
-    private ThreadFactory errorDetectionThreadFactory = null;
+    private ThreadFactory errorDetectionThreadFactory;
 
     /**
      * Constructs a new instance of {@code ApnsServiceBuilder}
diff --git a/src/main/java/com/notnoop/apns/EnhancedApnsNotification.java b/src/main/java/com/notnoop/apns/EnhancedApnsNotification.java
index f30fc912..49624d33 100644
--- a/src/main/java/com/notnoop/apns/EnhancedApnsNotification.java
+++ b/src/main/java/com/notnoop/apns/EnhancedApnsNotification.java
@@ -112,7 +112,7 @@ public int getExpiry() {
         return expiry;
     }
 
-    private byte[] marshall = null;
+    private byte[] marshall;
     /**
      * Returns the binary representation of the message as expected by the
      * APNS server.
diff --git a/src/main/java/com/notnoop/apns/SimpleApnsNotification.java b/src/main/java/com/notnoop/apns/SimpleApnsNotification.java
index 20720be0..4e9d0bc4 100644
--- a/src/main/java/com/notnoop/apns/SimpleApnsNotification.java
+++ b/src/main/java/com/notnoop/apns/SimpleApnsNotification.java
@@ -97,7 +97,7 @@ public byte[] getPayload() {
         return Utilities.copyOf(payload);
     }
 
-    private byte[] marshall = null;
+    private byte[] marshall;
     /**
      * Returns the binary representation of the message as expected by the
      * APNS server.
diff --git a/src/test/java/com/notnoop/apns/ApnsServerSocketBuilder.java b/src/test/java/com/notnoop/apns/ApnsServerSocketBuilder.java
index d2a9d7d9..fc78aad2 100644
--- a/src/test/java/com/notnoop/apns/ApnsServerSocketBuilder.java
+++ b/src/test/java/com/notnoop/apns/ApnsServerSocketBuilder.java
@@ -70,7 +70,7 @@ public class ApnsServerSocketBuilder {
 	private SSLContext sslContext;
 	private int gatewayPort = -1;
 	private int feedbackPort = -1;
-	private ExecutorService executor = null;
+	private ExecutorService executor;
 	private ApnsServerService serverService = ApnsServerService.EMPTY;
 	private ApnsServerExceptionDelegate exceptionDelegate = ApnsServerExceptionDelegate.EMPTY;
 
diff --git a/src/test/java/com/notnoop/apns/internal/ApnsFeedbackParsingUtils.java b/src/test/java/com/notnoop/apns/internal/ApnsFeedbackParsingUtils.java
index fe84b89e..40603b6f 100644
--- a/src/test/java/com/notnoop/apns/internal/ApnsFeedbackParsingUtils.java
+++ b/src/test/java/com/notnoop/apns/internal/ApnsFeedbackParsingUtils.java
@@ -70,7 +70,7 @@ static byte[] pack(byte[]... args) {
                    || (Arrays.equals(firstDevice, thirdDevice)));
     }
 
-    static int simpleDate = 0;
+    static int simpleDate;
     public static byte[] simple = pack(
             /* time_t */  new byte[] {0, 0, 0, 0},
             /* length */  new byte[] { 0, 32 },
diff --git a/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java b/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java
index c0568aff..c64bd0e5 100644
--- a/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java
+++ b/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java
@@ -83,7 +83,7 @@ public static ApnsServerStub prepareAndStartServer() {
     private final int feedbackPort;
     private int effectiveGatewayPort;
     private int effectiveFeedbackPort;
-    private OutputStream gatewayOutputStream = null;
+    private OutputStream gatewayOutputStream;
 
     public ApnsServerStub(ServerSocketFactory sslFactory) {
         this(sslFactory, 0, 0);

From 21d4b49918efe3e178a9a51cb5466a0602816483 Mon Sep 17 00:00:00 2001
From: Christian Ivan <christian.ivan@devfactory.com>
Date: Thu, 26 Nov 2015 20:45:41 +0700
Subject: [PATCH 11/15] Code quality - Strings literals should be placed on the
 left side when checking for equality

---
 src/main/java/com/notnoop/apns/internal/TlsTunnelBuilder.java | 2 +-
 src/test/java/com/notnoop/apns/MainClass.java                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/notnoop/apns/internal/TlsTunnelBuilder.java b/src/main/java/com/notnoop/apns/internal/TlsTunnelBuilder.java
index 5abf4b9f..5e0d68cf 100644
--- a/src/main/java/com/notnoop/apns/internal/TlsTunnelBuilder.java
+++ b/src/main/java/com/notnoop/apns/internal/TlsTunnelBuilder.java
@@ -122,7 +122,7 @@ Socket makeTunnel(String host, int port, String proxyUsername,
     private Socket AuthenticateProxy(ConnectMethod method, ProxyClient client, 
             String proxyHost, int proxyPort, 
             String proxyUsername, String proxyPassword) throws IOException {   
-        if(method.getProxyAuthState().getAuthScheme().getSchemeName().equalsIgnoreCase("ntlm")) {
+        if("ntlm".equalsIgnoreCase(method.getProxyAuthState().getAuthScheme().getSchemeName())) {
             // If Auth scheme is NTLM, set NT credentials with blank host and domain name
             client.getState().setProxyCredentials(new AuthScope(proxyHost, proxyPort), 
                             new NTCredentials(proxyUsername, proxyPassword,"",""));
diff --git a/src/test/java/com/notnoop/apns/MainClass.java b/src/test/java/com/notnoop/apns/MainClass.java
index 1c43993d..e737ce4d 100644
--- a/src/test/java/com/notnoop/apns/MainClass.java
+++ b/src/test/java/com/notnoop/apns/MainClass.java
@@ -75,7 +75,7 @@ public void notificationsResent(final int resendCount) {
         };
 
         final ApnsService svc = APNS.newService()
-                .withAppleDestination(args[0].equals("p"))
+                .withAppleDestination("p".equals(args[0]))
                 .withCert(new FileInputStream(args[1]), args[2])
                 .withDelegate(delegate)
                 .build();

From de9f59c65b85ff56646cb8ece5a5e0890005b534 Mon Sep 17 00:00:00 2001
From: Matthias Wessendorf <matzew@apache.org>
Date: Tue, 1 Dec 2015 15:58:33 +0100
Subject: [PATCH 12/15] trying to enable JDK 8

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 510d3870..90828b32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: Java
 jdk:
-#  - oraclejdk8
+  - oraclejdk8
   - openjdk7
   - oraclejdk7
   - openjdk6

From f99d54359f5037e645173bf7e88820c7f0342e0a Mon Sep 17 00:00:00 2001
From: Christian Ivan <christian.ivan@devfactory.com>
Date: Thu, 26 Nov 2015 17:36:01 +0700
Subject: [PATCH 13/15] Code quality fix - Exception handlers should preserve
 the original exception

Update
---
 .../notnoop/apns/EnhancedApnsNotification.java    |  9 +++++++--
 .../com/notnoop/apns/SimpleApnsNotification.java  | 10 +++++++---
 .../notnoop/apns/internal/ApnsConnectionImpl.java |  1 +
 .../com/notnoop/apns/utils/ApnsServerStub.java    | 15 +++++++++------
 .../apns/utils/Simulator/ApnsServerSimulator.java | 15 +++++++++------
 .../apns/utils/Simulator/InputOutputSocket.java   |  9 ++++++---
 6 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/notnoop/apns/EnhancedApnsNotification.java b/src/main/java/com/notnoop/apns/EnhancedApnsNotification.java
index f30fc912..e1896157 100644
--- a/src/main/java/com/notnoop/apns/EnhancedApnsNotification.java
+++ b/src/main/java/com/notnoop/apns/EnhancedApnsNotification.java
@@ -34,12 +34,16 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import com.notnoop.apns.internal.Utilities;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.io.UnsupportedEncodingException;
 
 /**
  * Represents an APNS notification to be sent to Apple service.
  */
 public class EnhancedApnsNotification implements ApnsNotification {
-
+	
+    private static final Logger LOGGER = LoggerFactory.getLogger(EnhancedApnsNotification.class);
     private final static byte COMMAND = 1;
     private static AtomicInteger nextId = new AtomicInteger(0);
     private final int identifier;
@@ -168,7 +172,8 @@ public String toString() {
         String payloadString;
         try {
             payloadString = new String(payload, "UTF-8");
-        } catch (Exception ex) {
+        } catch (UnsupportedEncodingException ex) {
+            LOGGER.debug("UTF-8 charset not found on the JRE", ex);
             payloadString = "???";
         }
         return "Message(Id="+identifier+"; Token="+Utilities.encodeHex(deviceToken)+"; Payload="+payloadString+")";
diff --git a/src/main/java/com/notnoop/apns/SimpleApnsNotification.java b/src/main/java/com/notnoop/apns/SimpleApnsNotification.java
index 20720be0..3621cf46 100644
--- a/src/main/java/com/notnoop/apns/SimpleApnsNotification.java
+++ b/src/main/java/com/notnoop/apns/SimpleApnsNotification.java
@@ -34,7 +34,9 @@
 
 import com.notnoop.apns.internal.Utilities;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.io.UnsupportedEncodingException;
 
 /**
  * Represents an APNS notification to be sent to Apple service. This is for legacy use only
@@ -52,7 +54,8 @@
 @SuppressWarnings("deprecation")
 @Deprecated
 public class SimpleApnsNotification implements ApnsNotification {
-
+	
+    private static final Logger LOGGER = LoggerFactory.getLogger(SimpleApnsNotification.class);
     private final static byte COMMAND = 0;
     private final byte[] deviceToken;
     private final byte[] payload;
@@ -155,7 +158,8 @@ public String toString() {
         String payloadString;
         try {
             payloadString = new String(payload, "UTF-8");
-        } catch (Exception ex) {
+        } catch (UnsupportedEncodingException ex) {
+            LOGGER.debug("UTF-8 charset not found on the JRE", ex);
             payloadString = "???";
         }
         return "Message(Token="+Utilities.encodeHex(deviceToken)+"; Payload="+payloadString+")";
diff --git a/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java b/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java
index 6739c52d..c70c5316 100644
--- a/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java
+++ b/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java
@@ -147,6 +147,7 @@ public void run() {
                     try {
                         in = socket.getInputStream();
                     } catch (IOException ioe) {
+                        logger.warn("The value of socket is null", ioe);
                         in = null;
                     }
 
diff --git a/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java b/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java
index c0568aff..d650bf82 100644
--- a/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java
+++ b/src/test/java/com/notnoop/apns/utils/ApnsServerStub.java
@@ -41,6 +41,8 @@
 import java.nio.ByteBuffer;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ApnsServerStub {
 
@@ -70,7 +72,8 @@ public static ApnsServerStub prepareAndStartServer() {
         server.start();
         return server;
     }
-
+    
+    private static final Logger LOGGER = LoggerFactory.getLogger(ApnsServerStub.class);
     private final AtomicInteger toWaitBeforeSend = new AtomicInteger(0);
     private final ByteArrayOutputStream received;
     private final ByteArrayOutputStream toSend;
@@ -118,14 +121,14 @@ public void stop() {
                 gatewaySocket.close();
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.warn("Can not close gatewaySocket properly", e);
         }
         try {
             if (feedbackSocket != null) {
                 feedbackSocket.close();
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.warn("Can not close feedbackSocket properly", e);
         }
 
         if (gatewayThread != null) {
@@ -146,7 +149,7 @@ public void sendError(int err, int id) {
             gatewayOutputStream.write(buf.array());
             gatewayOutputStream.flush();
         } catch (Exception ex) {
-            ex.printStackTrace();
+            LOGGER.warn("An error occured with accessing gateway", ex);
         }
     }
 
@@ -227,14 +230,14 @@ public void run() {
                         in.close();
                     }
                 } catch (IOException ioex) {
-                    System.err.println(ioex.toString());
+                    LOGGER.warn("Can not close socket properly", ioex);
                 }
                 try {
                     if (gatewayOutputStream != null) {
                         gatewayOutputStream.close();
                     }
                 } catch (IOException ioex) {
-                    System.err.println(ioex.toString());
+                    LOGGER.warn("Can not close gatewayOutputStream properly", ioex);
                 }
                 messages.release();
             }
diff --git a/src/test/java/com/notnoop/apns/utils/Simulator/ApnsServerSimulator.java b/src/test/java/com/notnoop/apns/utils/Simulator/ApnsServerSimulator.java
index cfa2ce61..0e93068c 100644
--- a/src/test/java/com/notnoop/apns/utils/Simulator/ApnsServerSimulator.java
+++ b/src/test/java/com/notnoop/apns/utils/Simulator/ApnsServerSimulator.java
@@ -85,14 +85,14 @@ public void stop() {
                 gatewaySocket.close();
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            logger.warn("Can not close gatewaySocket properly", e);
         }
         try {
             if (feedbackSocket != null) {
                 feedbackSocket.close();
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            logger.warn("Can not close feedbackSocket properly", e);
         }
 
         if (gatewayThread != null) {
@@ -141,9 +141,10 @@ public void run() {
                     try {
                         handleGatewayConnection(new InputOutputSocket(gatewaySocket.accept()));
                     } catch (SocketException ex) {
+                        logger.warn("Interruption while handling gateway connection", ex);
                         interrupt();
                     } catch (IOException ioe) {
-                        ioe.printStackTrace();
+                        logger.warn("An error occured while handling gateway connection", ioe);
                     }
                 }
             } finally {
@@ -186,6 +187,7 @@ private void parseNotifications(final InputOutputSocket inputOutputSocket) {
                             break;
                     }
                 } catch (IOException ioe) {
+                	logger.warn("An error occured while reading notification", ioe);
                     Thread.currentThread().interrupt();
                 }
             }
@@ -255,7 +257,7 @@ public void interrupt() {
             try {
                 gatewaySocket.close();
             } catch (IOException e) {
-                e.printStackTrace();
+                logger.warn("Can not close gatewaySocket properly", e);
             }
         }
     }
@@ -310,9 +312,10 @@ public void run() {
                     try {
                         handleFeedbackConnection(new InputOutputSocket(feedbackSocket.accept()));
                     } catch (SocketException ex) {
+                        logger.warn("Interruption while handling feedback connection", ex);
                         interrupt();
                     } catch (IOException ioe) {
-                        ioe.printStackTrace();
+                        logger.warn("An error occured while handling feedback connection", ioe);
                     }
                 }
             } finally {
@@ -331,7 +334,7 @@ public void run() {
                         sendFeedback(inputOutputSocket);
                     } catch (IOException ioe) {
                         // An exception is unexpected here. Close the current connection and bail out.
-                        ioe.printStackTrace();
+                        logger.warn("An error occured while sending feedback", ioe);
                     } finally {
                         inputOutputSocket.close();
                     }
diff --git a/src/test/java/com/notnoop/apns/utils/Simulator/InputOutputSocket.java b/src/test/java/com/notnoop/apns/utils/Simulator/InputOutputSocket.java
index b55b0b6a..8170c523 100644
--- a/src/test/java/com/notnoop/apns/utils/Simulator/InputOutputSocket.java
+++ b/src/test/java/com/notnoop/apns/utils/Simulator/InputOutputSocket.java
@@ -33,11 +33,14 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.net.Socket;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Wrap some of the boilerplate code using socket, enable passing around a socket together with its streams.
  */
 public class InputOutputSocket {
+    private static final Logger LOGGER = LoggerFactory.getLogger(InputOutputSocket.class);
     private final Socket socket;
     private final ApnsInputStream inputStream;
     private final DataOutputStream outputStream;
@@ -75,19 +78,19 @@ public synchronized void close() {
         try {
             inputStream.close();
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.warn("Can not close inputStream properly", e);
         }
 
         try {
             outputStream.close();
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.warn("Can not close outputStream properly", e);
         }
 
         try {
             socket.close();
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.warn("Can not close socket properly", e);
         }
     }
 

From 45dc3be3dbb8726dfd5c965b1a57b589848191b6 Mon Sep 17 00:00:00 2001
From: Takuya Murakami <tmurakam@tmurakam.org>
Date: Fri, 26 Feb 2016 23:10:33 +0900
Subject: [PATCH 14/15] fix #294: ApnsConnectionImpl.monitorSocket() closes
 invalid socket.

---
 .../com/notnoop/apns/internal/ApnsConnectionImpl.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java b/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java
index 6739c52d..da11ec1f 100644
--- a/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java
+++ b/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java
@@ -132,8 +132,8 @@ public synchronized void close() {
         Utilities.close(socket);
     }
 
-    private void monitorSocket(final Socket socket) {
-        logger.debug("Launching Monitoring Thread for socket {}", socket);
+    private void monitorSocket(final Socket socketToMonitor) {
+        logger.debug("Launching Monitoring Thread for socket {}", socketToMonitor);
 
         Thread t = threadFactory.newThread(new Runnable() {
             final static int EXPECTED_SIZE = 6;
@@ -145,7 +145,7 @@ public void run() {
                 try {
                     InputStream in;
                     try {
-                        in = socket.getInputStream();
+                        in = socketToMonitor.getInputStream();
                     } catch (IOException ioe) {
                         in = null;
                     }
@@ -155,7 +155,7 @@ public void run() {
                         logger.debug("Error-response packet {}", Utilities.encodeHex(bytes));
                         // Quickly close socket, so we won't ever try to send push notifications
                         // using the defective socket.
-                        Utilities.close(socket);
+                        Utilities.close(socketToMonitor);
 
                         int command = bytes[0] & 0xFF;
                         if (command != 8) {
@@ -221,7 +221,7 @@ public void run() {
                     logger.info("Exception while waiting for error code", e);
                     delegate.connectionClosed(DeliveryError.UNKNOWN, -1);
                 } finally {
-                    close();
+                    Utilities.close(socketToMonitor);
                     drainBuffer();
                 }
             }

From 254dafb2cdf08d024f40fd07ee74fb437a8c5257 Mon Sep 17 00:00:00 2001
From: Matthias Wessendorf <mwessend@redhat.com>
Date: Thu, 11 Mar 2021 09:17:14 +0100
Subject: [PATCH 15/15] :lipstick: Adding deprecation warning

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
---
 README.markdown | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.markdown b/README.markdown
index c78c07f4..480c00ab 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,3 +1,10 @@
+Warning
+-------
+
+Apple will no longer support the legacy binary protocol after March 31, 2021. Java-Apns will stop working. See [details](https://developer.apple.com/news/?id=uzyxiriy) in their announcement.
+
+It is recommended to use [Pushy](https://github.com/jchambers/pushy) instead, which supports Apple's HTTP/2-based APNs protocol.
+
 Build status:
 
    * Main fork [![Build Status](https://travis-ci.org/notnoop/java-apns.png)](https://travis-ci.org/notnoop/java-apns)