From 2077505f9b236440c5c8ad77a271e8b478492c77 Mon Sep 17 00:00:00 2001
From: "Brian J. Miller" <brian.miller@scorm.com>
Date: Tue, 29 Dec 2015 12:06:41 -0600
Subject: [PATCH 1/8] Update Travis config to use Oracle JDK 8

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

diff --git a/.travis.yml b/.travis.yml
index 5b1ef15..c9a9aee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
 language: java
-jdk: openjdk7
+jdk: oraclejdk8
 before_script: cp src/test/resources/travis-ci.properties src/test/resources/lrs.properties

From d32e71fd3a3c16ec702b1c74a5c2aadbd6098c96 Mon Sep 17 00:00:00 2001
From: "Brian J. Miller" <brian.miller@scorm.com>
Date: Tue, 29 Dec 2015 13:34:26 -0600
Subject: [PATCH 2/8] Update pom to target 1.8 compilation

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f9a250a..075800f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,11 +45,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <compilerVersion>1.6</compilerVersion>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <compilerVersion>1.8</compilerVersion>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
-                <version>3.0</version>
+                <version>3.3</version>
             </plugin>
             <!--<plugin>
                 <groupId>org.projectlombok</groupId>

From 58e793611839d2a2054d32de04b3870df59e4d73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20G=C3=B3mez=20Goiri?= <aitor.gomez-goiri@open.ac.uk>
Date: Wed, 2 Dec 2015 12:25:07 +0000
Subject: [PATCH 3/8] Updating Jetty dependency to version 9.

---
 pom.xml                                       |   2 +-
 .../com/rusticisoftware/tincan/RemoteLRS.java | 147 ++++++++----------
 .../tincan/exceptions/FailedHTTPExchange.java |  36 -----
 .../tincan/http/HTTPRequest.java              |   5 -
 4 files changed, 64 insertions(+), 126 deletions(-)
 delete mode 100644 src/main/java/com/rusticisoftware/tincan/exceptions/FailedHTTPExchange.java

diff --git a/pom.xml b/pom.xml
index 075800f..5dc0f07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-client</artifactId>
-            <version>8.1.9.v20130131</version>
+            <version>9.3.6.v20151106</version>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
index e135906..1670b18 100644
--- a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
+++ b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
@@ -15,6 +15,7 @@
 */
 package com.rusticisoftware.tincan;
 
+import org.apache.commons.codec.binary.Base64;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -22,10 +23,20 @@
 import com.rusticisoftware.tincan.documents.AgentProfileDocument;
 import com.rusticisoftware.tincan.documents.Document;
 import com.rusticisoftware.tincan.documents.StateDocument;
+import com.rusticisoftware.tincan.exceptions.*;
 import com.rusticisoftware.tincan.http.HTTPRequest;
 import com.rusticisoftware.tincan.http.HTTPResponse;
+import com.rusticisoftware.tincan.json.Mapper;
+import com.rusticisoftware.tincan.json.StringOfJSON;
 import com.rusticisoftware.tincan.lrsresponses.*;
-
+import com.rusticisoftware.tincan.v10x.StatementsQuery;
+import org.eclipse.jetty.client.api.ContentResponse;
+import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.api.Response;
+import org.eclipse.jetty.client.util.BytesContentProvider;
+import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.client.HttpClient;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -36,21 +47,6 @@
 import java.net.URLEncoder;
 import java.util.*;
 
-import org.apache.commons.codec.binary.Base64;
-import org.eclipse.jetty.client.ContentExchange;
-import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.HttpExchange;
-import org.eclipse.jetty.http.HttpMethods;
-import org.eclipse.jetty.io.Buffer;
-import org.eclipse.jetty.io.ByteArrayBuffer;
-
-import com.rusticisoftware.tincan.exceptions.*;
-import com.rusticisoftware.tincan.json.Mapper;
-import com.rusticisoftware.tincan.json.StringOfJSON;
-import com.rusticisoftware.tincan.v10x.StatementsQuery;
-
-import static org.eclipse.jetty.client.HttpClient.CONNECTOR_SELECT_CHANNEL;
-
 /**
  * Class used to communicate with a TCAPI endpoint synchronously
  */
@@ -58,13 +54,12 @@
 @Data
 @NoArgsConstructor
 public class RemoteLRS implements LRS {
-    private static int TIMEOUT_CONNECT = 5 * 1000;
+    private static long TIMEOUT_CONNECT = 5 * 1000;
 
     private static HttpClient _httpClient;
     private static HttpClient httpClient() throws Exception {
         if (_httpClient == null ) {
             _httpClient = new HttpClient();
-            _httpClient.setConnectorType(CONNECTOR_SELECT_CHANNEL);
             _httpClient.setConnectTimeout(TIMEOUT_CONNECT);
             _httpClient.start();
         }
@@ -72,10 +67,10 @@ private static HttpClient httpClient() throws Exception {
         return _httpClient;
     }
 
-    public static int getHTTPClientConnectTimeout() {
+    public static long getHTTPClientConnectTimeout() {
         return _httpClient.getConnectTimeout();
     }
-    public static void setHTTPClientConnectTimeout(int timeout) {
+    public static void setHTTPClientConnectTimeout(long timeout) {
         _httpClient.setConnectTimeout(timeout);
     }
 
@@ -167,63 +162,47 @@ private HTTPResponse makeSyncRequest(HTTPRequest req) {
         //Overload some of an ContentExchange object's functions with anonymous inner functions
         //Access the HTTPResponse variable via a closure
         final HTTPResponse response = new HTTPResponse();
-        ContentExchange webReq = new ContentExchange() {
-            protected void onResponseStatus(Buffer version, int status, Buffer reason) throws IOException {
-                super.onResponseStatus(version, status, reason);
-                response.setStatus(status);
-                response.setStatusMsg(reason.toString());
-            }
-
-            @Override
-            protected void onResponseHeader(Buffer name, Buffer value) throws IOException {
-                super.onResponseHeader(name, value);
 
-                response.setHeader(name.toString(), value.toString());
+        try {
+            final Request webReq = httpClient().
+                    newRequest(url).
+                    method(HttpMethod.fromString(req.getMethod())).
+                    header("X-Experience-API-Version", this.version.toString()).
+                    onResponseHeaders(new Response.HeadersListener() {
+                        @Override
+                        public void onHeaders(Response webResp) {
+                            response.setStatus(webResp.getStatus());
+                            response.setStatusMsg(webResp.getReason());
+                            for(HttpField header: webResp.getHeaders()) {
+                                response.setHeader(header.getName(), header.getValue());
+                            }
+                        }
+                    });
+
+            if (this.auth != null) {
+                webReq.header("Authorization", this.auth);
             }
-
-            @Override
-            protected void onResponseComplete() throws IOException {
-                super.onResponseComplete();
-
-                response.setContentBytes(this.getResponseContentBytes());
+            if (req.getHeaders() != null) {
+                Iterator it = req.getHeaders().entrySet().iterator();
+                while (it.hasNext()) {
+                    Map.Entry entry = (Map.Entry) it.next();
+                    webReq.header(entry.getKey().toString(), entry.getValue().toString());
+                }
             }
-        };
 
-        webReq.setURL(url);
-        webReq.setMethod(req.getMethod());
-
-        webReq.addRequestHeader("X-Experience-API-Version", this.version.toString());
-        if (this.auth != null) {
-            webReq.addRequestHeader("Authorization", this.auth);
-        }
-        if (req.getHeaders() != null) {
-            Iterator it = req.getHeaders().entrySet().iterator();
-            while (it.hasNext()) {
-                Map.Entry entry = (Map.Entry) it.next();
-                webReq.addRequestHeader(entry.getKey().toString(), entry.getValue().toString());
+            if (req.getContentType() != null) {
+                webReq.header("Content-Type", req.getContentType());
+            }
+            else {
+                webReq.header("Content-Type", "application/octet-stream");
             }
-        }
-
-        if (req.getContentType() != null) {
-            webReq.setRequestContentType(req.getContentType());
-        }
-        else {
-            webReq.setRequestContentType("application/octet-stream");
-        }
-
-        if (req.getContent() != null) {
-            webReq.setRequestContent(new ByteArrayBuffer(req.getContent()));
-        }
-
-        try {
-            httpClient().send(webReq);
-
-            // Waits until the exchange is terminated
-            int exchangeState = webReq.waitForDone();
 
-            if (exchangeState != HttpExchange.STATUS_COMPLETED) {
-                throw new FailedHTTPExchange(exchangeState);
+            if (req.getContent() != null) {
+                webReq.content(new BytesContentProvider(req.getContent()));
             }
+
+            final ContentResponse webResp = webReq.send();
+            response.setContentBytes(webResp.getContent());
         } catch (Exception ex) {
             response.setStatus(400);
             response.setStatusMsg("Exception in RemoteLRS.makeSyncRequest(): " + ex);
@@ -234,7 +213,7 @@ protected void onResponseComplete() throws IOException {
 
     private StatementLRSResponse getStatement(String id, String paramName) {
         HTTPRequest request = new HTTPRequest();
-        request.setMethod(HttpMethods.GET);
+        request.setMethod(HttpMethod.GET.asString());
         request.setResource("statements");
         request.setQueryParams(new HashMap<String, String>());
         request.getQueryParams().put(paramName, id);
@@ -262,7 +241,7 @@ private StatementLRSResponse getStatement(String id, String paramName) {
 
     private LRSResponse getDocument(String resource, Map<String, String> queryParams, Document document) {
         HTTPRequest request = new HTTPRequest();
-        request.setMethod(HttpMethods.GET);
+        request.setMethod(HttpMethod.GET.asString());
         request.setResource(resource);
         request.setQueryParams(queryParams);
 
@@ -290,7 +269,7 @@ else if (response.getStatus() == 404) {
     private LRSResponse deleteDocument(String resource, Map<String, String> queryParams) {
         HTTPRequest request = new HTTPRequest();
 
-        request.setMethod(HttpMethods.DELETE);
+        request.setMethod(HttpMethod.DELETE.asString());
         request.setResource(resource);
         request.setQueryParams(queryParams);
 
@@ -310,7 +289,7 @@ private LRSResponse deleteDocument(String resource, Map<String, String> queryPar
 
     private LRSResponse saveDocument(String resource, Map<String, String> queryParams, Document document) {
         HTTPRequest request = new HTTPRequest();
-        request.setMethod(HttpMethods.PUT);
+        request.setMethod(HttpMethod.PUT.asString());
         request.setResource(resource);
         request.setQueryParams(queryParams);
         request.setContentType(document.getContentType());
@@ -336,7 +315,7 @@ private LRSResponse saveDocument(String resource, Map<String, String> queryParam
 
     private LRSResponse updateDocument(String resource, Map<String, String> queryParams, Document document) {
         HTTPRequest request = new HTTPRequest();
-        request.setMethod(HttpMethods.POST);
+        request.setMethod(HttpMethod.POST.asString());
         request.setResource(resource);
         request.setQueryParams(queryParams);
         request.setContentType(document.getContentType());
@@ -362,7 +341,7 @@ private LRSResponse updateDocument(String resource, Map<String, String> queryPar
 
     private ProfileKeysLRSResponse getProfileKeys(String resource, HashMap<String, String> queryParams) {
         HTTPRequest request = new HTTPRequest();
-        request.setMethod(HttpMethods.GET);
+        request.setMethod(HttpMethod.GET.asString());
         request.setResource(resource);
         request.setQueryParams(queryParams);
 
@@ -394,7 +373,7 @@ private ProfileKeysLRSResponse getProfileKeys(String resource, HashMap<String, S
     @Override
     public AboutLRSResponse about() {
         HTTPRequest request = new HTTPRequest();
-        request.setMethod(HttpMethods.GET);
+        request.setMethod(HttpMethod.GET.asString());
         request.setResource("about");
 
         HTTPResponse response = makeSyncRequest(request);
@@ -434,10 +413,10 @@ public StatementLRSResponse saveStatement(Statement statement) {
         }
 
         if (statement.getId() == null) {
-            lrsResponse.getRequest().setMethod(HttpMethods.POST);
+            lrsResponse.getRequest().setMethod(HttpMethod.POST.asString());
         }
         else {
-            lrsResponse.getRequest().setMethod(HttpMethods.PUT);
+            lrsResponse.getRequest().setMethod(HttpMethod.PUT.asString());
             lrsResponse.getRequest().setQueryParams(new HashMap<String, String>());
             lrsResponse.getRequest().getQueryParams().put("statementId", statement.getId().toString());
         }
@@ -483,7 +462,7 @@ public StatementsResultLRSResponse saveStatements(List<Statement> statements) {
 
         lrsResponse.setRequest(new HTTPRequest());
         lrsResponse.getRequest().setResource("statements");
-        lrsResponse.getRequest().setMethod(HttpMethods.POST);
+        lrsResponse.getRequest().setMethod(HttpMethod.POST.asString());
         lrsResponse.getRequest().setContentType("application/json");
         try {
             lrsResponse.getRequest().setContent(Mapper.getWriter(this.usePrettyJSON()).writeValueAsBytes(rootNode));
@@ -548,7 +527,7 @@ public StatementsResultLRSResponse queryStatements(StatementsQueryInterface quer
         StatementsResultLRSResponse lrsResponse = new StatementsResultLRSResponse();
 
         lrsResponse.setRequest(new HTTPRequest());
-        lrsResponse.getRequest().setMethod(HttpMethods.GET);
+        lrsResponse.getRequest().setMethod(HttpMethod.GET.asString());
         lrsResponse.getRequest().setResource("statements");
 
         try {
@@ -590,7 +569,7 @@ public StatementsResultLRSResponse moreStatements(String moreURL) {
 
         HTTPRequest request = new HTTPRequest();
         request.setResource(url);
-        request.setMethod(HttpMethods.GET);
+        request.setMethod(HttpMethod.GET.asString());
         HTTPResponse response = makeSyncRequest(request);
 
         StatementsResultLRSResponse lrsResponse = new StatementsResultLRSResponse(request, response);
@@ -699,7 +678,7 @@ public LRSResponse clearState(Activity activity, Agent agent, UUID registration)
     @Override
     public ActivityLRSResponse retrieveActivity(Activity activity) {
         HTTPRequest request = new HTTPRequest();
-        request.setMethod(HttpMethods.GET);
+        request.setMethod(HttpMethod.GET.asString());
         request.setResource("activities");
         request.setQueryParams(new HashMap<String, String>());
         request.getQueryParams().put("activityId", activity.getId().toString());
@@ -787,7 +766,7 @@ public LRSResponse deleteActivityProfile(ActivityProfileDocument profile) {
     @Override
     public PersonLRSResponse retrievePerson(Agent agent) {
         HTTPRequest request = new HTTPRequest();
-        request.setMethod(HttpMethods.GET);
+        request.setMethod(HttpMethod.GET.asString());
         request.setResource("agents");
         request.setQueryParams(new HashMap<String, String>());
         request.getQueryParams().put("agent", agent.toJSON(this.getVersion(), this.usePrettyJSON()));
diff --git a/src/main/java/com/rusticisoftware/tincan/exceptions/FailedHTTPExchange.java b/src/main/java/com/rusticisoftware/tincan/exceptions/FailedHTTPExchange.java
deleted file mode 100644
index 030cf7d..0000000
--- a/src/main/java/com/rusticisoftware/tincan/exceptions/FailedHTTPExchange.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-    Copyright 2013 Rustici Software
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-package com.rusticisoftware.tincan.exceptions;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * FailedHTTPExchange
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class FailedHTTPExchange extends RuntimeException {
-    private int status;
-
-    public FailedHTTPExchange(String message, int status) {
-        super(message);
-        this.setStatus(status);
-    }
-    public FailedHTTPExchange(int status) {
-        this("Failed HTTP Exchange", status);
-    }
-}
diff --git a/src/main/java/com/rusticisoftware/tincan/http/HTTPRequest.java b/src/main/java/com/rusticisoftware/tincan/http/HTTPRequest.java
index 2bfaf9d..199d1db 100644
--- a/src/main/java/com/rusticisoftware/tincan/http/HTTPRequest.java
+++ b/src/main/java/com/rusticisoftware/tincan/http/HTTPRequest.java
@@ -17,11 +17,7 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.eclipse.jetty.client.ContentExchange;
-import org.eclipse.jetty.io.Buffer;
-import org.eclipse.jetty.io.ByteArrayBuffer;
 
-import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -35,7 +31,6 @@ public class HTTPRequest {
     private Map<String, String> queryParams;
     private Map<String, String> headers;
     private String contentType;
-    private ByteArrayBuffer contentBuffer;
     private byte[] content;
     private HTTPResponse response;
 }

From be8015a3734dbe9233664b5b938127c23f72301c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20G=C3=B3mez=20Goiri?= <aitor.gomez-goiri@open.ac.uk>
Date: Wed, 2 Dec 2015 14:23:36 +0000
Subject: [PATCH 4/8] Making HttpClient able to connect to HTTPS endpoints.

---
 src/main/java/com/rusticisoftware/tincan/RemoteLRS.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
index 1670b18..12d1960 100644
--- a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
+++ b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
@@ -24,19 +24,20 @@
 import com.rusticisoftware.tincan.documents.Document;
 import com.rusticisoftware.tincan.documents.StateDocument;
 import com.rusticisoftware.tincan.exceptions.*;
+import com.rusticisoftware.tincan.lrsresponses.*;
 import com.rusticisoftware.tincan.http.HTTPRequest;
 import com.rusticisoftware.tincan.http.HTTPResponse;
 import com.rusticisoftware.tincan.json.Mapper;
 import com.rusticisoftware.tincan.json.StringOfJSON;
-import com.rusticisoftware.tincan.lrsresponses.*;
 import com.rusticisoftware.tincan.v10x.StatementsQuery;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
+import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.util.BytesContentProvider;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpMethod;
-import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -59,7 +60,7 @@ public class RemoteLRS implements LRS {
     private static HttpClient _httpClient;
     private static HttpClient httpClient() throws Exception {
         if (_httpClient == null ) {
-            _httpClient = new HttpClient();
+            _httpClient = new HttpClient(new SslContextFactory());
             _httpClient.setConnectTimeout(TIMEOUT_CONNECT);
             _httpClient.start();
         }

From 766f3ead3f5fb313c2014f80edaa0794fbdc2aef Mon Sep 17 00:00:00 2001
From: "Brian J. Miller" <brian.miller@scorm.com>
Date: Tue, 29 Dec 2015 13:35:45 -0600
Subject: [PATCH 5/8] Whitespace only

---
 .../com/rusticisoftware/tincan/RemoteLRS.java | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
index 12d1960..4680441 100644
--- a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
+++ b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
@@ -166,19 +166,19 @@ private HTTPResponse makeSyncRequest(HTTPRequest req) {
 
         try {
             final Request webReq = httpClient().
-                    newRequest(url).
-                    method(HttpMethod.fromString(req.getMethod())).
-                    header("X-Experience-API-Version", this.version.toString()).
-                    onResponseHeaders(new Response.HeadersListener() {
-                        @Override
-                        public void onHeaders(Response webResp) {
-                            response.setStatus(webResp.getStatus());
-                            response.setStatusMsg(webResp.getReason());
-                            for(HttpField header: webResp.getHeaders()) {
-                                response.setHeader(header.getName(), header.getValue());
-                            }
+                newRequest(url).
+                method(HttpMethod.fromString(req.getMethod())).
+                header("X-Experience-API-Version", this.version.toString()).
+                onResponseHeaders(new Response.HeadersListener() {
+                    @Override
+                    public void onHeaders(Response webResp) {
+                        response.setStatus(webResp.getStatus());
+                        response.setStatusMsg(webResp.getReason());
+                        for(HttpField header: webResp.getHeaders()) {
+                            response.setHeader(header.getName(), header.getValue());
                         }
-                    });
+                    }
+                });
 
             if (this.auth != null) {
                 webReq.header("Authorization", this.auth);

From 5c5e0b7df0e25902671a07e60a3a7c7c6dab6e48 Mon Sep 17 00:00:00 2001
From: "Brian J. Miller" <brian.miller@scorm.com>
Date: Tue, 29 Dec 2015 13:34:59 -0600
Subject: [PATCH 6/8] Shut off follow redirects for Jetty 9

---
 src/main/java/com/rusticisoftware/tincan/RemoteLRS.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
index 4680441..85f2d84 100644
--- a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
+++ b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
@@ -62,6 +62,7 @@ private static HttpClient httpClient() throws Exception {
         if (_httpClient == null ) {
             _httpClient = new HttpClient(new SslContextFactory());
             _httpClient.setConnectTimeout(TIMEOUT_CONNECT);
+            _httpClient.setFollowRedirects(false);
             _httpClient.start();
         }
 

From fe2b15710e008d99b6f4576fbd137cc8f490c7a0 Mon Sep 17 00:00:00 2001
From: "Brian J. Miller" <brian.miller@scorm.com>
Date: Tue, 29 Dec 2015 13:45:31 -0600
Subject: [PATCH 7/8] Disable cookie handling in Jetty 9

---
 src/main/java/com/rusticisoftware/tincan/RemoteLRS.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
index 85f2d84..e81b442 100644
--- a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
+++ b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
@@ -37,6 +37,7 @@
 import org.eclipse.jetty.client.util.BytesContentProvider;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.util.HttpCookieStore;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -63,6 +64,7 @@ private static HttpClient httpClient() throws Exception {
             _httpClient = new HttpClient(new SslContextFactory());
             _httpClient.setConnectTimeout(TIMEOUT_CONNECT);
             _httpClient.setFollowRedirects(false);
+            _httpClient.setCookieStore(new HttpCookieStore.Empty());
             _httpClient.start();
         }
 

From 872b6a4e162e298fffa855fbd69dd5a2b3acc4f5 Mon Sep 17 00:00:00 2001
From: "Brian J. Miller" <brian.miller@scorm.com>
Date: Tue, 29 Dec 2015 15:27:31 -0600
Subject: [PATCH 8/8] Allow user to set an HTTP client object or destroy the
 default

* Deprecate the timeout methods favoring the new ability to set their
  own client
---
 .../com/rusticisoftware/tincan/RemoteLRS.java | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
index e81b442..48e13f1 100644
--- a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
+++ b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java
@@ -58,6 +58,7 @@
 public class RemoteLRS implements LRS {
     private static long TIMEOUT_CONNECT = 5 * 1000;
 
+    private static Boolean _ourClient = false;
     private static HttpClient _httpClient;
     private static HttpClient httpClient() throws Exception {
         if (_httpClient == null ) {
@@ -66,18 +67,47 @@ private static HttpClient httpClient() throws Exception {
             _httpClient.setFollowRedirects(false);
             _httpClient.setCookieStore(new HttpCookieStore.Empty());
             _httpClient.start();
+
+            _ourClient = true;
         }
 
         return _httpClient;
     }
 
+    /**
+     * Get the connect timeout value for the default HTTP client
+     *
+     * @return
+     * @deprecated set your own HTTP client using {@link #setHttpClient()}
+     */
+    @Deprecated
     public static long getHTTPClientConnectTimeout() {
         return _httpClient.getConnectTimeout();
     }
+
+    /**
+     * Set the connect timeout value for the default HTTP client
+     *
+     * @deprecated set your own HTTP client using {@link #setHttpClient()}
+     */
+    @Deprecated
     public static void setHTTPClientConnectTimeout(long timeout) {
         _httpClient.setConnectTimeout(timeout);
     }
 
+    public static void setHttpClient(HttpClient client) throws Exception {
+        if (_httpClient != null && _ourClient) {
+            _httpClient.stop();
+            _httpClient.destroy();
+        }
+        _ourClient = false;
+        _httpClient = client;
+    }
+
+    public static void destroy() throws Exception {
+        setHttpClient(null);
+    }
+
     private URL endpoint;
     private TCAPIVersion version = this.getVersion();
     private String username;