From 110a4fac4257fe2df0e23149fbef76e750604cf4 Mon Sep 17 00:00:00 2001
From: Jesse Wilson <jwilson@squareup.com>
Date: Thu, 27 Feb 2014 23:12:10 -0500
Subject: [PATCH] Rearrange OkHttp modules.

The HTTP client and SPDY code are now a single module that
mockwebserver depends upon.

The tests are now in a separate module that depends on both
OkHttp and mockwebserver.
---
 mockwebserver/pom.xml                          |  2 +-
 {okhttp-protocols => okhttp-tests}/pom.xml     | 18 +++++++++++++++---
 .../java/com/squareup/okhttp/AsyncApiTest.java |  0
 .../squareup/okhttp/ConnectionPoolTest.java    |  0
 .../com/squareup/okhttp/DispatcherTest.java    |  0
 .../com/squareup/okhttp/MediaTypeTest.java     |  0
 .../com/squareup/okhttp/RecordedResponse.java  |  0
 .../com/squareup/okhttp/RecordingReceiver.java |  0
 .../java/com/squareup/okhttp/RequestTest.java  |  0
 .../java/com/squareup/okhttp/SyncApiTest.java  |  0
 .../squareup/okhttp/internal/BitArrayTest.java |  0
 .../internal/RecordingAuthenticator.java       |  0
 .../internal/RecordingHostnameVerifier.java    |  0
 .../internal/RecordingOkAuthenticator.java     |  0
 .../internal/http/ExternalHttp2Example.java    |  0
 .../internal/http/ExternalSpdyExample.java     |  0
 .../okhttp/internal/http/HeadersTest.java      |  0
 .../http/HttpOverHttp20Draft09Test.java        |  0
 .../internal/http/HttpOverSpdy3Test.java       |  0
 .../okhttp/internal/http/HttpOverSpdyTest.java |  0
 .../internal/http/HttpResponseCacheTest.java   |  0
 .../internal/http/RouteSelectorTest.java       |  0
 .../okhttp/internal/http/StatusLineTest.java   |  0
 .../internal/http/URLConnectionTest.java       |  0
 .../okhttp/internal/http/URLEncodingTest.java  |  0
 .../okhttp/internal/spdy/BaseTestHandler.java  |  0
 .../okhttp/internal/spdy/HpackDraft05Test.java |  0
 .../internal/spdy/Http20Draft09Test.java       |  0
 .../okhttp/internal/spdy/HuffmanTest.java      |  0
 .../okhttp/internal/spdy/MockSpdyPeer.java     |  0
 .../okhttp/internal/spdy/SettingsTest.java     |  8 ++++----
 .../okhttp/internal/spdy/Spdy3Test.java        |  0
 .../internal/spdy/SpdyConnectionTest.java      |  0
 .../okhttp/internal/tls/FakeSSLSession.java    |  0
 .../internal/tls/HostnameVerifierTest.java     |  0
 okhttp/pom.xml                                 | 17 -----------------
 .../java/com/squareup/okhttp/Protocol.java     |  0
 .../com/squareup/okhttp/internal/BitArray.java |  0
 .../okhttp/internal/NamedRunnable.java         |  0
 .../com/squareup/okhttp/internal/Platform.java |  0
 .../com/squareup/okhttp/internal/Util.java     |  0
 .../okhttp/internal/spdy/ErrorCode.java        |  0
 .../okhttp/internal/spdy/FrameReader.java      |  0
 .../okhttp/internal/spdy/FrameWriter.java      |  0
 .../squareup/okhttp/internal/spdy/Header.java  |  0
 .../okhttp/internal/spdy/HeadersMode.java      |  0
 .../okhttp/internal/spdy/HpackDraft05.java     |  0
 .../okhttp/internal/spdy/Http20Draft09.java    |  0
 .../squareup/okhttp/internal/spdy/Huffman.java |  0
 .../internal/spdy/IncomingStreamHandler.java   |  0
 .../internal/spdy/NameValueBlockReader.java    |  0
 .../squareup/okhttp/internal/spdy/Ping.java    |  0
 .../okhttp/internal/spdy/Settings.java         |  0
 .../squareup/okhttp/internal/spdy/Spdy3.java   |  0
 .../okhttp/internal/spdy/SpdyConnection.java   |  0
 .../okhttp/internal/spdy/SpdyStream.java       |  0
 .../squareup/okhttp/internal/spdy/Variant.java |  0
 pom.xml                                        |  2 +-
 58 files changed, 21 insertions(+), 26 deletions(-)
 rename {okhttp-protocols => okhttp-tests}/pom.xml (65%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/AsyncApiTest.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/DispatcherTest.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/MediaTypeTest.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/RecordedResponse.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/RecordingReceiver.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/RequestTest.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/SyncApiTest.java (100%)
 rename {okhttp-protocols => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/BitArrayTest.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/RecordingAuthenticator.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/RecordingHostnameVerifier.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/RecordingOkAuthenticator.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/http/ExternalHttp2Example.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/http/ExternalSpdyExample.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/http/HeadersTest.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/http/HttpOverHttp20Draft09Test.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdy3Test.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/http/StatusLineTest.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/http/URLEncodingTest.java (100%)
 rename {okhttp-protocols => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/spdy/BaseTestHandler.java (100%)
 rename {okhttp-protocols => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/spdy/HpackDraft05Test.java (100%)
 rename {okhttp-protocols => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/spdy/Http20Draft09Test.java (100%)
 rename {okhttp-protocols => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/spdy/HuffmanTest.java (100%)
 rename {okhttp-protocols => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java (100%)
 rename {okhttp-protocols => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java (96%)
 rename {okhttp-protocols => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3Test.java (100%)
 rename {okhttp-protocols => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/tls/FakeSSLSession.java (100%)
 rename {okhttp => okhttp-tests}/src/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/Protocol.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/BitArray.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/NamedRunnable.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/Platform.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/Util.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/ErrorCode.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/FrameReader.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/FrameWriter.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/Header.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/HeadersMode.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/HpackDraft05.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/Http20Draft09.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/Huffman.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/IncomingStreamHandler.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/Ping.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/Spdy3.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java (100%)
 rename {okhttp-protocols => okhttp}/src/main/java/com/squareup/okhttp/internal/spdy/Variant.java (100%)

diff --git a/mockwebserver/pom.xml b/mockwebserver/pom.xml
index b935acbc6..9c7af9d6e 100644
--- a/mockwebserver/pom.xml
+++ b/mockwebserver/pom.xml
@@ -15,7 +15,7 @@
   <dependencies>
     <dependency>
       <groupId>com.squareup.okhttp</groupId>
-      <artifactId>okhttp-protocols</artifactId>
+      <artifactId>okhttp</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/okhttp-protocols/pom.xml b/okhttp-tests/pom.xml
similarity index 65%
rename from okhttp-protocols/pom.xml
rename to okhttp-tests/pom.xml
index 5febfcc79..7c1573df0 100644
--- a/okhttp-protocols/pom.xml
+++ b/okhttp-tests/pom.xml
@@ -9,8 +9,8 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>okhttp-protocols</artifactId>
-  <name>OkHttp SPDY and HTTP/2.0 internals</name>
+  <artifactId>okhttp-tests</artifactId>
+  <name>OkHttp Tests</name>
 
   <dependencies>
     <dependency>
@@ -18,15 +18,27 @@
       <artifactId>okio</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp</groupId>
+      <artifactId>okhttp</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.mortbay.jetty.npn</groupId>
       <artifactId>npn-boot</artifactId>
-      <optional>true</optional>
+      <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp</groupId>
+      <artifactId>mockwebserver</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/okhttp/src/test/java/com/squareup/okhttp/AsyncApiTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/AsyncApiTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/AsyncApiTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/AsyncApiTest.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/DispatcherTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/DispatcherTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/DispatcherTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/DispatcherTest.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/MediaTypeTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/MediaTypeTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/MediaTypeTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/MediaTypeTest.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/RecordedResponse.java b/okhttp-tests/src/test/java/com/squareup/okhttp/RecordedResponse.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/RecordedResponse.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/RecordedResponse.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/RecordingReceiver.java b/okhttp-tests/src/test/java/com/squareup/okhttp/RecordingReceiver.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/RecordingReceiver.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/RecordingReceiver.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/RequestTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/RequestTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/SyncApiTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/SyncApiTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/SyncApiTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/SyncApiTest.java
diff --git a/okhttp-protocols/src/test/java/com/squareup/okhttp/internal/BitArrayTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/BitArrayTest.java
similarity index 100%
rename from okhttp-protocols/src/test/java/com/squareup/okhttp/internal/BitArrayTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/BitArrayTest.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/RecordingAuthenticator.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/RecordingAuthenticator.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/RecordingAuthenticator.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/RecordingAuthenticator.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/RecordingHostnameVerifier.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/RecordingHostnameVerifier.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/RecordingHostnameVerifier.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/RecordingHostnameVerifier.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/RecordingOkAuthenticator.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/RecordingOkAuthenticator.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/RecordingOkAuthenticator.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/RecordingOkAuthenticator.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/http/ExternalHttp2Example.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/ExternalHttp2Example.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/http/ExternalHttp2Example.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/ExternalHttp2Example.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/http/ExternalSpdyExample.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/ExternalSpdyExample.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/http/ExternalSpdyExample.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/ExternalSpdyExample.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/http/HeadersTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HeadersTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/http/HeadersTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HeadersTest.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/http/HttpOverHttp20Draft09Test.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverHttp20Draft09Test.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/http/HttpOverHttp20Draft09Test.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverHttp20Draft09Test.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdy3Test.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdy3Test.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdy3Test.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdy3Test.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/http/StatusLineTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/StatusLineTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/http/StatusLineTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/StatusLineTest.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/http/URLEncodingTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLEncodingTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/http/URLEncodingTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLEncodingTest.java
diff --git a/okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/BaseTestHandler.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/BaseTestHandler.java
similarity index 100%
rename from okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/BaseTestHandler.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/BaseTestHandler.java
diff --git a/okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/HpackDraft05Test.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/HpackDraft05Test.java
similarity index 100%
rename from okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/HpackDraft05Test.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/HpackDraft05Test.java
diff --git a/okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/Http20Draft09Test.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http20Draft09Test.java
similarity index 100%
rename from okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/Http20Draft09Test.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http20Draft09Test.java
diff --git a/okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/HuffmanTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/HuffmanTest.java
similarity index 100%
rename from okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/HuffmanTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/HuffmanTest.java
diff --git a/okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java
similarity index 100%
rename from okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java
diff --git a/okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java
similarity index 96%
rename from okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java
index 31df6d2fa..44459b8c9 100644
--- a/okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java
+++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java
@@ -39,7 +39,7 @@ public final class SettingsTest {
     // WARNING: clash on flags between spdy/3 and http/2!
     assertEquals(-3, settings.getUploadBandwidth(-3));
     assertEquals(-1, settings.getHeaderTableSize());
-    settings.set(Settings.UPLOAD_BANDWIDTH, 0, 42);
+    settings.set(UPLOAD_BANDWIDTH, 0, 42);
     assertEquals(42, settings.getUploadBandwidth(-3));
     settings.set(Settings.HEADER_TABLE_SIZE, 0, 8096);
     assertEquals(8096, settings.getHeaderTableSize());
@@ -47,7 +47,7 @@ public final class SettingsTest {
     // WARNING: clash on flags between spdy/3 and http/2!
     assertEquals(-3, settings.getDownloadBandwidth(-3));
     assertEquals(true, settings.getEnablePush(true));
-    settings.set(Settings.DOWNLOAD_BANDWIDTH, 0, 53);
+    settings.set(DOWNLOAD_BANDWIDTH, 0, 53);
     assertEquals(53, settings.getDownloadBandwidth(-3));
     settings.set(Settings.ENABLE_PUSH, 0, 0);
     assertEquals(false, settings.getEnablePush(true));
@@ -57,7 +57,7 @@ public final class SettingsTest {
     assertEquals(64, settings.getRoundTripTime(-3));
 
     assertEquals(-3, settings.getMaxConcurrentStreams(-3));
-    settings.set(Settings.MAX_CONCURRENT_STREAMS, 0, 75);
+    settings.set(MAX_CONCURRENT_STREAMS, 0, 75);
     assertEquals(75, settings.getMaxConcurrentStreams(-3));
 
     assertEquals(-3, settings.getCurrentCwnd(-3));
@@ -65,7 +65,7 @@ public final class SettingsTest {
     assertEquals(86, settings.getCurrentCwnd(-3));
 
     assertEquals(-3, settings.getDownloadRetransRate(-3));
-    settings.set(Settings.DOWNLOAD_RETRANS_RATE, 0, 97);
+    settings.set(DOWNLOAD_RETRANS_RATE, 0, 97);
     assertEquals(97, settings.getDownloadRetransRate(-3));
 
     assertEquals(-1, settings.getInitialWindowSize());
diff --git a/okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3Test.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3Test.java
similarity index 100%
rename from okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3Test.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3Test.java
diff --git a/okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java
similarity index 100%
rename from okhttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/tls/FakeSSLSession.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/tls/FakeSSLSession.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/tls/FakeSSLSession.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/tls/FakeSSLSession.java
diff --git a/okhttp/src/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java
similarity index 100%
rename from okhttp/src/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java
rename to okhttp-tests/src/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java
diff --git a/okhttp/pom.xml b/okhttp/pom.xml
index 7c4bb25d7..ecb170526 100644
--- a/okhttp/pom.xml
+++ b/okhttp/pom.xml
@@ -23,23 +23,6 @@
       <artifactId>okhttp-protocols</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty.npn</groupId>
-      <artifactId>npn-boot</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>mockwebserver</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/Protocol.java b/okhttp/src/main/java/com/squareup/okhttp/Protocol.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/Protocol.java
rename to okhttp/src/main/java/com/squareup/okhttp/Protocol.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/BitArray.java b/okhttp/src/main/java/com/squareup/okhttp/internal/BitArray.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/BitArray.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/BitArray.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/NamedRunnable.java b/okhttp/src/main/java/com/squareup/okhttp/internal/NamedRunnable.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/NamedRunnable.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/NamedRunnable.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/Platform.java b/okhttp/src/main/java/com/squareup/okhttp/internal/Platform.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/Platform.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/Platform.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/Util.java b/okhttp/src/main/java/com/squareup/okhttp/internal/Util.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/Util.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/Util.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/ErrorCode.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/ErrorCode.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/ErrorCode.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/ErrorCode.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/FrameReader.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/FrameReader.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/FrameReader.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/FrameReader.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/FrameWriter.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/FrameWriter.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/FrameWriter.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/FrameWriter.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Header.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Header.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Header.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Header.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/HeadersMode.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/HeadersMode.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/HeadersMode.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/HeadersMode.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/HpackDraft05.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/HpackDraft05.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/HpackDraft05.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/HpackDraft05.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Http20Draft09.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Http20Draft09.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Http20Draft09.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Http20Draft09.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Huffman.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Huffman.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Huffman.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Huffman.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/IncomingStreamHandler.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/IncomingStreamHandler.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/IncomingStreamHandler.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/IncomingStreamHandler.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Ping.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Ping.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Ping.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Ping.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Spdy3.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Spdy3.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Spdy3.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Spdy3.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Variant.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Variant.java
similarity index 100%
rename from okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Variant.java
rename to okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Variant.java
diff --git a/pom.xml b/pom.xml
index c00fc462c..2216c732c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <modules>
     <module>okhttp</module>
     <module>okhttp-apache</module>
-    <module>okhttp-protocols</module>
+    <module>okhttp-tests</module>
     <module>okcurl</module>
     <module>okio</module>
     <module>mockwebserver</module>