From dc5f18973464a793c899ce9db2e74d770ab9fb54 Mon Sep 17 00:00:00 2001 From: Jason Eric Klaes Hoetger Date: Sat, 14 May 2016 18:29:58 -0700 Subject: [PATCH 01/10] Refactored -core and -littleproxy modules. Reversed dependency relationship between the modules. Moved common code into -littleproxy. No longer running tests against legacy implementation. --- browsermob-core-littleproxy/pom.xml | 230 ++++++++---------- .../net/lightbody/bmp/BrowserMobProxy.java | 13 +- .../lightbody/bmp/BrowserMobProxyServer.java | 2 +- .../net/lightbody/bmp/client/ClientUtil.java | 0 .../java/net/lightbody/bmp/core/har/Har.java | 0 .../net/lightbody/bmp/core/har/HarCache.java | 0 .../bmp/core/har/HarCacheStatus.java | 0 .../lightbody/bmp/core/har/HarContent.java | 0 .../net/lightbody/bmp/core/har/HarCookie.java | 0 .../net/lightbody/bmp/core/har/HarEntry.java | 0 .../net/lightbody/bmp/core/har/HarLog.java | 0 .../bmp/core/har/HarNameValuePair.java | 0 .../bmp/core/har/HarNameVersion.java | 0 .../net/lightbody/bmp/core/har/HarPage.java | 0 .../bmp/core/har/HarPageTimings.java | 0 .../lightbody/bmp/core/har/HarPostData.java | 0 .../bmp/core/har/HarPostDataParam.java | 0 .../lightbody/bmp/core/har/HarRequest.java | 0 .../lightbody/bmp/core/har/HarResponse.java | 0 .../lightbody/bmp/core/har/HarTimings.java | 0 .../bmp/core/json/ISO8601DateFormatter.java | 0 .../json/ISO8601WithTDZDateFormatter.java | 0 .../bmp/exception/DecompressionException.java | 0 .../UnsupportedCharsetException.java | 0 .../bmp/filters/HarCaptureFilter.java | 2 +- .../lightbody/bmp/filters/RequestFilter.java | 0 .../lightbody/bmp/filters/ResponseFilter.java | 0 .../lightbody/bmp/proxy/BlacklistEntry.java | 0 .../net/lightbody/bmp/proxy/CaptureType.java | 0 .../net/lightbody/bmp/proxy/RewriteRule.java | 0 .../net/lightbody/bmp/proxy/Whitelist.java | 0 .../lightbody/bmp/proxy/auth/AuthType.java | 0 .../proxy/dns/AbstractHostNameRemapper.java | 0 .../bmp/proxy/dns/AdvancedHostResolver.java | 0 .../bmp/proxy/dns/BasicHostResolver.java | 0 .../bmp/proxy/dns/ChainedHostResolver.java | 0 .../bmp/proxy/dns/DnsJavaResolver.java | 0 .../lightbody/bmp/proxy/dns/HostResolver.java | 0 .../dns/NativeCacheManipulatingResolver.java | 0 .../bmp/proxy/dns/NativeResolver.java | 0 .../bmp/util/BrowserMobHttpUtil.java | 0 .../bmp}/util/BrowserMobProxyUtil.java | 3 +- .../bmp/util/HttpMessageContents.java | 0 .../lightbody/bmp/util/HttpMessageInfo.java | 0 .../lightbody/bmp/util/HttpObjectUtil.java | 0 .../main/resources/net/lightbody/bmp/version | 0 .../sslSupport/ca-certificate-ec.cer | 0 .../sslSupport/ca-certificate-rsa.cer | 0 .../resources/sslSupport/ca-keystore-ec.p12 | Bin .../resources/sslSupport/ca-keystore-rsa.p12 | Bin .../bmp/filters/RewriteUrlFilterTest.groovy | 21 +- .../lightbody/bmp/proxy/AutoAuthTest.groovy | 15 +- .../bmp/proxy/BindAddressTest.groovy | 10 +- .../lightbody/bmp/proxy/BlacklistTest.groovy | 31 ++- .../bmp/proxy/ChainedProxyAuthTest.groovy | 9 +- .../bmp/proxy/FilterChainTest.groovy | 19 +- .../net/lightbody/bmp/proxy/NewHarTest.groovy | 85 ++++--- .../lightbody/bmp/proxy/WhitelistTest.groovy | 31 ++- .../dns/AdvancedHostResolverCacheTest.java | 6 +- .../proxy/dns/AdvancedHostResolverTest.java | 0 .../proxy/dns/ChainedHostResolverTest.java | 7 +- .../lightbody/bmp/proxy/InterceptorTest.java | 61 +++-- .../net/lightbody/bmp/proxy/NetworkTest.java | 10 +- .../lightbody/bmp/proxy/QuiescenceTest.java | 18 +- .../proxy/test/util/NewProxyServerTest.java | 17 +- .../test/util/NewProxyServerTestUtil.java | 94 +++++++ .../bmp/proxy/test/util/TestConstants.java | 0 browsermob-core/pom.xml | 126 +++------- .../BrowserMobProxyServerLegacyAdapter.java | 2 +- .../lightbody/bmp/filters/package-info.java | 5 - .../bmp/proxy/LegacyProxyServer.java | 3 +- .../net/lightbody/bmp/proxy/ProxyServer.java | 14 +- .../bmp/proxy/http/BrowserMobHttpClient.java | 2 +- .../bmp/proxy/test/util/ProxyServerTest.java | 73 +----- .../proxy/test/util/ProxyServerTestUtil.java | 66 +++++ .../java/net/lightbody/bmp/proxy/Main.java | 2 +- .../guice/LegacyProxyServerProvider.java | 1 - mitm/pom.xml | 6 + 78 files changed, 490 insertions(+), 494 deletions(-) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/BrowserMobProxy.java (96%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/client/ClientUtil.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/Har.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarCache.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarCacheStatus.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarContent.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarCookie.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarEntry.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarLog.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarNameValuePair.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarNameVersion.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarPage.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarPageTimings.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarPostData.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarPostDataParam.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarRequest.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarResponse.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/har/HarTimings.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/json/ISO8601DateFormatter.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/core/json/ISO8601WithTDZDateFormatter.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/exception/DecompressionException.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/exception/UnsupportedCharsetException.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/filters/RequestFilter.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/filters/ResponseFilter.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/proxy/CaptureType.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/proxy/RewriteRule.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/proxy/Whitelist.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/proxy/auth/AuthType.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/proxy/dns/AbstractHostNameRemapper.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolver.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/proxy/dns/BasicHostResolver.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/proxy/dns/ChainedHostResolver.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/proxy/dns/DnsJavaResolver.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/proxy/dns/HostResolver.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/proxy/dns/NativeCacheManipulatingResolver.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/proxy/dns/NativeResolver.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java (100%) rename {browsermob-core/src/main/java/net/lightbody/bmp/proxy => browsermob-core-littleproxy/src/main/java/net/lightbody/bmp}/util/BrowserMobProxyUtil.java (98%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/util/HttpMessageContents.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/util/HttpMessageInfo.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/java/net/lightbody/bmp/util/HttpObjectUtil.java (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/resources/net/lightbody/bmp/version (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/resources/sslSupport/ca-certificate-ec.cer (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/resources/sslSupport/ca-certificate-rsa.cer (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/resources/sslSupport/ca-keystore-ec.p12 (100%) rename {browsermob-core => browsermob-core-littleproxy}/src/main/resources/sslSupport/ca-keystore-rsa.p12 (100%) rename {browsermob-core/src/test/java => browsermob-core-littleproxy/src/test/groovy}/net/lightbody/bmp/proxy/dns/AdvancedHostResolverCacheTest.java (97%) rename {browsermob-core/src/test/java => browsermob-core-littleproxy/src/test/groovy}/net/lightbody/bmp/proxy/dns/AdvancedHostResolverTest.java (100%) rename {browsermob-core/src/test/java => browsermob-core-littleproxy/src/test/groovy}/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java (95%) create mode 100644 browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTestUtil.java rename {browsermob-core => browsermob-core-littleproxy}/src/test/java/net/lightbody/bmp/proxy/test/util/TestConstants.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java (99%) delete mode 100644 browsermob-core/src/main/java/net/lightbody/bmp/filters/package-info.java create mode 100644 browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTestUtil.java diff --git a/browsermob-core-littleproxy/pom.xml b/browsermob-core-littleproxy/pom.xml index fa5373924..4a9015743 100644 --- a/browsermob-core-littleproxy/pom.xml +++ b/browsermob-core-littleproxy/pom.xml @@ -17,39 +17,31 @@ + + + src/main/resources + true + + net/lightbody/bmp/version + + + + src/main/resources + false + + **/** + + + net/lightbody/bmp/version + + + - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - process-test-classes - - unpack - - - - - net.lightbody.bmp - browsermob-core - ${project.version} - test-jar - ${project.build.directory}/test-classes - - - - - - org.apache.maven.plugins maven-surefire-plugin -Xmx1g -XX:MaxPermSize=256m - - true - @@ -58,69 +50,102 @@ net.lightbody.bmp - browsermob-core - ${project.version} + littleproxy - org.bouncycastle - bcprov-jdk15on - - - javax.servlet - servlet-api - - - org.apache.httpcomponents - httpmime - - - - org.apache.httpcomponents - httpclient + com.barchart.udt + barchart-udt-bundle + - net.lightbody.bmp - littleproxy + com.fasterxml.jackson.core + jackson-core + + + + com.fasterxml.jackson.core + jackson-databind + + + + com.fasterxml.jackson.core + jackson-annotations + + + + net.sf.uadetector + uadetector-resources + 2014.10 + + + + com.google.guava + guava + + + + dnsjava + dnsjava + 2.1.7 + + + + org.seleniumhq.selenium + selenium-api + true + + + + org.slf4j + slf4j-api + + + + org.slf4j + jcl-over-slf4j + + + + + com.jcraft + jzlib - log4j - log4j - - - slf4j-log4j12 - org.slf4j - - - com.barchart.udt - barchart-udt-bundle + io.netty + netty + + + io.netty + netty-all + + + + org.bouncycastle + bcprov-jdk15on + + + + org.bouncycastle + bcpkix-jdk15on + + net.lightbody.bmp - browsermob-core + mitm ${project.version} - test-jar - test - - - - org.bouncycastle - bcprov-jdk15on - - - javax.servlet - servlet-api - - - org.apache.httpcomponents - httpclient - - + + + + + org.javassist + javassist + true @@ -242,60 +267,5 @@ hamcrest-library test - - - org.seleniumhq.selenium - selenium-api - true - - - - - com.jcraft - jzlib - - - io.netty - netty - - - - - - - io.netty - netty-all - - - - org.bouncycastle - bcprov-jdk15on - - - - org.bouncycastle - bcpkix-jdk15on - - - - net.lightbody.bmp - mitm - ${project.version} - - - - - org.javassist - javassist - true - - - - - org.apache.httpcomponents - httpclient - provided - \ No newline at end of file diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxy.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxy.java similarity index 96% rename from browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxy.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxy.java index 5b1ae6d7b..6f8e82bf9 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxy.java +++ b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxy.java @@ -4,7 +4,6 @@ import net.lightbody.bmp.filters.RequestFilter; import net.lightbody.bmp.filters.ResponseFilter; import net.lightbody.bmp.mitm.TrustSource; -import net.lightbody.bmp.mitm.manager.ImpersonatingMitmManager; import net.lightbody.bmp.proxy.BlacklistEntry; import net.lightbody.bmp.proxy.CaptureType; import net.lightbody.bmp.proxy.auth.AuthType; @@ -563,10 +562,6 @@ public interface BrowserMobProxy { * {@link HttpFiltersSource#filterRequest(io.netty.handler.codec.http.HttpRequest, io.netty.channel.ChannelHandlerContext)} method and returning an * {@link org.littleshoot.proxy.HttpFilters} instance (typically, a subclass of {@link org.littleshoot.proxy.HttpFiltersAdapter}). * To disable or bypass a filter on a per-request basis, the filterRequest() method may return null. - *

- * Note: This method is only available in the LittleProxy-based implementation of BrowserMob Proxy. The legacy {@link net.lightbody.bmp.proxy.ProxyServer} - * implementation will not use the HTTP filters. You must use the addRequestInterceptor() and addResponseInterceptor() methods in - * {@link net.lightbody.bmp.proxy.LegacyProxyServer} when using the legacy ProxyServer implementation. * * @param filterFactory factory to generate HttpFilters */ @@ -579,12 +574,8 @@ public interface BrowserMobProxy { * {@link HttpFiltersSource#filterRequest(io.netty.handler.codec.http.HttpRequest, io.netty.channel.ChannelHandlerContext)} method and returning an * {@link org.littleshoot.proxy.HttpFilters} instance (typically, a subclass of {@link org.littleshoot.proxy.HttpFiltersAdapter}). * To disable or bypass a filter on a per-request basis, the filterRequest() method may return null. - *

- * Note: This method is only available in the LittleProxy-based implementation of BrowserMob Proxy. The legacy {@link net.lightbody.bmp.proxy.ProxyServer} - * implementation will not use the HTTP filters. You must use the addRequestInterceptor() and addResponseInterceptor() methods in - * {@link net.lightbody.bmp.proxy.LegacyProxyServer} when using the legacy ProxyServer implementation. * - * @param filterFactory factory to generate HttpFilters + * @param filterFactory factory to generate HttpFilters */ void addLastHttpFilterFactory(HttpFiltersSource filterFactory); @@ -614,7 +605,7 @@ public interface BrowserMobProxy { /** * Sets the MITM manager, which is responsible for generating forged SSL certificates to present to clients. By default, * BrowserMob Proxy uses the ca-certificate-rsa.cer root certificate for impersonation. See the documentation at - * {@link ImpersonatingMitmManager} and {@link ImpersonatingMitmManager.Builder} + * {@link net.lightbody.bmp.mitm.manager.ImpersonatingMitmManager} and {@link net.lightbody.bmp.mitm.manager.ImpersonatingMitmManager.Builder} * for details on customizing the root and server certificate generation. * * @param mitmManager MITM manager to use diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java index e92f80285..05e240e20 100644 --- a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java +++ b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java @@ -43,7 +43,7 @@ import net.lightbody.bmp.proxy.auth.AuthType; import net.lightbody.bmp.proxy.dns.AdvancedHostResolver; import net.lightbody.bmp.proxy.dns.DelegatingHostResolver; -import net.lightbody.bmp.proxy.util.BrowserMobProxyUtil; +import net.lightbody.bmp.util.BrowserMobProxyUtil; import net.lightbody.bmp.util.BrowserMobHttpUtil; import org.littleshoot.proxy.ChainedProxy; import org.littleshoot.proxy.ChainedProxyAdapter; diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/client/ClientUtil.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/client/ClientUtil.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/client/ClientUtil.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/client/ClientUtil.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/Har.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/Har.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/Har.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/Har.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCache.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarCache.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCache.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarCache.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCacheStatus.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarCacheStatus.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCacheStatus.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarCacheStatus.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarContent.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarContent.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarContent.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarContent.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCookie.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarCookie.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCookie.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarCookie.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarEntry.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarEntry.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarEntry.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarEntry.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarLog.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarLog.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarLog.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarLog.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarNameValuePair.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarNameValuePair.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarNameValuePair.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarNameValuePair.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarNameVersion.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarNameVersion.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarNameVersion.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarNameVersion.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPage.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPage.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPage.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPage.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPageTimings.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPageTimings.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPageTimings.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPageTimings.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPostData.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPostData.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPostData.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPostData.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPostDataParam.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPostDataParam.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPostDataParam.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPostDataParam.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarRequest.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarRequest.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarRequest.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarRequest.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarResponse.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarResponse.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarResponse.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarResponse.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarTimings.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarTimings.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarTimings.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarTimings.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/json/ISO8601DateFormatter.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/json/ISO8601DateFormatter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/json/ISO8601DateFormatter.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/json/ISO8601DateFormatter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/json/ISO8601WithTDZDateFormatter.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/json/ISO8601WithTDZDateFormatter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/json/ISO8601WithTDZDateFormatter.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/json/ISO8601WithTDZDateFormatter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/exception/DecompressionException.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/exception/DecompressionException.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/exception/DecompressionException.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/exception/DecompressionException.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/exception/UnsupportedCharsetException.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/exception/UnsupportedCharsetException.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/exception/UnsupportedCharsetException.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/exception/UnsupportedCharsetException.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java index a6a3f0229..b51a62a01 100644 --- a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java +++ b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java @@ -25,7 +25,7 @@ import net.lightbody.bmp.filters.support.HttpConnectTiming; import net.lightbody.bmp.filters.util.HarCaptureUtil; import net.lightbody.bmp.proxy.CaptureType; -import net.lightbody.bmp.proxy.util.BrowserMobProxyUtil; +import net.lightbody.bmp.util.BrowserMobProxyUtil; import net.lightbody.bmp.util.BrowserMobHttpUtil; import net.sf.uadetector.ReadableUserAgent; import org.littleshoot.proxy.impl.ProxyUtils; diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/filters/RequestFilter.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/RequestFilter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/filters/RequestFilter.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/RequestFilter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/filters/ResponseFilter.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ResponseFilter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/filters/ResponseFilter.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ResponseFilter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/CaptureType.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/CaptureType.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/CaptureType.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/CaptureType.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/RewriteRule.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/RewriteRule.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/RewriteRule.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/RewriteRule.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/Whitelist.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/Whitelist.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/Whitelist.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/Whitelist.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/auth/AuthType.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/auth/AuthType.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/auth/AuthType.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/auth/AuthType.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/AbstractHostNameRemapper.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/AbstractHostNameRemapper.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/AbstractHostNameRemapper.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/AbstractHostNameRemapper.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolver.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolver.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolver.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolver.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/BasicHostResolver.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/BasicHostResolver.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/BasicHostResolver.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/BasicHostResolver.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/ChainedHostResolver.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/ChainedHostResolver.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/ChainedHostResolver.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/ChainedHostResolver.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/DnsJavaResolver.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/DnsJavaResolver.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/DnsJavaResolver.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/DnsJavaResolver.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/HostResolver.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/HostResolver.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/HostResolver.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/HostResolver.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/NativeCacheManipulatingResolver.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/NativeCacheManipulatingResolver.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/NativeCacheManipulatingResolver.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/NativeCacheManipulatingResolver.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/NativeResolver.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/NativeResolver.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/NativeResolver.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/NativeResolver.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/BrowserMobProxyUtil.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/BrowserMobProxyUtil.java similarity index 98% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/BrowserMobProxyUtil.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/BrowserMobProxyUtil.java index 958372bbf..8dc10309d 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/BrowserMobProxyUtil.java +++ b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/BrowserMobProxyUtil.java @@ -1,4 +1,4 @@ -package net.lightbody.bmp.proxy.util; +package net.lightbody.bmp.util; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; @@ -7,7 +7,6 @@ import net.lightbody.bmp.core.har.HarLog; import net.lightbody.bmp.core.har.HarPage; import net.lightbody.bmp.mitm.exception.UncheckedIOException; -import net.lightbody.bmp.util.ClasspathResourceUtil; import net.sf.uadetector.UserAgentStringParser; import net.sf.uadetector.service.UADetectorServiceFactory; import org.slf4j.Logger; diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/util/HttpMessageContents.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/HttpMessageContents.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/util/HttpMessageContents.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/HttpMessageContents.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/util/HttpMessageInfo.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/HttpMessageInfo.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/util/HttpMessageInfo.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/HttpMessageInfo.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/util/HttpObjectUtil.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/HttpObjectUtil.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/util/HttpObjectUtil.java rename to browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/HttpObjectUtil.java diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/version b/browsermob-core-littleproxy/src/main/resources/net/lightbody/bmp/version similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/version rename to browsermob-core-littleproxy/src/main/resources/net/lightbody/bmp/version diff --git a/browsermob-core/src/main/resources/sslSupport/ca-certificate-ec.cer b/browsermob-core-littleproxy/src/main/resources/sslSupport/ca-certificate-ec.cer similarity index 100% rename from browsermob-core/src/main/resources/sslSupport/ca-certificate-ec.cer rename to browsermob-core-littleproxy/src/main/resources/sslSupport/ca-certificate-ec.cer diff --git a/browsermob-core/src/main/resources/sslSupport/ca-certificate-rsa.cer b/browsermob-core-littleproxy/src/main/resources/sslSupport/ca-certificate-rsa.cer similarity index 100% rename from browsermob-core/src/main/resources/sslSupport/ca-certificate-rsa.cer rename to browsermob-core-littleproxy/src/main/resources/sslSupport/ca-certificate-rsa.cer diff --git a/browsermob-core/src/main/resources/sslSupport/ca-keystore-ec.p12 b/browsermob-core-littleproxy/src/main/resources/sslSupport/ca-keystore-ec.p12 similarity index 100% rename from browsermob-core/src/main/resources/sslSupport/ca-keystore-ec.p12 rename to browsermob-core-littleproxy/src/main/resources/sslSupport/ca-keystore-ec.p12 diff --git a/browsermob-core/src/main/resources/sslSupport/ca-keystore-rsa.p12 b/browsermob-core-littleproxy/src/main/resources/sslSupport/ca-keystore-rsa.p12 similarity index 100% rename from browsermob-core/src/main/resources/sslSupport/ca-keystore-rsa.p12 rename to browsermob-core-littleproxy/src/main/resources/sslSupport/ca-keystore-rsa.p12 diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/filters/RewriteUrlFilterTest.groovy b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/filters/RewriteUrlFilterTest.groovy index 9d6350540..0a6991b3e 100644 --- a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/filters/RewriteUrlFilterTest.groovy +++ b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/filters/RewriteUrlFilterTest.groovy @@ -10,8 +10,7 @@ import net.lightbody.bmp.BrowserMobProxy import net.lightbody.bmp.BrowserMobProxyServer import net.lightbody.bmp.proxy.RewriteRule import net.lightbody.bmp.proxy.test.util.MockServerTest -import net.lightbody.bmp.proxy.test.util.ProxyServerTest -import net.lightbody.bmp.proxy.util.IOUtils +import net.lightbody.bmp.proxy.test.util.NewProxyServerTestUtil import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.HttpGet import org.junit.After @@ -105,17 +104,17 @@ class RewriteUrlFilterTest extends MockServerTest { proxy.start() String url = "http://www.someotherhost.com:${mockServerPort}/testRewriteHttpHost" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { CloseableHttpResponse firstResponse = it.execute(new HttpGet(url)) assertEquals("Did not receive HTTP 200 from mock server", 200, firstResponse.getStatusLine().getStatusCode()) - String firstResponseBody = IOUtils.toStringAndClose(firstResponse.getEntity().getContent()); + String firstResponseBody = NewProxyServerTestUtil.toStringAndClose(firstResponse.getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", firstResponseBody); CloseableHttpResponse secondResponse = it.execute(new HttpGet(url)) assertEquals("Did not receive HTTP 200 from mock server", 200, secondResponse.getStatusLine().getStatusCode()) - String secondResponseBody = IOUtils.toStringAndClose(secondResponse.getEntity().getContent()); + String secondResponseBody = NewProxyServerTestUtil.toStringAndClose(secondResponse.getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", secondResponseBody); }; } @@ -136,11 +135,11 @@ class RewriteUrlFilterTest extends MockServerTest { proxy.start() String url = "http://badhost:${mockServerPort}/badresource" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String firstResponseBody = IOUtils.toStringAndClose(it.execute(new HttpGet(url)).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String firstResponseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet(url)).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", firstResponseBody); - String secondResponseBody = IOUtils.toStringAndClose(it.execute(new HttpGet(url)).getEntity().getContent()); + String secondResponseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet(url)).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", secondResponseBody); }; } @@ -162,11 +161,11 @@ class RewriteUrlFilterTest extends MockServerTest { proxy.start() String url = "https://localhost:${mockServerPort}/badresource" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String firstResponseBody = IOUtils.toStringAndClose(it.execute(new HttpGet(url)).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String firstResponseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet(url)).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", firstResponseBody); - String secondResponseBody = IOUtils.toStringAndClose(it.execute(new HttpGet(url)).getEntity().getContent()); + String secondResponseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet(url)).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", secondResponseBody); }; } diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/AutoAuthTest.groovy b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/AutoAuthTest.groovy index 4ac813a07..cb3b903b7 100644 --- a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/AutoAuthTest.groovy +++ b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/AutoAuthTest.groovy @@ -4,8 +4,7 @@ import net.lightbody.bmp.BrowserMobProxy import net.lightbody.bmp.BrowserMobProxyServer import net.lightbody.bmp.proxy.auth.AuthType import net.lightbody.bmp.proxy.test.util.MockServerTest -import net.lightbody.bmp.proxy.test.util.ProxyServerTest -import net.lightbody.bmp.proxy.util.IOUtils +import net.lightbody.bmp.proxy.test.util.NewProxyServerTestUtil import org.apache.http.client.methods.HttpGet import org.junit.After import org.junit.Test @@ -43,8 +42,8 @@ class AutoAuthTest extends MockServerTest { proxy.setTrustAllServers(true) proxy.start() - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/basicAuthHttp")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/basicAuthHttp")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; } @@ -66,8 +65,8 @@ class AutoAuthTest extends MockServerTest { proxy.setTrustAllServers(true) proxy.start() - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("https://localhost:${mockServerPort}/basicAuthHttp")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("https://localhost:${mockServerPort}/basicAuthHttp")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; } @@ -92,8 +91,8 @@ class AutoAuthTest extends MockServerTest { proxy.stopAutoAuthorization("localhost") - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/basicAuthHttp")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/basicAuthHttp")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; } diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/BindAddressTest.groovy b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/BindAddressTest.groovy index d527c524e..16fd4b5c4 100644 --- a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/BindAddressTest.groovy +++ b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/BindAddressTest.groovy @@ -3,7 +3,7 @@ package net.lightbody.bmp.proxy import net.lightbody.bmp.BrowserMobProxy import net.lightbody.bmp.BrowserMobProxyServer import net.lightbody.bmp.proxy.test.util.MockServerTest -import net.lightbody.bmp.proxy.test.util.ProxyServerTest +import net.lightbody.bmp.proxy.test.util.NewProxyServerTestUtil import org.apache.http.client.methods.HttpGet import org.apache.http.conn.HttpHostConnectException import org.junit.After @@ -42,7 +42,7 @@ class BindAddressTest extends MockServerTest { proxy = new BrowserMobProxyServer() proxy.start(0, InetAddress.getLoopbackAddress()) - ProxyServerTest.getNewHttpClient(proxy.getPort()).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.getPort()).withCloseable { def response = it.execute(new HttpGet("http://127.0.0.1:${mockServerPort}/clientbind")) assertEquals(200, response.statusLine.statusCode) } @@ -69,7 +69,7 @@ class BindAddressTest extends MockServerTest { proxy = new BrowserMobProxyServer() proxy.start(0, localHostAddr) - ProxyServerTest.getNewHttpClient(proxy.getPort()).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.getPort()).withCloseable { it.execute(new HttpGet("http://127.0.0.1:${mockServerPort}/clientbind")) } } @@ -86,7 +86,7 @@ class BindAddressTest extends MockServerTest { proxy = new BrowserMobProxyServer() proxy.start(0, null, InetAddress.getLoopbackAddress()) - ProxyServerTest.getNewHttpClient(proxy.getPort()).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.getPort()).withCloseable { def response = it.execute(new HttpGet("http://127.0.0.1:${mockServerPort}/serverbind")) assertEquals(200, response.statusLine.statusCode) } @@ -98,7 +98,7 @@ class BindAddressTest extends MockServerTest { proxy = new BrowserMobProxyServer() proxy.start(0, null, InetAddress.getLoopbackAddress()) - ProxyServerTest.getNewHttpClient(proxy.getPort()).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.getPort()).withCloseable { def response = it.execute(new HttpGet("http://www.google.com")) assertEquals("Expected a 502 Bad Gateway when connecting to an external address after binding to loopback", 502, response.statusLine.statusCode) } diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/BlacklistTest.groovy b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/BlacklistTest.groovy index b600284c9..a7f3f85a8 100644 --- a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/BlacklistTest.groovy +++ b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/BlacklistTest.groovy @@ -3,8 +3,7 @@ package net.lightbody.bmp.proxy import net.lightbody.bmp.BrowserMobProxy import net.lightbody.bmp.BrowserMobProxyServer import net.lightbody.bmp.proxy.test.util.MockServerTest -import net.lightbody.bmp.proxy.test.util.ProxyServerTest -import net.lightbody.bmp.proxy.util.IOUtils +import net.lightbody.bmp.proxy.test.util.NewProxyServerTestUtil import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.HttpGet import org.junit.After @@ -35,11 +34,11 @@ class BlacklistTest extends MockServerTest { proxy.blacklistRequests("http://www\\.blacklisted\\.domain/.*", 405) - ProxyServerTest.getNewHttpClient(proxyPort).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxyPort).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet("http://www.blacklisted.domain/someresource")) assertEquals("Did not receive blacklisted status code in response", 405, response.getStatusLine().getStatusCode()) - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()) + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()) assertThat("Expected blacklisted response to contain 0-length body", responseBody, isEmptyOrNullString()) } } @@ -62,11 +61,11 @@ class BlacklistTest extends MockServerTest { proxy.blacklistRequests("https://localhost:${mockServerPort}/.*", 405) - ProxyServerTest.getNewHttpClient(proxyPort).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxyPort).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet("https://localhost:${mockServerPort}/thisrequestshouldnotoccur")) assertEquals("Did not receive blacklisted status code in response", 405, response.getStatusLine().getStatusCode()) - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()) + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()) assertThat("Expected blacklisted response to contain 0-length body", responseBody, isEmptyOrNullString()) } } @@ -95,17 +94,17 @@ class BlacklistTest extends MockServerTest { proxy.blacklistRequests("http://localhost:${mockServerPort}/blacklistedresource", 405) - ProxyServerTest.getNewHttpClient(proxyPort).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxyPort).withCloseable { CloseableHttpResponse nonBlacklistedResourceResponse = it.execute(new HttpGet("http://localhost:${mockServerPort}/nonblacklistedresource")) assertEquals("Did not receive blacklisted status code in response", 200, nonBlacklistedResourceResponse.getStatusLine().getStatusCode()) - String nonBlacklistedResponseBody = IOUtils.toStringAndClose(nonBlacklistedResourceResponse.getEntity().getContent()) + String nonBlacklistedResponseBody = NewProxyServerTestUtil.toStringAndClose(nonBlacklistedResourceResponse.getEntity().getContent()) assertEquals("Did not receive expected response from mock server", "not blacklisted", nonBlacklistedResponseBody) CloseableHttpResponse blacklistedResourceResponse = it.execute(new HttpGet("http://localhost:${mockServerPort}/blacklistedresource")) assertEquals("Did not receive blacklisted status code in response", 405, blacklistedResourceResponse.getStatusLine().getStatusCode()) - String blacklistedResponseBody = IOUtils.toStringAndClose(blacklistedResourceResponse.getEntity().getContent()) + String blacklistedResponseBody = NewProxyServerTestUtil.toStringAndClose(blacklistedResourceResponse.getEntity().getContent()) assertThat("Expected blacklisted response to contain 0-length body", blacklistedResponseBody, isEmptyOrNullString()) } } @@ -135,17 +134,17 @@ class BlacklistTest extends MockServerTest { proxy.blacklistRequests("https://localhost:${mockServerPort}/blacklistedresource", 405) - ProxyServerTest.getNewHttpClient(proxyPort).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxyPort).withCloseable { CloseableHttpResponse nonBlacklistedResourceResponse = it.execute(new HttpGet("https://localhost:${mockServerPort}/nonblacklistedresource")) assertEquals("Did not receive blacklisted status code in response", 200, nonBlacklistedResourceResponse.getStatusLine().getStatusCode()) - String nonBlacklistedResponseBody = IOUtils.toStringAndClose(nonBlacklistedResourceResponse.getEntity().getContent()) + String nonBlacklistedResponseBody = NewProxyServerTestUtil.toStringAndClose(nonBlacklistedResourceResponse.getEntity().getContent()) assertEquals("Did not receive expected response from mock server", "not blacklisted", nonBlacklistedResponseBody) CloseableHttpResponse blacklistedResourceResponse = it.execute(new HttpGet("https://localhost:${mockServerPort}/blacklistedresource")) assertEquals("Did not receive blacklisted status code in response", 405, blacklistedResourceResponse.getStatusLine().getStatusCode()) - String blacklistedResponseBody = IOUtils.toStringAndClose(blacklistedResourceResponse.getEntity().getContent()) + String blacklistedResponseBody = NewProxyServerTestUtil.toStringAndClose(blacklistedResourceResponse.getEntity().getContent()) assertThat("Expected blacklisted response to contain 0-length body", blacklistedResponseBody, isEmptyOrNullString()) } } @@ -167,11 +166,11 @@ class BlacklistTest extends MockServerTest { // CONNECT requests don't contain the path to the resource, only the server and port proxy.blacklistRequests("https://localhost:${mockServerPort}", 405, "CONNECT") - ProxyServerTest.getNewHttpClient(proxyPort).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxyPort).withCloseable { CloseableHttpResponse blacklistedResourceResponse = it.execute(new HttpGet("https://localhost:${mockServerPort}/blacklistconnect")) assertEquals("Did not receive blacklisted status code in response", 405, blacklistedResourceResponse.getStatusLine().getStatusCode()) - String blacklistedResponseBody = IOUtils.toStringAndClose(blacklistedResourceResponse.getEntity().getContent()) + String blacklistedResponseBody = NewProxyServerTestUtil.toStringAndClose(blacklistedResourceResponse.getEntity().getContent()) assertThat("Expected blacklisted response to contain 0-length body", blacklistedResponseBody, isEmptyOrNullString()) } } @@ -194,11 +193,11 @@ class BlacklistTest extends MockServerTest { // HTTP CONNECTs should not be blacklisted unless the method is explicitly specified proxy.blacklistRequests("https://localhost:${mockServerPort}", 405) - ProxyServerTest.getNewHttpClient(proxyPort).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxyPort).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet("https://localhost:${mockServerPort}/connectNotBlacklisted")) assertEquals("Expected to receive response from mock server after successful CONNECT", 200, response.getStatusLine().getStatusCode()) - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()) + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()) assertEquals("Expected to receive HTTP 200 and success message from server", "success", responseBody) } } diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/ChainedProxyAuthTest.groovy b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/ChainedProxyAuthTest.groovy index a965798ee..7ce23012b 100644 --- a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/ChainedProxyAuthTest.groovy +++ b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/ChainedProxyAuthTest.groovy @@ -4,8 +4,7 @@ import net.lightbody.bmp.BrowserMobProxy import net.lightbody.bmp.BrowserMobProxyServer import net.lightbody.bmp.proxy.auth.AuthType import net.lightbody.bmp.proxy.test.util.MockServerTest -import net.lightbody.bmp.proxy.test.util.ProxyServerTest -import net.lightbody.bmp.proxy.util.IOUtils +import net.lightbody.bmp.proxy.test.util.NewProxyServerTestUtil import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.HttpGet import org.junit.After @@ -67,8 +66,8 @@ class ChainedProxyAuthTest extends MockServerTest { proxy.setTrustAllServers(true) proxy.start() - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("https://localhost:${mockServerPort}/proxyauth")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("https://localhost:${mockServerPort}/proxyauth")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; } @@ -107,7 +106,7 @@ class ChainedProxyAuthTest extends MockServerTest { proxy.setTrustAllServers(true) proxy.start() - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet("https://localhost:${mockServerPort}/proxyauth")) assertEquals("Expected to receive a Bad Gateway due to incorrect proxy authentication credentials", 502, response.getStatusLine().statusCode) }; diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/FilterChainTest.groovy b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/FilterChainTest.groovy index 19228e768..d6c9e7ed1 100644 --- a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/FilterChainTest.groovy +++ b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/FilterChainTest.groovy @@ -7,8 +7,7 @@ import io.netty.handler.codec.http.HttpResponse import net.lightbody.bmp.BrowserMobProxy import net.lightbody.bmp.BrowserMobProxyServer import net.lightbody.bmp.proxy.test.util.MockServerTest -import net.lightbody.bmp.proxy.test.util.ProxyServerTest -import net.lightbody.bmp.proxy.util.IOUtils +import net.lightbody.bmp.proxy.test.util.NewProxyServerTestUtil import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.HttpGet import org.junit.After @@ -64,11 +63,11 @@ class FilterChainTest extends MockServerTest { String requestUrl = "http://localhost:${mockServerPort}/testfilterexceptionpreservesrequest" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet(requestUrl)) assertEquals("Did not receive HTTP 200 from mock server", 200, response.getStatusLine().getStatusCode()) - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; } @@ -129,11 +128,11 @@ class FilterChainTest extends MockServerTest { String requestUrl = "http://localhost:${mockServerPort}/testfilterexceptionpreserveschain" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet(requestUrl)) assertEquals("Did not receive HTTP 200 from mock server", 200, response.getStatusLine().getStatusCode()) - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; @@ -167,11 +166,11 @@ class FilterChainTest extends MockServerTest { String requestUrl = "http://localhost:${mockServerPort}/testrequestresponsefilterpreservesrequest" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet(requestUrl)) assertEquals("Did not receive HTTP 200 from mock server", 200, response.getStatusLine().getStatusCode()) - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; } @@ -215,11 +214,11 @@ class FilterChainTest extends MockServerTest { String requestUrl = "http://localhost:${mockServerPort}/testrequestresponsefilterpreserveschain" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet(requestUrl)) assertEquals("Did not receive HTTP 200 from mock server", 200, response.getStatusLine().getStatusCode()) - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/NewHarTest.groovy b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/NewHarTest.groovy index 6d5ad4fd5..7e35f1a38 100644 --- a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/NewHarTest.groovy +++ b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/NewHarTest.groovy @@ -13,8 +13,7 @@ import net.lightbody.bmp.core.har.HarTimings import net.lightbody.bmp.filters.util.HarCaptureUtil import net.lightbody.bmp.proxy.dns.AdvancedHostResolver import net.lightbody.bmp.proxy.test.util.MockServerTest -import net.lightbody.bmp.proxy.test.util.ProxyServerTest -import net.lightbody.bmp.proxy.util.IOUtils +import net.lightbody.bmp.proxy.test.util.NewProxyServerTestUtil import org.apache.http.client.config.RequestConfig import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.HttpGet @@ -85,8 +84,8 @@ class NewHarTest extends MockServerTest { proxy.newHar(); - ProxyServerTest.getNewHttpClient(proxyPort).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testDnsTimingPopulated")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxyPort).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testDnsTimingPopulated")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; @@ -120,8 +119,8 @@ class NewHarTest extends MockServerTest { proxy.newHar() - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("https://localhost:${mockServerPort}/testCaptureResponseCookiesInHar")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("https://localhost:${mockServerPort}/testCaptureResponseCookiesInHar")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; @@ -153,8 +152,8 @@ class NewHarTest extends MockServerTest { proxy.newHar() - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testCaptureResponseHeaderInHar")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testCaptureResponseHeaderInHar")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; @@ -191,8 +190,8 @@ class NewHarTest extends MockServerTest { proxy.newHar() - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testCaptureResponseContentInHar")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testCaptureResponseContentInHar")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", expectedResponseBody, responseBody); }; @@ -230,8 +229,8 @@ class NewHarTest extends MockServerTest { proxy.newHar() - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testCaptureResponseContentInHar")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testCaptureResponseContentInHar")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", expectedResponseBody, responseBody); }; @@ -267,8 +266,8 @@ class NewHarTest extends MockServerTest { // putting tests in code blocks to avoid variable name collisions regularHarCanCapture: { - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testEndHar")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testEndHar")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; @@ -292,8 +291,8 @@ class NewHarTest extends MockServerTest { } harStillEmptyAfterRequest: { - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testEndHar")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testEndHar")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; @@ -310,8 +309,8 @@ class NewHarTest extends MockServerTest { } newHarCanCapture: { - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testEndHar")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testEndHar")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; @@ -344,8 +343,8 @@ class NewHarTest extends MockServerTest { proxy.newHar("first-page") - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testEndHar")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testEndHar")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; @@ -364,8 +363,8 @@ class NewHarTest extends MockServerTest { Har harWithFirstPageOnly = proxy.newPage("second-page") - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testEndHar")).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet("http://localhost:${mockServerPort}/testEndHar")).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; @@ -396,8 +395,8 @@ class NewHarTest extends MockServerTest { String requestUrl = "http://localhost:${mockServerPort}/httprequesturlcaptured" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet(requestUrl)).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet(requestUrl)).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; @@ -428,8 +427,8 @@ class NewHarTest extends MockServerTest { String requestUrl = "http://localhost:${mockServerPort}/httprequesturlcaptured?param1=value1" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet(requestUrl)).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet(requestUrl)).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; @@ -467,8 +466,8 @@ class NewHarTest extends MockServerTest { // use HTTPS to force a CONNECT. subsequent requests through the tunnel will only contain the resource path, not the full hostname. String requestUrl = "https://localhost:${mockServerPort}/httpsrequesturlcaptured?param1=value1" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet(requestUrl)).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet(requestUrl)).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; @@ -507,11 +506,11 @@ class NewHarTest extends MockServerTest { String requestUrl = "https://localhost:${mockServerPort}/originalurl?param1=value1" String expectedRewrittenUrl = "https://localhost:${mockServerPort}/httpsrewrittenurlcaptured?param1=value1" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet(requestUrl)) assertEquals("Did not receive HTTP 200 from mock server", 200, response.getStatusLine().getStatusCode()) - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "success", responseBody); }; @@ -555,8 +554,8 @@ class NewHarTest extends MockServerTest { httpsRequest: { String httpsUrl = "https://localhost:${mockServerPort}/httpsmitmdisabled" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet(httpsUrl)).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet(httpsUrl)).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "Response over HTTPS", responseBody); }; @@ -568,8 +567,8 @@ class NewHarTest extends MockServerTest { httpRequest: { String httpUrl = "http://localhost:${mockServerPort}/httpmitmdisabled" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet(httpUrl)).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet(httpUrl)).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "Response over HTTP", responseBody); }; @@ -584,8 +583,8 @@ class NewHarTest extends MockServerTest { secondHttpsRequest: { String httpsUrl = "https://localhost:${mockServerPort}/httpsmitmdisabled" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { - String responseBody = IOUtils.toStringAndClose(it.execute(new HttpGet(httpsUrl)).getEntity().getContent()); + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { + String responseBody = NewProxyServerTestUtil.toStringAndClose(it.execute(new HttpGet(httpsUrl)).getEntity().getContent()); assertEquals("Did not receive expected response from mock server", "Response over HTTPS", responseBody); }; @@ -610,7 +609,7 @@ class NewHarTest extends MockServerTest { String requestUrl = "http://www.doesnotexist.address/some-resource" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet(requestUrl)) assertEquals("Did not receive HTTP 502 from proxy", 502, response.getStatusLine().getStatusCode()) }; @@ -658,7 +657,7 @@ class NewHarTest extends MockServerTest { String requestUrl = "https://www.doesnotexist.address/some-resource" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet(requestUrl)) assertEquals("Did not receive HTTP 502 from proxy", 502, response.getStatusLine().getStatusCode()) }; @@ -704,7 +703,7 @@ class NewHarTest extends MockServerTest { // to port 2 will fail. String requestUrl = "http://localhost:2/some-resource" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet(requestUrl)) assertEquals("Did not receive HTTP 502 from proxy", 502, response.getStatusLine().getStatusCode()) }; @@ -751,7 +750,7 @@ class NewHarTest extends MockServerTest { // to port 2 will fail. String requestUrl = "https://localhost:2/some-resource" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet(requestUrl)) assertEquals("Did not receive HTTP 502 from proxy", 502, response.getStatusLine().getStatusCode()) }; @@ -806,7 +805,7 @@ class NewHarTest extends MockServerTest { String requestUrl = "http://localhost:${mockServerPort}/testResponseTimeoutCapturedInHar" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet(requestUrl)) assertEquals("Did not receive HTTP 504 from proxy", 504, response.getStatusLine().getStatusCode()) }; @@ -866,7 +865,7 @@ class NewHarTest extends MockServerTest { String requestUrl = "https://localhost:${mockServerPort}/testResponseTimeoutCapturedInHar" - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet(requestUrl)) assertEquals("Did not receive HTTP 504 from proxy", 504, response.getStatusLine().getStatusCode()) }; @@ -961,7 +960,7 @@ class NewHarTest extends MockServerTest { proxy.newHar() def verifyRedirect = { String requestUrl, expectedStatusCode, expectedLocationValue -> - ProxyServerTest.getNewHttpClient(proxy.port).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxy.port).withCloseable { // for some reason, even when the HTTP client is built with .disableRedirectHandling(), it still tries to follow // the 301. so explicitly disable following redirects at the request level. def request = new HttpGet(requestUrl) diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/WhitelistTest.groovy b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/WhitelistTest.groovy index e5aac303d..22dd101bb 100644 --- a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/WhitelistTest.groovy +++ b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/WhitelistTest.groovy @@ -8,8 +8,7 @@ import net.lightbody.bmp.BrowserMobProxy import net.lightbody.bmp.BrowserMobProxyServer import net.lightbody.bmp.filters.WhitelistFilter import net.lightbody.bmp.proxy.test.util.MockServerTest -import net.lightbody.bmp.proxy.test.util.ProxyServerTest -import net.lightbody.bmp.proxy.util.IOUtils +import net.lightbody.bmp.proxy.test.util.NewProxyServerTestUtil import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.HttpGet import org.junit.After @@ -57,11 +56,11 @@ class WhitelistTest extends MockServerTest { proxy.whitelistRequests(["http://localhost/.*"], 500) - ProxyServerTest.getNewHttpClient(proxyPort).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxyPort).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet("http://www.someother.domain/someresource")) assertEquals("Did not receive whitelist status code in response", 500, response.getStatusLine().getStatusCode()) - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()) + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()) assertThat("Expected whitelist response to contain 0-length body", responseBody, isEmptyOrNullString()) } } @@ -83,11 +82,11 @@ class WhitelistTest extends MockServerTest { proxy.whitelistRequests(["https://some-other-domain/.*"], 500) - ProxyServerTest.getNewHttpClient(proxyPort).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxyPort).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet("https://localhost:${mockServerPort}/nonwhitelistedresource")) assertEquals("Did not receive whitelist status code in response", 500, response.getStatusLine().getStatusCode()) - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()) + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()) assertThat("Expected whitelist response to contain 0-length body", responseBody, isEmptyOrNullString()) } } @@ -108,11 +107,11 @@ class WhitelistTest extends MockServerTest { proxy.whitelistRequests(["http://localhost:${mockServerPort}/.*".toString()], 500) - ProxyServerTest.getNewHttpClient(proxyPort).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxyPort).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet("http://localhost:${mockServerPort}/whitelistedresource")) assertEquals("Did not receive expected response from mock server for whitelisted url", 200, response.getStatusLine().getStatusCode()) - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()) + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()) assertEquals("Did not receive expected response body from mock server for whitelisted url", "whitelisted", responseBody) } } @@ -134,11 +133,11 @@ class WhitelistTest extends MockServerTest { proxy.whitelistRequests(["https://localhost:${mockServerPort}/.*".toString()], 500) - ProxyServerTest.getNewHttpClient(proxyPort).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxyPort).withCloseable { CloseableHttpResponse response = it.execute(new HttpGet("https://localhost:${mockServerPort}/whitelistedresource")) assertEquals("Did not receive expected response from mock server for whitelisted url", 200, response.getStatusLine().getStatusCode()) - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()) + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()) assertEquals("Did not receive expected response body from mock server for whitelisted url", "whitelisted", responseBody) } } @@ -167,17 +166,17 @@ class WhitelistTest extends MockServerTest { proxy.whitelistRequests(["http://localhost:${mockServerPort}/whitelistedresource".toString()], 500) - ProxyServerTest.getNewHttpClient(proxyPort).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxyPort).withCloseable { CloseableHttpResponse nonWhitelistedResponse = it.execute(new HttpGet("http://localhost:${mockServerPort}/nonwhitelistedresource")) assertEquals("Did not receive whitelist status code in response", 500, nonWhitelistedResponse.getStatusLine().getStatusCode()) - String nonWhitelistedResponseBody = IOUtils.toStringAndClose(nonWhitelistedResponse.getEntity().getContent()) + String nonWhitelistedResponseBody = NewProxyServerTestUtil.toStringAndClose(nonWhitelistedResponse.getEntity().getContent()) assertThat("Expected whitelist response to contain 0-length body", nonWhitelistedResponseBody, isEmptyOrNullString()) CloseableHttpResponse whitelistedResponse = it.execute(new HttpGet("http://localhost:${mockServerPort}/whitelistedresource")) assertEquals("Did not receive expected response from mock server for whitelisted url", 200, whitelistedResponse.getStatusLine().getStatusCode()) - String whitelistedResponseBody = IOUtils.toStringAndClose(whitelistedResponse.getEntity().getContent()) + String whitelistedResponseBody = NewProxyServerTestUtil.toStringAndClose(whitelistedResponse.getEntity().getContent()) assertEquals("Did not receive expected response body from mock server for whitelisted url", "whitelisted", whitelistedResponseBody) } } @@ -207,17 +206,17 @@ class WhitelistTest extends MockServerTest { proxy.whitelistRequests(["https://localhost:${mockServerPort}/whitelistedresource".toString()], 500) - ProxyServerTest.getNewHttpClient(proxyPort).withCloseable { + NewProxyServerTestUtil.getNewHttpClient(proxyPort).withCloseable { CloseableHttpResponse nonWhitelistedResponse = it.execute(new HttpGet("https://localhost:${mockServerPort}/nonwhitelistedresource")) assertEquals("Did not receive whitelist status code in response", 500, nonWhitelistedResponse.getStatusLine().getStatusCode()) - String nonWhitelistedResponseBody = IOUtils.toStringAndClose(nonWhitelistedResponse.getEntity().getContent()) + String nonWhitelistedResponseBody = NewProxyServerTestUtil.toStringAndClose(nonWhitelistedResponse.getEntity().getContent()) assertThat("Expected whitelist response to contain 0-length body", nonWhitelistedResponseBody, isEmptyOrNullString()) CloseableHttpResponse whitelistedResponse = it.execute(new HttpGet("https://localhost:${mockServerPort}/whitelistedresource")) assertEquals("Did not receive expected response from mock server for whitelisted url", 200, whitelistedResponse.getStatusLine().getStatusCode()) - String whitelistedResponseBody = IOUtils.toStringAndClose(whitelistedResponse.getEntity().getContent()) + String whitelistedResponseBody = NewProxyServerTestUtil.toStringAndClose(whitelistedResponse.getEntity().getContent()) assertEquals("Did not receive expected response body from mock server for whitelisted url", "whitelisted", whitelistedResponseBody) } } diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolverCacheTest.java b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverCacheTest.java similarity index 97% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolverCacheTest.java rename to browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverCacheTest.java index 2c6090b45..e4cdb648e 100644 --- a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolverCacheTest.java +++ b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverCacheTest.java @@ -1,7 +1,7 @@ package net.lightbody.bmp.proxy.dns; import com.google.common.collect.ImmutableList; -import net.lightbody.bmp.proxy.test.util.ProxyServerTest; +import net.lightbody.bmp.proxy.test.util.NewProxyServerTestUtil; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,7 +40,7 @@ public AdvancedHostResolverCacheTest(Class resolverClass) if (resolverClass.equals(ChainedHostResolver.class)) { // don't use the NativecacheManipulatingResolver on Windows, since it is unsupported this.resolver = new ChainedHostResolver( - ProxyServerTest.isWindows() ? ImmutableList.of(new DnsJavaResolver()) + NewProxyServerTestUtil.isWindows() ? ImmutableList.of(new DnsJavaResolver()) : ImmutableList.of(new NativeCacheManipulatingResolver(), new DnsJavaResolver())); } else { this.resolver = resolverClass.newInstance(); @@ -57,7 +57,7 @@ public void skipForTravisCi() { public void skipForNativeDnsCacheOnWindows() { // the NativecacheManipulatingResolver does not work on Windows because Java seems to use to the OS-level cache assumeFalse("NativeCacheManipulatingResolver does not support cache manipulation on Windows", - ProxyServerTest.isWindows() && this.resolver instanceof NativeCacheManipulatingResolver); + NewProxyServerTestUtil.isWindows() && this.resolver instanceof NativeCacheManipulatingResolver); } @Test diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolverTest.java b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolverTest.java rename to browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java similarity index 95% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java rename to browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java index 71936464e..fbf09d63c 100644 --- a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java +++ b/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java @@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import net.lightbody.bmp.proxy.test.util.TestConstants; +import org.junit.Assert; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -66,7 +67,7 @@ public void testResolveReturnsFirstResults() { Collection results = chainResolver.resolve("1.1.1.1"); assertNotNull("Resolver should not return null results", results); assertThat("Expected resolver to return a result", results, not(empty())); - assertEquals("Resolver returned unexpected result", TestConstants.addressOnes, Iterables.get(results, 0)); + Assert.assertEquals("Resolver returned unexpected result", TestConstants.addressOnes, Iterables.get(results, 0)); verify(secondResolver, never()).resolve("1.1.1.1"); @@ -79,7 +80,7 @@ public void testResolveReturnsFirstResults() { results = chainResolver.resolve("2.2.2.2"); assertNotNull("Resolver should not return null results", results); assertThat("Expected resolver to return a result", results, not(empty())); - assertEquals("Resolver returned unexpected result", TestConstants.addressTwos, Iterables.get(results, 0)); + Assert.assertEquals("Resolver returned unexpected result", TestConstants.addressTwos, Iterables.get(results, 0)); verify(firstResolver).resolve("2.2.2.2"); verify(secondResolver).resolve("2.2.2.2"); @@ -158,7 +159,7 @@ public void run() { assertNotNull("Resolver should not return null results", results); assertThat("Expected resolver to return a result", results, not(empty())); - assertEquals("Resolver returned unexpected result", TestConstants.addressOnes, Iterables.get(results, 0)); + Assert.assertEquals("Resolver returned unexpected result", TestConstants.addressOnes, Iterables.get(results, 0)); assertThat("Expected resolver to be finished clearing DNS cache", secondResolverCacheClearFinishedTime.get(), greaterThan(0L)); diff --git a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java b/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java index 9f8a2bae0..3df880424 100644 --- a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java +++ b/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java @@ -16,8 +16,7 @@ import net.lightbody.bmp.filters.ResponseFilter; import net.lightbody.bmp.filters.ResponseFilterAdapter; import net.lightbody.bmp.proxy.test.util.MockServerTest; -import net.lightbody.bmp.proxy.test.util.ProxyServerTest; -import net.lightbody.bmp.proxy.util.IOUtils; +import net.lightbody.bmp.proxy.test.util.NewProxyServerTestUtil; import net.lightbody.bmp.util.HttpMessageContents; import net.lightbody.bmp.util.HttpMessageInfo; import net.lightbody.bmp.util.HttpObjectUtil; @@ -113,9 +112,9 @@ public HttpResponse clientToProxyRequest(HttpObject httpObject) { } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { CloseableHttpResponse response = httpClient.execute(new HttpGet("http://localhost:" + mockServerPort + "/regular200")); - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertTrue("Expected interceptor to fire", interceptorFired.get()); assertFalse("Did not expected short circuit interceptor code to execute", shortCircuitFired.get()); @@ -126,7 +125,7 @@ public HttpResponse clientToProxyRequest(HttpObject httpObject) { interceptorFired.set(false); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { CloseableHttpResponse response = httpClient.execute(new HttpGet("http://localhost:" + mockServerPort + "/shortcircuit204")); assertTrue("Expected interceptor to fire", interceptorFired.get()); @@ -184,9 +183,9 @@ public HttpResponse clientToProxyRequest(HttpObject httpObject) { } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { CloseableHttpResponse response = httpClient.execute(new HttpGet("http://localhost:" + mockServerPort + "/originalrequest")); - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertEquals("Expected server to return a 200", 200, response.getStatusLine().getStatusCode()); assertEquals("Did not receive expected response from mock server", "success", responseBody); @@ -223,11 +222,11 @@ public HttpResponse filterRequest(HttpRequest request, HttpMessageContents conte } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { HttpPut request = new HttpPut("http://localhost:" + mockServerPort + "/modifyrequest"); request.setEntity(new StringEntity(originalText)); CloseableHttpResponse response = httpClient.execute(request); - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertEquals("Expected server to return a 200", 200, response.getStatusLine().getStatusCode()); assertEquals("Did not receive expected response from mock server", "success", responseBody); @@ -265,11 +264,11 @@ public HttpResponse filterRequest(HttpRequest request, HttpMessageContents conte } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { HttpPut request = new HttpPut("https://localhost:" + mockServerPort + "/modifyrequest"); request.setEntity(new StringEntity(originalText)); CloseableHttpResponse response = httpClient.execute(request); - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertEquals("Expected server to return a 200", 200, response.getStatusLine().getStatusCode()); assertEquals("Did not receive expected response from mock server", "success", responseBody); @@ -304,7 +303,7 @@ public void filterResponse(HttpResponse response, HttpMessageContents contents, } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { HttpGet request = new HttpGet("http://localhost:" + mockServerPort + "/modifyresponse"); CloseableHttpResponse response = httpClient.execute(request); byte[] responseBytes = org.apache.commons.io.IOUtils.toByteArray(response.getEntity().getContent()); @@ -342,11 +341,11 @@ public void filterResponse(HttpResponse response, HttpMessageContents contents, } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { HttpGet request = new HttpGet("http://localhost:" + mockServerPort + "/modifyresponse"); request.addHeader("Accept-Encoding", "gzip"); CloseableHttpResponse response = httpClient.execute(request); - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertEquals("Expected server to return a 200", 200, response.getStatusLine().getStatusCode()); assertEquals("Did not receive expected response from mock server", newText, responseBody); @@ -382,11 +381,11 @@ public void filterResponse(HttpResponse response, HttpMessageContents contents, } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { HttpGet request = new HttpGet("https://localhost:" + mockServerPort + "/modifyresponse"); request.addHeader("Accept-Encoding", "gzip"); CloseableHttpResponse response = httpClient.execute(request); - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertEquals("Expected server to return a 200", 200, response.getStatusLine().getStatusCode()); assertEquals("Did not receive expected response from mock server", newText, responseBody); @@ -415,7 +414,7 @@ public void filterResponse(HttpResponse response, HttpMessageContents contents, } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { CloseableHttpResponse response = httpClient.execute(new HttpHead("http://localhost:" + mockServerPort + "/interceptortest")); assertEquals("Expected server to return a 200", 200, response.getStatusLine().getStatusCode()); @@ -456,7 +455,7 @@ public void filterResponse(HttpResponse response, HttpMessageContents contents, } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { CloseableHttpResponse response = httpClient.execute(new HttpGet("http://localhost:" + mockServerPort + "/originalendpoint")); assertEquals("Expected server to return a 200", 200, response.getStatusLine().getStatusCode()); @@ -500,7 +499,7 @@ public void filterResponse(HttpResponse response, HttpMessageContents contents, } }, 0)); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { CloseableHttpResponse response = httpClient.execute(new HttpGet("http://localhost:" + mockServerPort + "/endpoint")); assertEquals("Expected server to return a 200", 200, response.getStatusLine().getStatusCode()); @@ -539,7 +538,7 @@ public HttpResponse filterRequest(HttpRequest request, HttpMessageContents conte } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { CloseableHttpResponse response = httpClient.execute(new HttpGet("https://localhost:" + mockServerPort + "/mitmdisabled")); assertEquals("Expected server to return a 200", 200, response.getStatusLine().getStatusCode()); @@ -577,7 +576,7 @@ public void filterResponse(HttpResponse response, HttpMessageContents contents, } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { CloseableHttpResponse response = httpClient.execute(new HttpGet("https://localhost:" + mockServerPort + "/mitmdisabled")); assertEquals("Expected server to return a 200", 200, response.getStatusLine().getStatusCode()); @@ -628,9 +627,9 @@ public int getMaximumResponseBufferSizeInBytes() { } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { CloseableHttpResponse response = httpClient.execute(new HttpGet("http://localhost:" + mockServerPort + "/modifyresponse")); - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertEquals("Expected server to return a 200", 200, response.getStatusLine().getStatusCode()); assertEquals("Did not receive expected response from mock server", newText, responseBody); @@ -671,9 +670,9 @@ public void serverToProxyResponseReceived() { // during the first request, the filterRequest(...) method should return null, which will prevent the filter instance from // being added to the filter chain - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { CloseableHttpResponse response = httpClient.execute(new HttpGet("http://localhost:" + mockServerPort + "/bypassfilter")); - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertEquals("Expected server to return a 200", 200, response.getStatusLine().getStatusCode()); assertEquals("Did not receive expected response from mock server", "success", responseBody); @@ -685,9 +684,9 @@ public void serverToProxyResponseReceived() { assertEquals("Expected filter instance to be bypassed on first request", 0, filterHitCount.get()); // during the second request, the filterRequest(...) method will return a filter instance, which should be invoked during processing - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { CloseableHttpResponse response = httpClient.execute(new HttpGet("http://localhost:" + mockServerPort + "/bypassfilter")); - String responseBody = IOUtils.toStringAndClose(response.getEntity().getContent()); + String responseBody = NewProxyServerTestUtil.toStringAndClose(response.getEntity().getContent()); assertEquals("Expected server to return a 200", 200, response.getStatusLine().getStatusCode()); assertEquals("Did not receive expected response from mock server", "success", responseBody); @@ -748,7 +747,7 @@ public void filterResponse(HttpResponse response, HttpMessageContents contents, } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { String requestUrl = "http://localhost:" + mockServerPort + "/httpmessageinfopopulated?param1=value1"; CloseableHttpResponse response = httpClient.execute(new HttpGet(requestUrl)); @@ -816,7 +815,7 @@ public void filterResponse(HttpResponse response, HttpMessageContents contents, } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { String originalRequestUrl = "http://localhost:" + mockServerPort + "/originalurl"; String modifiedRequestUrl = "http://localhost:" + mockServerPort + "/urlreflectsmodifications"; CloseableHttpResponse response = httpClient.execute(new HttpGet(originalRequestUrl)); @@ -880,7 +879,7 @@ public void filterResponse(HttpResponse response, HttpMessageContents contents, } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { String originalRequestUrl = "https://localhost:" + mockServerPort + "/originalurl"; String modifiedRequestUrl = "https://localhost:" + mockServerPort + "/urlreflectsmodifications"; CloseableHttpResponse response = httpClient.execute(new HttpGet(originalRequestUrl)); @@ -940,7 +939,7 @@ public void filterResponse(HttpResponse response, HttpMessageContents contents, } }); - try (CloseableHttpClient httpClient = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient httpClient = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { String requestUrl = "https://localhost:" + mockServerPort + "/httpmessageinfopopulated?param1=value1"; CloseableHttpResponse response = httpClient.execute(new HttpGet(requestUrl)); diff --git a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/NetworkTest.java b/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/NetworkTest.java index 3091d59ce..dd19b461b 100644 --- a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/NetworkTest.java +++ b/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/NetworkTest.java @@ -1,9 +1,9 @@ package net.lightbody.bmp.proxy; -import net.lightbody.bmp.BrowserMobProxyServer; import net.lightbody.bmp.BrowserMobProxy; +import net.lightbody.bmp.BrowserMobProxyServer; import net.lightbody.bmp.proxy.test.util.MockServerTest; -import net.lightbody.bmp.proxy.test.util.ProxyServerTest; +import net.lightbody.bmp.proxy.test.util.NewProxyServerTestUtil; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; @@ -29,7 +29,7 @@ public void testConnectTimeout() throws IOException { proxy.setConnectTimeout(1, TimeUnit.SECONDS); proxy.start(); - try (CloseableHttpClient client = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient client = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { long start = System.nanoTime(); HttpResponse response = client.execute(new HttpGet("http://1.2.3.4:53540/connecttimeout")); long stop = System.nanoTime(); @@ -54,7 +54,7 @@ public void testIdleConnectionTimeout() throws IOException { proxy.setIdleConnectionTimeout(1, TimeUnit.SECONDS); proxy.start(); - try (CloseableHttpClient client = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient client = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { long start = System.nanoTime(); HttpResponse response = client.execute(new HttpGet("http://127.0.0.1:" + mockServerPort + "/idleconnectiontimeout")); long stop = System.nanoTime(); @@ -79,7 +79,7 @@ public void testLatency() throws IOException { proxy.setLatency(2, TimeUnit.SECONDS); proxy.start(); - try (CloseableHttpClient client = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient client = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { long start = System.nanoTime(); HttpResponse response = client.execute(new HttpGet("http://127.0.0.1:" + mockServerPort + "/latency")); long stop = System.nanoTime(); diff --git a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/QuiescenceTest.java b/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/QuiescenceTest.java index 888fff14d..60842b0be 100644 --- a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/QuiescenceTest.java +++ b/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/QuiescenceTest.java @@ -1,7 +1,7 @@ package net.lightbody.bmp.proxy; import net.lightbody.bmp.proxy.test.util.NewProxyServerTest; -import net.lightbody.bmp.proxy.test.util.ProxyServerTest; +import net.lightbody.bmp.proxy.test.util.NewProxyServerTestUtil; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; @@ -42,7 +42,7 @@ public void testWaitForQuiescenceSuccessful() throws IOException, InterruptedExc new Thread(new Runnable() { @Override public void run() { - try (CloseableHttpClient client = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient client = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { HttpResponse response = client.execute(new HttpGet("http://127.0.0.1:" + mockServerPort + "/quiescencesuccessful")); EntityUtils.consumeQuietly(response.getEntity()); @@ -85,7 +85,7 @@ public void testWaitForQuiescenceUnsuccessful() throws IOException, InterruptedE new Thread(new Runnable() { @Override public void run() { - try (CloseableHttpClient client = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient client = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { client.execute(new HttpGet("http://127.0.0.1:" + mockServerPort + "/quiescenceunsuccessful")); requestCompleted.set(true); @@ -113,7 +113,7 @@ public void testWaitForQuiescenceAfterRequestCompleted() throws IOException { Times.exactly(1) ).respond(response().withStatusCode(200)); - try (CloseableHttpClient client = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient client = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { HttpResponse response = client.execute(new HttpGet("http://127.0.0.1:" + mockServerPort + "/quiescencecompleted")); EntityUtils.consumeQuietly(response.getEntity()); @@ -139,7 +139,7 @@ public void testWaitForQuiescenceQuietPeriodAlreadySatisfied() throws IOExceptio Times.exactly(1) ).respond(response().withStatusCode(200)); - try (CloseableHttpClient client = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient client = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { HttpResponse response = client.execute(new HttpGet("http://127.0.0.1:" + mockServerPort + "/quiescencesatisfied")); EntityUtils.consumeQuietly(response.getEntity()); @@ -167,7 +167,7 @@ public void testWaitForQuiescenceTimeoutLessThanQuietPeriodSuccessful() throws I Times.exactly(1) ).respond(response().withStatusCode(200)); - try (CloseableHttpClient client = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient client = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { HttpResponse response = client.execute(new HttpGet("http://127.0.0.1:" + mockServerPort + "/quiescencesmalltimeoutsuccess")); EntityUtils.consumeQuietly(response.getEntity()); @@ -196,7 +196,7 @@ public void testWaitForQuiescenceTimeoutLessThanQuietPeriodUnuccessful() throws Times.exactly(1) ).respond(response().withStatusCode(200)); - try (CloseableHttpClient client = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient client = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { HttpResponse response = client.execute(new HttpGet("http://127.0.0.1:" + mockServerPort + "/quiescencesmalltimeoutunsuccessful")); EntityUtils.consumeQuietly(response.getEntity()); @@ -238,7 +238,7 @@ public void testWaitForQuiescenceInterruptedBySecondRequestSuccessful() throws I new Thread(new Runnable() { @Override public void run() { - try (CloseableHttpClient client = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient client = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { HttpResponse response = client.execute(new HttpGet("http://127.0.0.1:" + mockServerPort + "/successquiesence2s")); EntityUtils.consumeQuietly(response.getEntity()); firstRequestStatusCode.set(response.getStatusLine().getStatusCode()); @@ -302,7 +302,7 @@ public void testWaitForQuiescenceInterruptedBySecondRequestUnsuccessful() throws new Thread(new Runnable() { @Override public void run() { - try (CloseableHttpClient client = ProxyServerTest.getNewHttpClient(proxy.getPort())) { + try (CloseableHttpClient client = NewProxyServerTestUtil.getNewHttpClient(proxy.getPort())) { HttpResponse response = client.execute(new HttpGet("http://127.0.0.1:" + mockServerPort + "/quiesence2s")); EntityUtils.consumeQuietly(response.getEntity()); diff --git a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTest.java b/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTest.java index 9cd1b204c..0da4f05a6 100644 --- a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTest.java +++ b/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTest.java @@ -1,10 +1,24 @@ package net.lightbody.bmp.proxy.test.util; -import net.lightbody.bmp.BrowserMobProxyServer; import net.lightbody.bmp.BrowserMobProxy; +import net.lightbody.bmp.BrowserMobProxyServer; +import org.apache.http.HttpHost; +import org.apache.http.client.CookieStore; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.ssl.SSLContexts; +import org.apache.http.conn.ssl.TrustStrategy; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; import org.junit.After; import org.junit.Before; +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + /** * A base class that spins up and shuts down a BrowserMobProxy instance using the new interface. IT also provides mock server support via * {@link net.lightbody.bmp.proxy.test.util.MockServerTest}. @@ -24,4 +38,5 @@ public void shutDownProxyServer() { proxy.abort(); } } + } diff --git a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTestUtil.java b/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTestUtil.java new file mode 100644 index 000000000..af86c4b96 --- /dev/null +++ b/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTestUtil.java @@ -0,0 +1,94 @@ +package net.lightbody.bmp.proxy.test.util; + +import org.apache.http.HttpHost; +import org.apache.http.client.CookieStore; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.ssl.SSLContexts; +import org.apache.http.conn.ssl.TrustStrategy; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; + +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +public class NewProxyServerTestUtil { + /** + * Creates an all-trusting CloseableHttpClient (for tests ONLY!) that will connect to a proxy at 127.0.0.1:proxyPort, + * with no cookie store. + * + * @param proxyPort port of the proxy running at 127.0.0.1 + * @return a new CloseableHttpClient + */ + public static CloseableHttpClient getNewHttpClient(int proxyPort) { + return getNewHttpClient(proxyPort, null); + } + + /** + * Creates an all-trusting CloseableHttpClient (for tests ONLY!) that will connect to a proxy at 127.0.0.1:proxyPort, + * using the specified cookie store. + * + * @param proxyPort port of the proxy running at 127.0.0.1 + * @param cookieStore CookieStore for HTTP cookies + * @return a new CloseableHttpClient + */ + public static CloseableHttpClient getNewHttpClient(int proxyPort, CookieStore cookieStore) { + try { + // Trust all certs -- under no circumstances should this ever be used outside of testing + SSLContext sslcontext = SSLContexts.custom() + .useTLS() + .loadTrustMaterial(null, new TrustStrategy() { + @Override + public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException { + return true; + } + }) + .build(); + + SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory( + sslcontext, + SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); + + CloseableHttpClient httpclient = HttpClients.custom() + .setSSLSocketFactory(sslsf) + .setDefaultCookieStore(cookieStore) + .setProxy(new HttpHost("127.0.0.1", proxyPort)) + // disable decompressing content, since some tests want uncompressed content for testing purposes + .disableContentCompression() + .disableAutomaticRetries() + .build(); + + return httpclient; + } catch (Exception e) { + throw new RuntimeException("Unable to create new HTTP client", e); + } + } + + /** + * Reads and closes the input stream, converting it to a String using the UTF-8 charset. The input stream is guaranteed to be closed, even + * if the reading/conversion throws an exception. + * + * @param in UTF-8-encoded InputStream to read + * @return String of InputStream's contents + * @throws IOException if an error occurs reading from the stream + */ + public static String toStringAndClose(InputStream in) throws IOException { + try { + return org.apache.commons.io.IOUtils.toString(in, StandardCharsets.UTF_8); + } finally { + org.apache.commons.io.IOUtils.closeQuietly(in); + } + } + + /** + * Checks if the test is running on a Windows OS. + * + * @return true if running on Windows, otherwise false + */ + public static boolean isWindows() { + return System.getProperty("os.name").startsWith("Windows"); + } +} diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/TestConstants.java b/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/TestConstants.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/TestConstants.java rename to browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/TestConstants.java diff --git a/browsermob-core/pom.xml b/browsermob-core/pom.xml index 5dd09d621..a0cbc8a75 100644 --- a/browsermob-core/pom.xml +++ b/browsermob-core/pom.xml @@ -10,67 +10,40 @@ 4.0.0 browsermob-core - BrowserMob Proxy Core Module + BrowserMob Proxy Legacy (Jetty) Module 7.6.16.v20140903 + true - - - src/main/resources - true - - net/lightbody/bmp/version - - - - src/main/resources - false - - **/** - - - net/lightbody/bmp/version - - - org.apache.maven.plugins - maven-jar-plugin - - - test-jar - - test-jar - - - + maven-surefire-plugin + + -Xmx1g -XX:MaxPermSize=256m + + + ${use.littleproxy} + + - com.fasterxml.jackson.core - jackson-core - - - - com.fasterxml.jackson.core - jackson-databind - - - - com.fasterxml.jackson.core - jackson-annotations + net.lightbody.bmp + browsermob-core-littleproxy + ${project.version} - org.slf4j - slf4j-api + net.lightbody.bmp + mitm + ${project.version} @@ -89,11 +62,6 @@ test - - org.slf4j - jcl-over-slf4j - - org.apache.httpcomponents httpclient @@ -116,8 +84,9 @@ - com.google.guava - guava + javax.servlet + servlet-api + 2.5 @@ -132,53 +101,6 @@ test - - net.sf.uadetector - uadetector-resources - 2014.10 - - - - javax.servlet - servlet-api - 2.5 - - - - dnsjava - dnsjava - 2.1.7 - - - - - net.lightbody.bmp - littleproxy - provided - - - log4j - log4j - - - slf4j-log4j12 - org.slf4j - - - com.barchart.udt - barchart-udt-bundle - - - - - - net.lightbody.bmp - mitm - ${project.version} - - junit junit @@ -240,4 +162,14 @@ + + + + legacy + + false + + + + \ No newline at end of file diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java b/browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java similarity index 99% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java index 63486f6ff..11a84ce5f 100644 --- a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java +++ b/browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java @@ -169,7 +169,7 @@ public void setRetryCount(int count) { * in the returned StreamManager should be used; they will have no effect. * * @return fake StreamManager object that wraps LitteProxy-compatible bandwidth control methods - * @deprecated use bandwidth control methods from the {@link net.lightbody.bmp.BrowserMobProxy} + * @deprecated use bandwidth control methods from the {@link BrowserMobProxy} */ @Deprecated public StreamManager getStreamManager() { diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/filters/package-info.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/package-info.java deleted file mode 100644 index 0944da490..000000000 --- a/browsermob-core/src/main/java/net/lightbody/bmp/filters/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package was added to browsermob-core instead of browsermob-core-littleproxy to enable the RequestFilter and ResponseFilter objects - * to be included in the BrowserMobProxy interface definition. - */ -package net.lightbody.bmp.filters; \ No newline at end of file diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/LegacyProxyServer.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/LegacyProxyServer.java index 1f9bd3604..103f2f25a 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/LegacyProxyServer.java +++ b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/LegacyProxyServer.java @@ -1,5 +1,6 @@ package net.lightbody.bmp.proxy; +import net.lightbody.bmp.BrowserMobProxy; import net.lightbody.bmp.core.har.Har; import net.lightbody.bmp.exception.NameResolutionException; import net.lightbody.bmp.proxy.http.RequestInterceptor; @@ -18,7 +19,7 @@ /** * Describes the legacy BrowserMob Proxy 2.0 interface. Clients should not implement or use this interface. * - * Use {@link net.lightbody.bmp.BrowserMobProxy}. + * Use {@link BrowserMobProxy}. */ public interface LegacyProxyServer { void start(); diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/ProxyServer.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/ProxyServer.java index ef827b184..d30e73f30 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/ProxyServer.java +++ b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/ProxyServer.java @@ -25,7 +25,7 @@ import net.lightbody.bmp.proxy.jetty.http.SocketListener; import net.lightbody.bmp.proxy.jetty.jetty.Server; import net.lightbody.bmp.proxy.jetty.util.InetAddrPort; -import net.lightbody.bmp.proxy.util.BrowserMobProxyUtil; +import net.lightbody.bmp.util.BrowserMobProxyUtil; import org.apache.http.HttpRequestInterceptor; import org.apache.http.HttpResponseInterceptor; import org.java_bandwidthlimiter.BandwidthLimiter; @@ -56,17 +56,17 @@ /** * The legacy, Jetty 5-based implementation of BrowserMobProxy. This class implements the {@link net.lightbody.bmp.proxy.LegacyProxyServer} - * interface that defines the BMP 2.0 contact, as well as the 2.1+ {@link net.lightbody.bmp.BrowserMobProxy} interface. Important: if - * you are implementing new code, use the {@link net.lightbody.bmp.BrowserMobProxy} interface. The + * interface that defines the BMP 2.0 contact, as well as the 2.1+ {@link BrowserMobProxy} interface. Important: if + * you are implementing new code, use the {@link BrowserMobProxy} interface. The * {@link net.lightbody.bmp.proxy.LegacyProxyServer} interface is deprecated and will be removed in a future release. *

Unsupported operations

- * The following {@link net.lightbody.bmp.BrowserMobProxy} operations are not supported and will be ignored: + * The following {@link BrowserMobProxy} operations are not supported and will be ignored: * * - * @deprecated Use the {@link net.lightbody.bmp.BrowserMobProxy} interface to preserve compatibility with future BrowserMob Proxy versions. + * @deprecated Use the {@link BrowserMobProxy} interface to preserve compatibility with future BrowserMob Proxy versions. */ @Deprecated public class ProxyServer implements LegacyProxyServer, BrowserMobProxy { diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java index 16173ccc2..5ca6e8bcf 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java +++ b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java @@ -18,7 +18,7 @@ import net.lightbody.bmp.proxy.dns.AdvancedHostResolver; import net.lightbody.bmp.proxy.jetty.util.MultiMap; import net.lightbody.bmp.proxy.jetty.util.UrlEncoded; -import net.lightbody.bmp.proxy.util.BrowserMobProxyUtil; +import net.lightbody.bmp.util.BrowserMobProxyUtil; import net.lightbody.bmp.proxy.util.CappedByteArrayOutputStream; import net.lightbody.bmp.proxy.util.ClonedOutputStream; import net.lightbody.bmp.proxy.util.IOUtils; diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTest.java b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTest.java index 7f021abfa..b446e0d70 100644 --- a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTest.java +++ b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTest.java @@ -4,26 +4,21 @@ import net.lightbody.bmp.proxy.LegacyProxyServer; import net.lightbody.bmp.proxy.ProxyServer; import net.lightbody.bmp.proxy.util.IOUtils; -import org.apache.http.HttpHost; import org.apache.http.client.CookieStore; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLContexts; -import org.apache.http.conn.ssl.TrustStrategy; import org.apache.http.impl.client.BasicCookieStore; import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; import org.junit.After; import org.junit.Before; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; +import java.nio.charset.StandardCharsets; /** * Extend this class to gain access to a local proxy server. If you need both a local proxy server and a local Jetty server, extend @@ -67,7 +62,7 @@ public void startProxyServer() throws Exception { proxyServerPort = proxy.getPort(); cookieStore = new BasicCookieStore(); - client = getNewHttpClient(proxyServerPort, cookieStore); + client = ProxyServerTestUtil.getNewHttpClient(proxyServerPort, cookieStore); } /** @@ -144,64 +139,4 @@ public CloseableHttpResponse getResponseFromHost(String url) { throw new RuntimeException(e); } } - - /** - * Creates an all-trusting CloseableHttpClient (for tests ONLY!) that will connect to a proxy at 127.0.0.1:proxyPort, - * with no cookie store. - * - * @param proxyPort port of the proxy running at 127.0.0.1 - * @return a new CloseableHttpClient - */ - public static CloseableHttpClient getNewHttpClient(int proxyPort) { - return getNewHttpClient(proxyPort, null); - } - - /** - * Creates an all-trusting CloseableHttpClient (for tests ONLY!) that will connect to a proxy at 127.0.0.1:proxyPort, - * using the specified cookie store. - * - * @param proxyPort port of the proxy running at 127.0.0.1 - * @param cookieStore CookieStore for HTTP cookies - * @return a new CloseableHttpClient - */ - public static CloseableHttpClient getNewHttpClient(int proxyPort, CookieStore cookieStore) { - try { - // Trust all certs -- under no circumstances should this ever be used outside of testing - SSLContext sslcontext = SSLContexts.custom() - .useTLS() - .loadTrustMaterial(null, new TrustStrategy() { - @Override - public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException { - return true; - } - }) - .build(); - - SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory( - sslcontext, - SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); - - CloseableHttpClient httpclient = HttpClients.custom() - .setSSLSocketFactory(sslsf) - .setDefaultCookieStore(cookieStore) - .setProxy(new HttpHost("127.0.0.1", proxyPort)) - // disable decompressing content, since some tests want uncompressed content for testing purposes - .disableContentCompression() - .disableAutomaticRetries() - .build(); - - return httpclient; - } catch (Exception e) { - throw new RuntimeException("Unable to create new HTTP client", e); - } - } - - /** - * Checks if the test is running on a Windows OS. - * - * @return true if running on Windows, otherwise false - */ - public static boolean isWindows() { - return System.getProperty("os.name").startsWith("Windows"); - } } diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTestUtil.java b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTestUtil.java new file mode 100644 index 000000000..4e2591bf2 --- /dev/null +++ b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTestUtil.java @@ -0,0 +1,66 @@ +package net.lightbody.bmp.proxy.test.util; + +import org.apache.http.HttpHost; +import org.apache.http.client.CookieStore; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.ssl.SSLContexts; +import org.apache.http.conn.ssl.TrustStrategy; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; + +import javax.net.ssl.SSLContext; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +public class ProxyServerTestUtil { + /** + * Creates an all-trusting CloseableHttpClient (for tests ONLY!) that will connect to a proxy at 127.0.0.1:proxyPort, + * with no cookie store. + * + * @param proxyPort port of the proxy running at 127.0.0.1 + * @return a new CloseableHttpClient + */ + public static CloseableHttpClient getNewHttpClient(int proxyPort) { + return getNewHttpClient(proxyPort, null); + } + + /** + * Creates an all-trusting CloseableHttpClient (for tests ONLY!) that will connect to a proxy at 127.0.0.1:proxyPort, + * using the specified cookie store. + * + * @param proxyPort port of the proxy running at 127.0.0.1 + * @param cookieStore CookieStore for HTTP cookies + * @return a new CloseableHttpClient + */ + public static CloseableHttpClient getNewHttpClient(int proxyPort, CookieStore cookieStore) { + try { + // Trust all certs -- under no circumstances should this ever be used outside of testing + SSLContext sslcontext = SSLContexts.custom() + .useTLS() + .loadTrustMaterial(null, new TrustStrategy() { + @Override + public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException { + return true; + } + }) + .build(); + + SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory( + sslcontext, + SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); + + CloseableHttpClient httpclient = HttpClients.custom() + .setSSLSocketFactory(sslsf) + .setDefaultCookieStore(cookieStore) + .setProxy(new HttpHost("127.0.0.1", proxyPort)) + // disable decompressing content, since some tests want uncompressed content for testing purposes + .disableContentCompression() + .disableAutomaticRetries() + .build(); + + return httpclient; + } catch (Exception e) { + throw new RuntimeException("Unable to create new HTTP client", e); + } + } +} diff --git a/browsermob-dist/src/main/java/net/lightbody/bmp/proxy/Main.java b/browsermob-dist/src/main/java/net/lightbody/bmp/proxy/Main.java index e0e77ca7c..743cd3b4b 100644 --- a/browsermob-dist/src/main/java/net/lightbody/bmp/proxy/Main.java +++ b/browsermob-dist/src/main/java/net/lightbody/bmp/proxy/Main.java @@ -8,7 +8,7 @@ import net.lightbody.bmp.proxy.bricks.ProxyResource; import net.lightbody.bmp.proxy.guice.ConfigModule; import net.lightbody.bmp.proxy.guice.JettyModule; -import net.lightbody.bmp.proxy.util.BrowserMobProxyUtil; +import net.lightbody.bmp.util.BrowserMobProxyUtil; import net.lightbody.bmp.util.DeleteDirectoryTask; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; diff --git a/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/guice/LegacyProxyServerProvider.java b/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/guice/LegacyProxyServerProvider.java index 730a37e6d..f7e592a0c 100644 --- a/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/guice/LegacyProxyServerProvider.java +++ b/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/guice/LegacyProxyServerProvider.java @@ -1,7 +1,6 @@ package net.lightbody.bmp.proxy.guice; import com.google.inject.Provider; -import net.lightbody.bmp.BrowserMobProxyServer; import net.lightbody.bmp.BrowserMobProxyServerLegacyAdapter; import net.lightbody.bmp.proxy.LegacyProxyServer; import net.lightbody.bmp.proxy.ProxyServer; diff --git a/mitm/pom.xml b/mitm/pom.xml index 25681f50b..7150e52ae 100644 --- a/mitm/pom.xml +++ b/mitm/pom.xml @@ -24,6 +24,12 @@ net.lightbody.bmp littleproxy + + + com.barchart.udt + barchart-udt-bundle + + true From c7439d5b1aca89c7440067148487b0f69af20a40 Mon Sep 17 00:00:00 2001 From: Jason Eric Klaes Hoetger Date: Sat, 14 May 2016 20:14:00 -0700 Subject: [PATCH 02/10] Fixed 'patern' typo in BlacklistFilter --- .../lightbody/bmp/filters/BlacklistFilter.java | 2 +- .../lightbody/bmp/proxy/BlacklistEntry.java | 18 +++++++++--------- .../net/lightbody/bmp/proxy/ProxyServer.java | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/BlacklistFilter.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/BlacklistFilter.java index a08a79c11..b267673e1 100644 --- a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/BlacklistFilter.java +++ b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/BlacklistFilter.java @@ -38,7 +38,7 @@ public HttpResponse clientToProxyRequest(HttpObject httpObject) { String url = getFullUrl(httpRequest); for (BlacklistEntry entry : blacklistedUrls) { - if (HttpMethod.CONNECT.equals(httpRequest.getMethod()) && entry.getHttpMethodPatern() == null) { + if (HttpMethod.CONNECT.equals(httpRequest.getMethod()) && entry.getHttpMethodPattern() == null) { // do not allow CONNECTs to be blacklisted unless a method pattern is explicitly specified continue; } diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java index c98589931..db23f8481 100644 --- a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java +++ b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java @@ -9,7 +9,7 @@ public class BlacklistEntry { private final Pattern urlPattern; private final int statusCode; - private final Pattern httpMethodPatern; + private final Pattern httpMethodPattern; /** * Creates a new BlacklistEntry with no HTTP method matching (i.e. all methods will match). @@ -32,9 +32,9 @@ public BlacklistEntry(String urlPattern, int statusCode, String httpMethodPatter this.urlPattern = Pattern.compile(urlPattern); this.statusCode = statusCode; if (httpMethodPattern == null || httpMethodPattern.isEmpty()) { - this.httpMethodPatern = null; + this.httpMethodPattern = null; } else { - this.httpMethodPatern = Pattern.compile(httpMethodPattern); + this.httpMethodPattern = Pattern.compile(httpMethodPattern); } } @@ -47,8 +47,8 @@ public BlacklistEntry(String urlPattern, int statusCode, String httpMethodPatter * @return true if the URL matches this BlacklistEntry */ public boolean matches(String url, String httpMethod) { - if (httpMethodPatern != null) { - return urlPattern.matcher(url).matches() && httpMethodPatern.matcher(httpMethod).matches(); + if (httpMethodPattern != null) { + return urlPattern.matcher(url).matches() && httpMethodPattern.matcher(httpMethod).matches(); } else { return urlPattern.matcher(url).matches(); } @@ -62,8 +62,8 @@ public int getStatusCode() { return statusCode; } - public Pattern getHttpMethodPatern() { - return httpMethodPatern; + public Pattern getHttpMethodPattern() { + return httpMethodPattern; } @Deprecated @@ -84,9 +84,9 @@ public int getResponseCode() { @Deprecated /** - * @deprecated use {@link #getHttpMethodPatern()} + * @deprecated use {@link #getHttpMethodPattern()} */ public Pattern getMethod() { - return getHttpMethodPatern(); + return getHttpMethodPattern(); } } \ No newline at end of file diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/ProxyServer.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/ProxyServer.java index d30e73f30..ccd54bb4a 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/ProxyServer.java +++ b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/ProxyServer.java @@ -659,10 +659,10 @@ public void blacklistRequests(String pattern, int responseCode, String method) { @Override public void setBlacklist(Collection blacklist) { for (BlacklistEntry entry : blacklist) { - if (entry.getHttpMethodPatern() == null) { + if (entry.getHttpMethodPattern() == null) { blacklistRequests(entry.getUrlPattern().pattern(), entry.getStatusCode()); } else { - blacklistRequests(entry.getUrlPattern().pattern(), entry.getStatusCode(), entry.getHttpMethodPatern().pattern()); + blacklistRequests(entry.getUrlPattern().pattern(), entry.getStatusCode(), entry.getHttpMethodPattern().pattern()); } } } From 183f62c08a34b6355d9cbe01abb1a87907d0bcef Mon Sep 17 00:00:00 2001 From: Jason Eric Klaes Hoetger Date: Sat, 14 May 2016 20:11:07 -0700 Subject: [PATCH 03/10] Replaced tabs with spaces --- README.md | 2 +- .../lightbody/bmp/proxy/BlacklistEntry.java | 106 ++++++++--------- .../net/lightbody/bmp/proxy/Whitelist.java | 43 ++++--- .../ProxyPortsExhaustedException.java | 22 ++-- .../net/lightbody/bmp/proxy/ProxyManager.java | 42 +++---- .../bmp/proxy/bricks/ProxyResource.java | 112 ++++++++++-------- 6 files changed, 170 insertions(+), 157 deletions(-) diff --git a/README.md b/README.md index 5e15aa141..e570ef64f 100644 --- a/README.md +++ b/README.md @@ -276,7 +276,7 @@ There are four new methods to support request and response interception in Littl For most use cases, including inspecting and modifying requests/responses, `addRequestFilter` and `addResponseFilter` will be sufficient. The request and response filters are easy to use: ```java - proxy.addRequestFilter(new RequestFilter() { + proxy.addRequestFilter(new RequestFilter() { @Override public HttpResponse filterRequest(HttpRequest request, HttpMessageContents contents, HttpMessageInfo messageInfo) { if (messageInfo.getOriginalUri().endsWith("/some-endpoint-to-intercept")) { diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java index db23f8481..671fff9c7 100644 --- a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java +++ b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java @@ -8,51 +8,51 @@ */ public class BlacklistEntry { private final Pattern urlPattern; - private final int statusCode; - private final Pattern httpMethodPattern; + private final int statusCode; + private final Pattern httpMethodPattern; - /** - * Creates a new BlacklistEntry with no HTTP method matching (i.e. all methods will match). - * - * @param urlPattern URL pattern to blacklist - * @param statusCode HTTP status code to return for blacklisted URL - */ - public BlacklistEntry(String urlPattern, int statusCode) { - this(urlPattern, statusCode, null); - } - - /** - * Creates a new BlacklistEntry which will match both a URL and an HTTP method - * - * @param urlPattern URL pattern to blacklist - * @param statusCode status code to return for blacklisted URL - * @param httpMethodPattern HTTP method to match (e.g. GET, PUT, PATCH, etc.) - */ - public BlacklistEntry(String urlPattern, int statusCode, String httpMethodPattern) { - this.urlPattern = Pattern.compile(urlPattern); - this.statusCode = statusCode; - if (httpMethodPattern == null || httpMethodPattern.isEmpty()) { - this.httpMethodPattern = null; - } else { - this.httpMethodPattern = Pattern.compile(httpMethodPattern); - } - } - - /** - * Determines if this BlacklistEntry matches the given URL. Attempts to match both the URL and the - * HTTP method. - * - * @param url possibly-blacklisted URL - * @param httpMethod HTTP method this URL is being accessed with - * @return true if the URL matches this BlacklistEntry - */ - public boolean matches(String url, String httpMethod) { - if (httpMethodPattern != null) { - return urlPattern.matcher(url).matches() && httpMethodPattern.matcher(httpMethod).matches(); - } else { - return urlPattern.matcher(url).matches(); - } - } + /** + * Creates a new BlacklistEntry with no HTTP method matching (i.e. all methods will match). + * + * @param urlPattern URL pattern to blacklist + * @param statusCode HTTP status code to return for blacklisted URL + */ + public BlacklistEntry(String urlPattern, int statusCode) { + this(urlPattern, statusCode, null); + } + + /** + * Creates a new BlacklistEntry which will match both a URL and an HTTP method + * + * @param urlPattern URL pattern to blacklist + * @param statusCode status code to return for blacklisted URL + * @param httpMethodPattern HTTP method to match (e.g. GET, PUT, PATCH, etc.) + */ + public BlacklistEntry(String urlPattern, int statusCode, String httpMethodPattern) { + this.urlPattern = Pattern.compile(urlPattern); + this.statusCode = statusCode; + if (httpMethodPattern == null || httpMethodPattern.isEmpty()) { + this.httpMethodPattern = null; + } else { + this.httpMethodPattern = Pattern.compile(httpMethodPattern); + } + } + + /** + * Determines if this BlacklistEntry matches the given URL. Attempts to match both the URL and the + * HTTP method. + * + * @param url possibly-blacklisted URL + * @param httpMethod HTTP method this URL is being accessed with + * @return true if the URL matches this BlacklistEntry + */ + public boolean matches(String url, String httpMethod) { + if (httpMethodPattern != null) { + return urlPattern.matcher(url).matches() && httpMethodPattern.matcher(httpMethod).matches(); + } else { + return urlPattern.matcher(url).matches(); + } + } public Pattern getUrlPattern() { return urlPattern; @@ -70,23 +70,23 @@ public Pattern getHttpMethodPattern() { /** * @deprecated use {@link #getUrlPattern()} */ - public Pattern getPattern() { - return getUrlPattern(); - } + public Pattern getPattern() { + return getUrlPattern(); + } @Deprecated /** * @deprecated use {@link #getStatusCode()} */ - public int getResponseCode() { - return getStatusCode(); - } + public int getResponseCode() { + return getStatusCode(); + } @Deprecated /** * @deprecated use {@link #getHttpMethodPattern()} */ - public Pattern getMethod() { - return getHttpMethodPattern(); - } + public Pattern getMethod() { + return getHttpMethodPattern(); + } } \ No newline at end of file diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/Whitelist.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/Whitelist.java index 298463d1c..ea015ee27 100644 --- a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/Whitelist.java +++ b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/Whitelist.java @@ -2,7 +2,6 @@ import com.google.common.collect.ImmutableList; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -29,27 +28,27 @@ public class Whitelist { * Creates an empty, disabled Whitelist. */ public Whitelist() { - this.patterns = Collections.emptyList(); - this.statusCode = -1; - this.enabled = false; + this.patterns = Collections.emptyList(); + this.statusCode = -1; + this.enabled = false; } - - /** - * Creates an empty, enabled whitelist with the specified response code. - * - * @param statusCode the response code that the (enabled) Whitelist will return for all URLs. - */ - public Whitelist(int statusCode) { - this.patterns = Collections.emptyList(); - this.statusCode = statusCode; - this.enabled = true; - } - - /** - * @deprecated use {@link #Whitelist(java.util.Collection, int)} - */ + + /** + * Creates an empty, enabled whitelist with the specified response code. + * + * @param statusCode the response code that the (enabled) Whitelist will return for all URLs. + */ + public Whitelist(int statusCode) { + this.patterns = Collections.emptyList(); + this.statusCode = statusCode; + this.enabled = true; + } + + /** + * @deprecated use {@link #Whitelist(java.util.Collection, int)} + */ @Deprecated - public Whitelist(String[] patterns, int statusCode) { + public Whitelist(String[] patterns, int statusCode) { this(patterns == null ? null : Arrays.asList(patterns), statusCode); } @@ -81,8 +80,8 @@ public Whitelist(Collection patterns, int statusCode) { * @return true if this whitelist is enabled, otherwise false */ public boolean isEnabled() { - return enabled; - } + return enabled; + } /** * @return regular expression patterns describing the URLs that should be whitelisted, or an empty collection if the whitelist is disabled diff --git a/browsermob-rest/src/main/java/net/lightbody/bmp/exception/ProxyPortsExhaustedException.java b/browsermob-rest/src/main/java/net/lightbody/bmp/exception/ProxyPortsExhaustedException.java index e17e7d841..9889ad7d0 100644 --- a/browsermob-rest/src/main/java/net/lightbody/bmp/exception/ProxyPortsExhaustedException.java +++ b/browsermob-rest/src/main/java/net/lightbody/bmp/exception/ProxyPortsExhaustedException.java @@ -4,18 +4,18 @@ public class ProxyPortsExhaustedException extends RuntimeException { private static final long serialVersionUID = -6801448612785792233L; public ProxyPortsExhaustedException() { - super(); - } + super(); + } - public ProxyPortsExhaustedException(String message, Throwable cause) { - super(message, cause); - } + public ProxyPortsExhaustedException(String message, Throwable cause) { + super(message, cause); + } - public ProxyPortsExhaustedException(String message) { - super(message); - } + public ProxyPortsExhaustedException(String message) { + super(message); + } - public ProxyPortsExhaustedException(Throwable cause) { - super(cause); - } + public ProxyPortsExhaustedException(Throwable cause) { + super(cause); + } } diff --git a/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/ProxyManager.java b/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/ProxyManager.java index 5ced17266..36a2b400f 100644 --- a/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/ProxyManager.java +++ b/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/ProxyManager.java @@ -33,7 +33,7 @@ public class ProxyManager { private static final Logger LOG = LoggerFactory.getLogger(ProxyManager.class); private int lastPort; - private final int minPort; + private final int minPort; private final int maxPort; private final Provider proxyServerProvider; // retain a reference to the Cache to allow the ProxyCleanupTask to .cleanUp(), since asMap() is just a view into the cache. @@ -100,7 +100,7 @@ public ProxyManager(Provider proxyServerProvider, @Named("min this.lastPort = maxPort; if (ttl > 0) { // proxies should be evicted after the specified ttl, so set up an evicting cache and a listener to stop the proxies when they're evicted - RemovalListener removalListener = new RemovalListener () { + RemovalListener removalListener = new RemovalListener() { public void onRemoval(RemovalNotification removal) { try { LegacyProxyServer proxy = removal.getValue(); @@ -139,7 +139,7 @@ public LegacyProxyServer create(Map options, Integer port, Strin if (proxy instanceof BrowserMobProxyServer) { LOG.info("Using Elliptic Curve Cryptography for certificate impersonation"); - ((BrowserMobProxyServer)proxy).setUseEcc(true); + ((BrowserMobProxyServer) proxy).setUseEcc(true); } else { LOG.warn("Cannot use Eliiptic Curve Cryptography with legacy ProxyServer implementation. Using default RSA certificates."); } @@ -147,7 +147,7 @@ public LegacyProxyServer create(Map options, Integer port, Strin if (trustAllServers) { if (proxy instanceof BrowserMobProxyServer) { - ((BrowserMobProxyServer)proxy).setTrustAllServers(true); + ((BrowserMobProxyServer) proxy).setTrustAllServers(true); } } @@ -156,7 +156,7 @@ public LegacyProxyServer create(Map options, Integer port, Strin String proxyUsername = options.remove("proxyUsername"); String proxyPassword = options.remove("proxyPassword"); if (proxyUsername != null && proxyPassword != null) { - ((BrowserMobProxy)proxy).chainedProxyAuthorization(proxyUsername, proxyPassword, AuthType.BASIC); + ((BrowserMobProxy) proxy).chainedProxyAuthorization(proxyUsername, proxyPassword, AuthType.BASIC); } LOG.debug("Apply options `{}` to new ProxyServer...", options); @@ -167,11 +167,11 @@ public LegacyProxyServer create(Map options, Integer port, Strin LOG.debug("Bind ProxyServer to `{}`...", bindAddr); InetAddress inetAddress; try { - inetAddress = InetAddress.getByName(bindAddr); + inetAddress = InetAddress.getByName(bindAddr); } catch (UnknownHostException e) { - LOG.error("Unable to bind proxy to address: " + bindAddr + "; proxy will not be created.", e); + LOG.error("Unable to bind proxy to address: " + bindAddr + "; proxy will not be created.", e); - throw new RuntimeException("Unable to bind proxy to address: ", e); + throw new RuntimeException("Unable to bind proxy to address: ", e); } proxy.setLocalHost(inetAddress); @@ -181,12 +181,12 @@ public LegacyProxyServer create(Map options, Integer port, Strin return startProxy(proxy, port); } - while(proxies.size() <= maxPort-minPort){ + while (proxies.size() <= maxPort - minPort) { LOG.debug("Use next available port for new ProxyServer..."); port = nextPort(); - try{ + try { return startProxy(proxy, port); - }catch(ProxyExistsException ex){ + } catch (ProxyExistsException ex) { LOG.debug("Proxy already exists at port {}", port); } } @@ -212,7 +212,7 @@ public LegacyProxyServer create(int port) { public LegacyProxyServer get(int port) { return proxies.get(port); } - + private LegacyProxyServer startProxy(LegacyProxyServer proxy, int port) { if (port != 0) { proxy.setPort(port); @@ -223,7 +223,7 @@ private LegacyProxyServer startProxy(LegacyProxyServer proxy, int port) { } } - try{ + try { proxy.start(); if (port == 0) { int realPort = proxy.getPort(); @@ -231,21 +231,21 @@ private LegacyProxyServer startProxy(LegacyProxyServer proxy, int port) { } return proxy; - }catch(Exception ex){ + } catch (Exception ex) { if (port != 0) { proxies.remove(port); } - try{ + try { proxy.stop(); - }catch(Exception ex2){ + } catch (Exception ex2) { ex.addSuppressed(ex2); - } + } throw ex; } } - - private synchronized int nextPort(){ - return lastPort < maxPort? ++lastPort : (lastPort = minPort); + + private synchronized int nextPort() { + return lastPort < maxPort ? ++lastPort : (lastPort = minPort); } public Collection get() { @@ -263,5 +263,5 @@ public void delete(int port) { proxy.stop(); } } - + } diff --git a/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/bricks/ProxyResource.java b/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/bricks/ProxyResource.java index adabafebf..56e1d5402 100644 --- a/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/bricks/ProxyResource.java +++ b/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/bricks/ProxyResource.java @@ -62,13 +62,13 @@ public ProxyResource(ProxyManager proxyManager) { @Get public Reply getProxies() { - Collection proxyList = new ArrayList (); + Collection proxyList = new ArrayList(); for (LegacyProxyServer proxy : proxyManager.get()) { proxyList.add(new ProxyDescriptor(proxy.getPort())); } return Reply.with(new ProxyListDescriptor(proxyList)).as(Json.class); } - + @Post public Reply newProxy(Request request) { String systemProxyHost = System.getProperty("http.proxyHost"); @@ -101,17 +101,17 @@ public Reply newProxy(Request request) { String trustAllServersString = request.param("trustAllServers"); boolean trustAllServers = Boolean.parseBoolean(trustAllServersString); - LOG.debug("POST proxy instance on bindAddress `{}` & port `{}`", + LOG.debug("POST proxy instance on bindAddress `{}` & port `{}`", paramBindAddr, paramPort); LegacyProxyServer proxy; - try{ + try { proxy = proxyManager.create(options, paramPort, paramBindAddr, useEcc, trustAllServers); - }catch(ProxyExistsException ex){ + } catch (ProxyExistsException ex) { return Reply.with(new ProxyDescriptor(ex.getPort())).status(455).as(Json.class); - }catch(ProxyPortsExhaustedException ex){ + } catch (ProxyPortsExhaustedException ex) { return Reply.saying().status(456); - }catch(Exception ex){ - StringWriter s = new StringWriter(); + } catch (Exception ex) { + StringWriter s = new StringWriter(); ex.printStackTrace(new PrintWriter(s)); return Reply.with(s).as(Text.class).status(550); } @@ -145,10 +145,10 @@ public Reply newHar(@Named("port") int port, Request request) { String captureHeaders = request.param("captureHeaders"); String captureContent = request.param("captureContent"); - String captureBinaryContent = request.param("captureBinaryContent"); + String captureBinaryContent = request.param("captureBinaryContent"); proxy.setCaptureHeaders(Boolean.parseBoolean(captureHeaders)); proxy.setCaptureContent(Boolean.parseBoolean(captureContent)); - proxy.setCaptureBinaryContent(Boolean.parseBoolean(captureBinaryContent)); + proxy.setCaptureBinaryContent(Boolean.parseBoolean(captureBinaryContent)); if (oldHar != null) { return Reply.with(oldHar).as(Json.class); @@ -193,12 +193,12 @@ public Reply blacklist(@Named("port") int port, Request request) { String blacklist = request.param("regex"); int responseCode = parseResponseCode(request.param("status")); - String method = request.param("method"); + String method = request.param("method"); proxy.blacklistRequests(blacklist, responseCode, method); return Reply.saying().ok(); } - + @Delete @At("/:port/blacklist") public Reply clearBlacklist(@Named("port") int port, Request request) { @@ -236,7 +236,7 @@ public Reply whitelist(@Named("port") int port, Request request) { return Reply.saying().ok(); } - + @Delete @At("/:port/whitelist") public Reply clearWhitelist(@Named("port") int port, Request request) { @@ -297,7 +297,7 @@ public Reply addResponseInterceptor(@Named("port") int port, Request ScriptEngineManager mgr = new ScriptEngineManager(); final ScriptEngine engine = mgr.getEngineByName("JavaScript"); - Compilable compilable = (Compilable) engine; + Compilable compilable = (Compilable) engine; final CompiledScript script = compilable.compile(baos.toString()); proxy.addResponseInterceptor(new ResponseInterceptor() { @@ -335,7 +335,7 @@ public Reply addRequestInterceptor(@Named("port") int port, Request r ScriptEngineManager mgr = new ScriptEngineManager(); final ScriptEngine engine = mgr.getEngineByName("JavaScript"); - Compilable compilable = (Compilable) engine; + Compilable compilable = (Compilable) engine; final CompiledScript script = compilable.compile(baos.toString()); proxy.addRequestInterceptor(new RequestInterceptor() { @@ -418,14 +418,16 @@ public Reply limit(@Named("port") int port, Request request) { try { streamManager.setUpstreamKbps(Integer.parseInt(upstreamKbps)); streamManager.enable(); - } catch (NumberFormatException e) { } + } catch (NumberFormatException e) { + } } String upstreamBps = request.param("upstreamBps"); if (upstreamBps != null) { try { ((BrowserMobProxy) proxy).setWriteBandwidthLimit(Integer.parseInt(upstreamBps)); - } catch (NumberFormatException e) {} + } catch (NumberFormatException e) { + } } String downstreamKbps = request.param("downstreamKbps"); @@ -433,14 +435,16 @@ public Reply limit(@Named("port") int port, Request request) { try { streamManager.setDownstreamKbps(Integer.parseInt(downstreamKbps)); streamManager.enable(); - } catch (NumberFormatException e) { } + } catch (NumberFormatException e) { + } } String downstreamBps = request.param("downstreamBps"); if (downstreamBps != null) { try { ((BrowserMobProxy) proxy).setReadBandwidthLimit(Integer.parseInt(downstreamBps)); - } catch (NumberFormatException e) {} + } catch (NumberFormatException e) { + } } String upstreamMaxKB = request.param("upstreamMaxKB"); @@ -448,37 +452,42 @@ public Reply limit(@Named("port") int port, Request request) { try { streamManager.setUpstreamMaxKB(Integer.parseInt(upstreamMaxKB)); streamManager.enable(); - } catch (NumberFormatException e) { } + } catch (NumberFormatException e) { + } } String downstreamMaxKB = request.param("downstreamMaxKB"); if (downstreamMaxKB != null) { try { streamManager.setDownstreamMaxKB(Integer.parseInt(downstreamMaxKB)); streamManager.enable(); - } catch (NumberFormatException e) { } - } + } catch (NumberFormatException e) { + } + } String latency = request.param("latency"); if (latency != null) { try { streamManager.setLatency(Integer.parseInt(latency)); streamManager.enable(); - } catch (NumberFormatException e) { } + } catch (NumberFormatException e) { + } } String payloadPercentage = request.param("payloadPercentage"); if (payloadPercentage != null) { try { streamManager.setPayloadPercentage(Integer.parseInt(payloadPercentage)); - } catch (NumberFormatException e) { } + } catch (NumberFormatException e) { + } } String maxBitsPerSecond = request.param("maxBitsPerSecond"); if (maxBitsPerSecond != null) { try { streamManager.setMaxBitsPerSecondThreshold(Integer.parseInt(maxBitsPerSecond)); - } catch (NumberFormatException e) { } + } catch (NumberFormatException e) { + } } String enable = request.param("enable"); if (enable != null) { - if( Boolean.parseBoolean(enable) ) { + if (Boolean.parseBoolean(enable)) { streamManager.enable(); } else { streamManager.disable(); @@ -486,17 +495,17 @@ public Reply limit(@Named("port") int port, Request request) { } return Reply.saying().ok(); } - + @Get @At("/:port/limit") public Reply getLimits(@Named("port") int port, Request request) { LegacyProxyServer proxy = proxyManager.get(port); if (proxy == null) { return Reply.saying().notFound(); - } + } return Reply.with(new BandwidthLimitDescriptor(proxy.getStreamManager())).as(Json.class); } - + @Put @At("/:port/timeout") public Reply timeout(@Named("port") int port, Request request) { @@ -509,25 +518,29 @@ public Reply timeout(@Named("port") int port, Request request) { if (requestTimeout != null) { try { proxy.setRequestTimeout(Integer.parseInt(requestTimeout)); - } catch (NumberFormatException e) { } + } catch (NumberFormatException e) { + } } String readTimeout = request.param("readTimeout"); if (readTimeout != null) { try { proxy.setSocketOperationTimeout(Integer.parseInt(readTimeout)); - } catch (NumberFormatException e) { } + } catch (NumberFormatException e) { + } } String connectionTimeout = request.param("connectionTimeout"); if (connectionTimeout != null) { try { proxy.setConnectionTimeout(Integer.parseInt(connectionTimeout)); - } catch (NumberFormatException e) { } + } catch (NumberFormatException e) { + } } String dnsCacheTimeout = request.param("dnsCacheTimeout"); if (dnsCacheTimeout != null) { try { proxy.setDNSCacheTimeout(Integer.parseInt(dnsCacheTimeout)); - } catch (NumberFormatException e) { } + } catch (NumberFormatException e) { + } } return Reply.saying().ok(); } @@ -579,7 +592,7 @@ public Reply wait(@Named("port") int port, Request request) { proxy.waitForNetworkTrafficToStop(Integer.parseInt(quietPeriodInMs), Integer.parseInt(timeoutInMs)); return Reply.saying().ok(); } - + @Delete @At("/:port/dns/cache") public Reply clearDnsCache(@Named("port") int port) { @@ -588,7 +601,7 @@ public Reply clearDnsCache(@Named("port") int port) { return Reply.saying().notFound(); } - proxy.clearDNSCache(); + proxy.clearDNSCache(); return Reply.saying().ok(); } @@ -604,8 +617,8 @@ public Reply rewriteUrl(@Named("port") int port, Request request) { String replace = request.param("replace"); proxy.rewriteUrl(match, replace); return Reply.saying().ok(); - } - + } + @Delete @At("/:port/rewrite") public Reply clearRewriteRules(@Named("port") int port, Request request) { @@ -614,10 +627,10 @@ public Reply clearRewriteRules(@Named("port") int port, Request reque return Reply.saying().notFound(); } - proxy.clearRewriteRules(); - return Reply.saying().ok(); + proxy.clearRewriteRules(); + return Reply.saying().ok(); } - + @Put @At("/:port/retry") public Reply retryCount(@Named("port") int port, Request request) { @@ -629,14 +642,15 @@ public Reply retryCount(@Named("port") int port, Request request) { String count = request.param("retrycount"); proxy.setRetryCount(Integer.parseInt(count)); return Reply.saying().ok(); - } - + } + private int parseResponseCode(String response) { int responseCode = 200; if (response != null) { try { responseCode = Integer.parseInt(response); - } catch (NumberFormatException e) { } + } catch (NumberFormatException e) { + } } return responseCode; } @@ -678,17 +692,17 @@ public void setProxyList(Collection proxyList) { this.proxyList = proxyList; } } - + public static class BandwidthLimitDescriptor { private long maxUpstreamKB; private long remainingUpstreamKB; private long maxDownstreamKB; private long remainingDownstreamKB; - - public BandwidthLimitDescriptor(){ + + public BandwidthLimitDescriptor() { } - - public BandwidthLimitDescriptor(StreamManager manager){ + + public BandwidthLimitDescriptor(StreamManager manager) { this.maxDownstreamKB = manager.getMaxDownstreamKB(); this.remainingDownstreamKB = manager.getRemainingDownstreamKB(); this.maxUpstreamKB = manager.getMaxUpstreamKB(); @@ -725,7 +739,7 @@ public long getRemainingDownstreamKB() { public void setRemainingDownstreamKB(long remainingDownstreamKB) { this.remainingDownstreamKB = remainingDownstreamKB; - } + } } private String getEntityBodyFromRequest(Request request) throws IOException { From e8e3de18d27a67121dd07c3cb5fec10d6c1c1d68 Mon Sep 17 00:00:00 2001 From: Jason Eric Klaes Hoetger Date: Sat, 14 May 2016 20:21:54 -0700 Subject: [PATCH 04/10] Renamed browsermob-core to browsermob-core-legacy and renamed browsermob-core-littleproxy to browsermob-core --- browsermob-core-littleproxy/pom.xml | 2 +- browsermob-core/pom.xml | 4 ++-- browsermob-dist/pom.xml | 2 +- browsermob-rest/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/browsermob-core-littleproxy/pom.xml b/browsermob-core-littleproxy/pom.xml index 4a9015743..6f375cba2 100644 --- a/browsermob-core-littleproxy/pom.xml +++ b/browsermob-core-littleproxy/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - browsermob-core-littleproxy + browsermob-core BrowserMob Proxy Core (LittleProxy) Module diff --git a/browsermob-core/pom.xml b/browsermob-core/pom.xml index a0cbc8a75..cc4904e0c 100644 --- a/browsermob-core/pom.xml +++ b/browsermob-core/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - browsermob-core + browsermob-legacy BrowserMob Proxy Legacy (Jetty) Module @@ -36,7 +36,7 @@ net.lightbody.bmp - browsermob-core-littleproxy + browsermob-core ${project.version} diff --git a/browsermob-dist/pom.xml b/browsermob-dist/pom.xml index 56f68b671..4097953e0 100644 --- a/browsermob-dist/pom.xml +++ b/browsermob-dist/pom.xml @@ -30,7 +30,7 @@ net.lightbody.bmp - browsermob-core-littleproxy + browsermob-legacy ${project.version} diff --git a/browsermob-rest/pom.xml b/browsermob-rest/pom.xml index 887b7f175..dbf1a2fc8 100644 --- a/browsermob-rest/pom.xml +++ b/browsermob-rest/pom.xml @@ -21,7 +21,7 @@ net.lightbody.bmp - browsermob-core-littleproxy + browsermob-legacy ${project.version} From 398156f9de90e1130b317997986963c5acdd702d Mon Sep 17 00:00:00 2001 From: Jason Eric Klaes Hoetger Date: Sat, 14 May 2016 20:39:53 -0700 Subject: [PATCH 05/10] Renamed directories: browsermob-core to browsermob-legacy and browsermob-core-littleproxy to browsermob-core --- browsermob-core-littleproxy/pom.xml | 271 ------------------ browsermob-core/pom.xml | 202 +++++++++---- .../net/lightbody/bmp/BrowserMobProxy.java | 0 .../lightbody/bmp/BrowserMobProxyServer.java | 0 .../net/lightbody/bmp/client/ClientUtil.java | 0 .../java/net/lightbody/bmp/core/har/Har.java | 0 .../net/lightbody/bmp/core/har/HarCache.java | 0 .../bmp/core/har/HarCacheStatus.java | 0 .../lightbody/bmp/core/har/HarContent.java | 0 .../net/lightbody/bmp/core/har/HarCookie.java | 0 .../net/lightbody/bmp/core/har/HarEntry.java | 0 .../net/lightbody/bmp/core/har/HarLog.java | 0 .../bmp/core/har/HarNameValuePair.java | 0 .../bmp/core/har/HarNameVersion.java | 0 .../net/lightbody/bmp/core/har/HarPage.java | 0 .../bmp/core/har/HarPageTimings.java | 0 .../lightbody/bmp/core/har/HarPostData.java | 0 .../bmp/core/har/HarPostDataParam.java | 0 .../lightbody/bmp/core/har/HarRequest.java | 0 .../lightbody/bmp/core/har/HarResponse.java | 0 .../lightbody/bmp/core/har/HarTimings.java | 0 .../bmp/core/json/ISO8601DateFormatter.java | 0 .../json/ISO8601WithTDZDateFormatter.java | 0 .../bmp/exception/DecompressionException.java | 0 .../UnsupportedCharsetException.java | 0 .../bmp/filters/AddHeadersFilter.java | 0 .../bmp/filters/AutoBasicAuthFilter.java | 0 .../bmp/filters/BlacklistFilter.java | 0 .../filters/BrowserMobHttpFilterChain.java | 0 .../filters/ClientRequestCaptureFilter.java | 0 .../bmp/filters/HarCaptureFilter.java | 0 .../filters/HttpConnectHarCaptureFilter.java | 0 .../bmp/filters/HttpsAwareFiltersAdapter.java | 0 .../bmp/filters/HttpsHostCaptureFilter.java | 0 .../HttpsOriginalHostCaptureFilter.java | 0 .../lightbody/bmp/filters/LatencyFilter.java | 0 .../filters/ModifiedRequestAwareFilter.java | 0 .../bmp/filters/RegisterRequestFilter.java | 0 .../lightbody/bmp/filters/RequestFilter.java | 0 .../bmp/filters/RequestFilterAdapter.java | 0 .../filters/ResolvedHostnameCacheFilter.java | 0 .../lightbody/bmp/filters/ResponseFilter.java | 0 .../bmp/filters/ResponseFilterAdapter.java | 0 .../bmp/filters/RewriteUrlFilter.java | 0 .../filters/ServerResponseCaptureFilter.java | 0 .../bmp/filters/UnregisterRequestFilter.java | 0 .../bmp/filters/WhitelistFilter.java | 0 .../filters/support/HttpConnectTiming.java | 0 .../bmp/filters/util/HarCaptureUtil.java | 0 .../lightbody/bmp/proxy/ActivityMonitor.java | 0 .../lightbody/bmp/proxy/BlacklistEntry.java | 0 .../net/lightbody/bmp/proxy/CaptureType.java | 0 .../net/lightbody/bmp/proxy/RewriteRule.java | 0 .../net/lightbody/bmp/proxy/Whitelist.java | 0 .../lightbody/bmp/proxy/auth/AuthType.java | 0 .../proxy/dns/AbstractHostNameRemapper.java | 0 .../bmp/proxy/dns/AdvancedHostResolver.java | 0 .../bmp/proxy/dns/BasicHostResolver.java | 0 .../bmp/proxy/dns/ChainedHostResolver.java | 0 .../bmp/proxy/dns/DelegatingHostResolver.java | 0 .../bmp/proxy/dns/DnsJavaResolver.java | 0 .../lightbody/bmp/proxy/dns/HostResolver.java | 0 .../dns/NativeCacheManipulatingResolver.java | 0 .../bmp/proxy/dns/NativeResolver.java | 0 .../bmp/util/BrowserMobHttpUtil.java | 0 .../bmp/util/BrowserMobProxyUtil.java | 0 .../bmp/util/HttpMessageContents.java | 0 .../lightbody/bmp/util/HttpMessageInfo.java | 0 .../lightbody/bmp/util/HttpObjectUtil.java | 0 .../main/resources/net/lightbody/bmp/version | 0 .../sslSupport/ca-certificate-ec.cer | 0 .../sslSupport/ca-certificate-rsa.cer | 0 .../resources/sslSupport/ca-keystore-ec.p12 | Bin .../resources/sslSupport/ca-keystore-rsa.p12 | Bin .../bmp/filters/RewriteUrlFilterTest.groovy | 0 .../lightbody/bmp/proxy/AutoAuthTest.groovy | 0 .../bmp/proxy/BindAddressTest.groovy | 0 .../lightbody/bmp/proxy/BlacklistTest.groovy | 0 .../bmp/proxy/ChainedProxyAuthTest.groovy | 0 .../bmp/proxy/FilterChainTest.groovy | 0 .../net/lightbody/bmp/proxy/NewHarTest.groovy | 0 .../lightbody/bmp/proxy/WhitelistTest.groovy | 0 .../dns/AdvancedHostResolverCacheTest.java | 0 .../proxy/dns/AdvancedHostResolverTest.java | 0 .../proxy/dns/ChainedHostResolverTest.java | 0 .../bmp/util/BrowserMobHttpUtilTest.groovy | 0 .../lightbody/bmp/proxy/InterceptorTest.java | 0 .../net/lightbody/bmp/proxy/NetworkTest.java | 0 .../lightbody/bmp/proxy/QuiescenceTest.java | 0 .../bmp/proxy/test/util/MockServerTest.java | 0 .../proxy/test/util/NewProxyServerTest.java | 0 .../test/util/NewProxyServerTestUtil.java | 0 .../bmp/proxy/test/util/TestConstants.java | 0 browsermob-legacy/pom.xml | 175 +++++++++++ .../BrowserMobProxyServerLegacyAdapter.java | 0 .../lightbody/bmp/core/util/ThreadUtils.java | 0 .../bmp/exception/JettyException.java | 0 .../exception/NameResolutionException.java | 0 .../net/lightbody/bmp/l10n/MessagesUtil.java | 0 .../bmp/proxy/BrowserMobProxyHandler.java | 0 .../net/lightbody/bmp/proxy/HttpObject.java | 0 .../bmp/proxy/LegacyProxyServer.java | 0 .../net/lightbody/bmp/proxy/ProxyServer.java | 0 .../lightbody/bmp/proxy/error/ErrorUtil.java | 0 .../lightbody/bmp/proxy/error/ProxyError.java | 0 .../proxy/http/AllowAllHostnameVerifier.java | 0 .../bmp/proxy/http/BadURIException.java | 0 .../bmp/proxy/http/BrowserMobHttpClient.java | 0 .../bmp/proxy/http/BrowserMobHttpRequest.java | 0 .../proxy/http/BrowserMobHttpResponse.java | 0 .../bmp/proxy/http/CookieHeadersParser.java | 0 .../bmp/proxy/http/HttpClientInterrupter.java | 0 .../bmp/proxy/http/HttpDeleteWithBody.java | 0 .../proxy/http/LegacyHostResolverAdapter.java | 0 .../RepeatableInputStreamRequestEntity.java | 0 .../bmp/proxy/http/RequestCallback.java | 0 .../lightbody/bmp/proxy/http/RequestInfo.java | 0 .../bmp/proxy/http/RequestInterceptor.java | 0 .../bmp/proxy/http/ResponseInterceptor.java | 0 .../bmp/proxy/http/SimulatedSocket.java | 0 .../proxy/http/SimulatedSocketFactory.java | 0 .../proxy/http/TrustingSSLSocketFactory.java | 0 .../WildcardMatchingCredentialsProvider.java | 0 .../bmp/proxy/jetty/html/Applet.java | 0 .../lightbody/bmp/proxy/jetty/html/Block.java | 0 .../lightbody/bmp/proxy/jetty/html/Break.java | 0 .../bmp/proxy/jetty/html/Comment.java | 0 .../bmp/proxy/jetty/html/Composite.java | 0 .../proxy/jetty/html/CompositeFactory.java | 0 .../bmp/proxy/jetty/html/DefList.java | 0 .../bmp/proxy/jetty/html/Element.java | 0 .../lightbody/bmp/proxy/jetty/html/Font.java | 0 .../lightbody/bmp/proxy/jetty/html/Form.java | 0 .../lightbody/bmp/proxy/jetty/html/Frame.java | 0 .../bmp/proxy/jetty/html/FrameSet.java | 0 .../bmp/proxy/jetty/html/Heading.java | 0 .../lightbody/bmp/proxy/jetty/html/Image.java | 0 .../bmp/proxy/jetty/html/Include.java | 0 .../lightbody/bmp/proxy/jetty/html/Input.java | 0 .../lightbody/bmp/proxy/jetty/html/Link.java | 0 .../lightbody/bmp/proxy/jetty/html/List.java | 0 .../lightbody/bmp/proxy/jetty/html/Page.java | 0 .../bmp/proxy/jetty/html/Script.java | 0 .../bmp/proxy/jetty/html/Select.java | 0 .../lightbody/bmp/proxy/jetty/html/Style.java | 0 .../bmp/proxy/jetty/html/StyleLink.java | 0 .../lightbody/bmp/proxy/jetty/html/Table.java | 0 .../bmp/proxy/jetty/html/TableForm.java | 0 .../lightbody/bmp/proxy/jetty/html/Tag.java | 0 .../bmp/proxy/jetty/html/Target.java | 0 .../lightbody/bmp/proxy/jetty/html/Text.java | 0 .../bmp/proxy/jetty/html/TextArea.java | 0 .../bmp/proxy/jetty/http/Authenticator.java | 0 .../proxy/jetty/http/BasicAuthenticator.java | 0 .../jetty/http/BufferedOutputStream.java | 0 .../proxy/jetty/http/ChunkingInputStream.java | 0 .../jetty/http/ChunkingOutputStream.java | 0 .../jetty/http/ClientCertAuthenticator.java | 0 .../bmp/proxy/jetty/http/ContextLoader.java | 0 .../proxy/jetty/http/DigestAuthenticator.java | 0 .../bmp/proxy/jetty/http/EOFException.java | 0 .../bmp/proxy/jetty/http/HashSSORealm.java | 0 .../bmp/proxy/jetty/http/HashUserRealm.java | 0 .../proxy/jetty/http/HostSocketListener.java | 0 .../bmp/proxy/jetty/http/HttpConnection.java | 0 .../bmp/proxy/jetty/http/HttpContext.java | 0 .../bmp/proxy/jetty/http/HttpException.java | 0 .../bmp/proxy/jetty/http/HttpFields.java | 0 .../bmp/proxy/jetty/http/HttpHandler.java | 0 .../bmp/proxy/jetty/http/HttpInputStream.java | 0 .../bmp/proxy/jetty/http/HttpListener.java | 0 .../bmp/proxy/jetty/http/HttpMessage.java | 0 .../bmp/proxy/jetty/http/HttpOnlyCookie.java | 0 .../proxy/jetty/http/HttpOutputStream.java | 0 .../bmp/proxy/jetty/http/HttpRequest.java | 0 .../bmp/proxy/jetty/http/HttpResponse.java | 0 .../bmp/proxy/jetty/http/HttpServer.java | 0 .../bmp/proxy/jetty/http/HttpTunnel.java | 0 .../proxy/jetty/http/InclusiveByteRange.java | 0 .../bmp/proxy/jetty/http/JDBCUserRealm.java | 0 .../bmp/proxy/jetty/http/JsseListener.java | 0 .../proxy/jetty/http/MultiPartResponse.java | 0 .../bmp/proxy/jetty/http/NCSARequestLog.java | 0 .../bmp/proxy/jetty/http/PathMap.java | 0 .../bmp/proxy/jetty/http/RequestLog.java | 0 .../bmp/proxy/jetty/http/ResourceCache.java | 0 .../bmp/proxy/jetty/http/SSORealm.java | 0 .../proxy/jetty/http/SecurityConstraint.java | 0 .../bmp/proxy/jetty/http/SocketListener.java | 0 .../bmp/proxy/jetty/http/SslListener.java | 0 .../bmp/proxy/jetty/http/SunJsseListener.java | 0 .../bmp/proxy/jetty/http/UserRealm.java | 0 .../bmp/proxy/jetty/http/Version.java | 0 .../proxy/jetty/http/ajp/AJP13Connection.java | 0 .../jetty/http/ajp/AJP13InputStream.java | 0 .../proxy/jetty/http/ajp/AJP13Listener.java | 0 .../jetty/http/ajp/AJP13OutputStream.java | 0 .../bmp/proxy/jetty/http/ajp/AJP13Packet.java | 0 .../jetty/http/ajp/AJP13RequestPacket.java | 0 .../jetty/http/ajp/AJP13ResponsePacket.java | 0 .../http/ajp/jmx/AJP13ListenerMBean.java | 0 .../http/handler/AbstractHttpHandler.java | 0 .../proxy/jetty/http/handler/DumpHandler.java | 0 .../jetty/http/handler/ErrorPageHandler.java | 0 .../jetty/http/handler/ExpiryHandler.java | 0 .../jetty/http/handler/ForwardHandler.java | 0 .../jetty/http/handler/HTAccessHandler.java | 0 .../jetty/http/handler/IPAccessHandler.java | 0 .../jetty/http/handler/MsieSslHandler.java | 0 .../jetty/http/handler/NotFoundHandler.java | 0 .../proxy/jetty/http/handler/NullHandler.java | 0 .../jetty/http/handler/ProxyHandler.java | 0 .../jetty/http/handler/ResourceHandler.java | 0 .../http/handler/RootNotFoundHandler.java | 0 .../jetty/http/handler/SecurityHandler.java | 0 .../handler/SetResponseHeadersHandler.java | 0 .../handler/jmx/ResourceHandlerMBean.java | 0 .../jetty/http/jmx/HttpContextMBean.java | 0 .../jetty/http/jmx/HttpHandlerMBean.java | 0 .../jetty/http/jmx/HttpListenerMBean.java | 0 .../proxy/jetty/http/jmx/HttpServerMBean.java | 0 .../jetty/http/jmx/JsseListenerMBean.java | 0 .../jetty/http/jmx/NCSARequestLogMBean.java | 0 .../http/jmx/SocketChannelListenerMBean.java | 0 .../jetty/http/jmx/SocketListenerMBean.java | 0 .../jetty/http/jmx/SunJsseListenerMBean.java | 0 .../jetty/http/nio/ByteBufferInputStream.java | 0 .../jetty/http/nio/SocketChannelListener.java | 0 .../http/nio/SocketChannelOutputStream.java | 0 .../bmp/proxy/jetty/jetty/Server.java | 0 .../proxy/jetty/jetty/jmx/ServerMBean.java | 0 .../jetty/servlet/AbstractSessionManager.java | 0 .../jetty/servlet/BasicAuthenticator.java | 0 .../proxy/jetty/jetty/servlet/Default.java | 0 .../jetty/servlet/DigestAuthenticator.java | 0 .../proxy/jetty/jetty/servlet/Dispatcher.java | 0 .../jetty/jetty/servlet/FilterHolder.java | 0 .../jetty/servlet/FormAuthenticator.java | 0 .../jetty/servlet/HashSessionManager.java | 0 .../bmp/proxy/jetty/jetty/servlet/Holder.java | 0 .../proxy/jetty/jetty/servlet/Invoker.java | 0 .../jetty/jetty/servlet/JSR154Filter.java | 0 .../jetty/servlet/JettyWebConfiguration.java | 0 .../jetty/jetty/servlet/ServletHandler.java | 0 .../jetty/jetty/servlet/ServletHolder.java | 0 .../jetty/servlet/ServletHttpContext.java | 0 .../jetty/servlet/ServletHttpRequest.java | 0 .../jetty/servlet/ServletHttpResponse.java | 0 .../proxy/jetty/jetty/servlet/ServletIn.java | 0 .../proxy/jetty/jetty/servlet/ServletOut.java | 0 .../proxy/jetty/jetty/servlet/ServletSSL.java | 0 .../jetty/jetty/servlet/ServletWriter.java | 0 .../jetty/jetty/servlet/SessionContext.java | 0 .../jetty/jetty/servlet/SessionManager.java | 0 .../jetty/servlet/TagLibConfiguration.java | 0 .../jetty/servlet/WebApplicationContext.java | 0 .../jetty/servlet/WebApplicationHandler.java | 0 .../jetty/jetty/servlet/XMLConfiguration.java | 0 .../jmx/AbstractSessionManagerMBean.java | 0 .../jetty/servlet/jmx/ConfigurationMBean.java | 0 .../jetty/servlet/jmx/FilterHolderMBean.java | 0 .../jetty/jetty/servlet/jmx/HolderMBean.java | 0 .../jmx/JettyWebConfigurationMBean.java | 0 .../servlet/jmx/ServletHandlerMBean.java | 0 .../jetty/servlet/jmx/ServletHolderMBean.java | 0 .../servlet/jmx/ServletHttpContextMBean.java | 0 .../servlet/jmx/SessionManagerMBean.java | 0 .../jmx/WebApplicationContextMBean.java | 0 .../jmx/WebApplicationHandlerMBean.java | 0 .../servlet/jmx/XMLConfigurationMBean.java | 0 .../bmp/proxy/jetty/jetty/win32/Service.java | 0 .../bmp/proxy/jetty/log/Factory.java | 0 .../lightbody/bmp/proxy/jetty/log/Frame.java | 0 .../bmp/proxy/jetty/log/LogFactory.java | 0 .../bmp/proxy/jetty/log/LogImpl.java | 0 .../bmp/proxy/jetty/log/LogSink.java | 0 .../bmp/proxy/jetty/log/LogStream.java | 0 .../bmp/proxy/jetty/log/NullLogSink.java | 0 .../proxy/jetty/log/OutputStreamLogSink.java | 0 .../org.apache.commons.logging.LogFactory | 0 .../bmp/proxy/jetty/servlet/AdminServlet.java | 0 .../bmp/proxy/jetty/servlet/CGI.java | 0 .../bmp/proxy/jetty/servlet/Debug.java | 0 .../bmp/proxy/jetty/servlet/Dump.java | 0 .../bmp/proxy/jetty/servlet/Forward.java | 0 .../proxy/jetty/servlet/MultiPartFilter.java | 0 .../proxy/jetty/servlet/MultiPartRequest.java | 0 .../jetty/servlet/MultiPartResponse.java | 0 .../proxy/jetty/servlet/NotFoundServlet.java | 0 .../proxy/jetty/servlet/PostFileFilter.java | 0 .../bmp/proxy/jetty/servlet/ProxyServlet.java | 0 .../bmp/proxy/jetty/servlet/SendRedirect.java | 0 .../bmp/proxy/jetty/servlet/SessionDump.java | 0 .../proxy/jetty/servlet/WelcomeFilter.java | 0 .../bmp/proxy/jetty/start/Classpath.java | 0 .../lightbody/bmp/proxy/jetty/start/Main.java | 0 .../bmp/proxy/jetty/start/Monitor.java | 0 .../bmp/proxy/jetty/start/README.txt | 0 .../bmp/proxy/jetty/start/Version.java | 0 .../bmp/proxy/jetty/start/start.config | 0 .../lightbody/bmp/proxy/jetty/stop/Main.java | 0 .../bmp/proxy/jetty/util/B64Code.java | 0 .../bmp/proxy/jetty/util/BadResource.java | 0 .../bmp/proxy/jetty/util/BlockingQueue.java | 0 .../jetty/util/ByteArrayISO8859Writer.java | 0 .../jetty/util/ByteArrayOutputStream2.java | 0 .../bmp/proxy/jetty/util/ByteArrayPool.java | 0 .../jetty/util/ByteBufferOutputStream.java | 0 .../bmp/proxy/jetty/util/CachedResource.java | 0 .../bmp/proxy/jetty/util/CodeException.java | 0 .../bmp/proxy/jetty/util/ComponentEvent.java | 0 .../proxy/jetty/util/ComponentListener.java | 0 .../bmp/proxy/jetty/util/Container.java | 0 .../bmp/proxy/jetty/util/Credential.java | 0 .../bmp/proxy/jetty/util/DateCache.java | 0 .../bmp/proxy/jetty/util/EventProvider.java | 0 .../bmp/proxy/jetty/util/FileResource.java | 0 .../lightbody/bmp/proxy/jetty/util/IO.java | 0 .../bmp/proxy/jetty/util/InetAddrPort.java | 0 .../bmp/proxy/jetty/util/JarFileResource.java | 0 .../bmp/proxy/jetty/util/JarResource.java | 0 .../bmp/proxy/jetty/util/KeyPairTool.java | 0 .../bmp/proxy/jetty/util/LazyList.java | 0 .../bmp/proxy/jetty/util/LifeCycle.java | 0 .../bmp/proxy/jetty/util/LifeCycleEvent.java | 0 .../proxy/jetty/util/LifeCycleListener.java | 0 .../bmp/proxy/jetty/util/LifeCycleThread.java | 0 .../bmp/proxy/jetty/util/LineInput.java | 0 .../bmp/proxy/jetty/util/Loader.java | 0 .../bmp/proxy/jetty/util/LogSupport.java | 0 .../bmp/proxy/jetty/util/MultiException.java | 0 .../bmp/proxy/jetty/util/MultiMap.java | 0 .../bmp/proxy/jetty/util/Observed.java | 0 .../bmp/proxy/jetty/util/OutputObserver.java | 0 .../bmp/proxy/jetty/util/PKCS12Import.java | 0 .../bmp/proxy/jetty/util/Password.java | 0 .../lightbody/bmp/proxy/jetty/util/Pool.java | 0 .../bmp/proxy/jetty/util/Primitive.java | 0 .../jetty/util/QuotedStringTokenizer.java | 0 .../bmp/proxy/jetty/util/Resource.java | 0 .../jetty/util/RolloverFileOutputStream.java | 0 .../bmp/proxy/jetty/util/SingletonList.java | 0 .../proxy/jetty/util/StringBufferWriter.java | 0 .../bmp/proxy/jetty/util/StringMap.java | 0 .../bmp/proxy/jetty/util/StringUtil.java | 0 .../bmp/proxy/jetty/util/TempByteHolder.java | 0 .../bmp/proxy/jetty/util/TestCase.java | 0 .../bmp/proxy/jetty/util/ThreadPool.java | 0 .../bmp/proxy/jetty/util/ThreadedServer.java | 0 .../bmp/proxy/jetty/util/TypeUtil.java | 0 .../lightbody/bmp/proxy/jetty/util/URI.java | 0 .../bmp/proxy/jetty/util/URLResource.java | 0 .../bmp/proxy/jetty/util/UnixCrypt.java | 0 .../bmp/proxy/jetty/util/UrlEncoded.java | 0 .../proxy/jetty/util/WriterOutputStream.java | 0 .../proxy/jetty/util/jmx/LifeCycleMBean.java | 0 .../proxy/jetty/util/jmx/ModelMBeanImpl.java | 0 .../proxy/jetty/util/jmx/ThreadPoolMBean.java | 0 .../jetty/util/jmx/ThreadedServerMBean.java | 0 .../bmp/proxy/jetty/xml/XmlConfiguration.java | 0 .../bmp/proxy/jetty/xml/XmlParser.java | 0 .../selenium/ExtendedKeyUsageConstants.java | 0 .../bmp/proxy/selenium/KeyStoreManager.java | 0 .../proxy/selenium/SeleniumProxyHandler.java | 0 .../selenium/ServerCertificateCreator.java | 0 .../bmp/proxy/selenium/ThumbprintUtil.java | 0 .../util/CappedByteArrayOutputStream.java | 0 .../bmp/proxy/util/ChainableWriter.java | 0 .../bmp/proxy/util/ClonedInputStream.java | 0 .../bmp/proxy/util/ClonedOutputStream.java | 0 .../net/lightbody/bmp/proxy/util/IOUtils.java | 0 .../bmp/proxy/util/LockingChainingWriter.java | 0 .../util/TrustEverythingSSLTrustManager.java | 0 .../bmp/util/DeleteDirectoryTask.java | 0 .../BandwidthLimiter.java | 0 .../MaximumTransferExceededException.java | 0 .../java_bandwidthlimiter/StreamManager.java | 0 .../net/lightbody/bmp/html/error.html | 0 .../lightbody/bmp/l10n/messages.properties | 0 .../jetty/http/ajp/jmx/mbean_en.properties | 0 .../bmp/proxy/jetty/http/encoding.properties | 0 .../http/handler/jmx/mbean_en.properties | 0 .../proxy/jetty/http/jmx/mbean_en.properties | 0 .../bmp/proxy/jetty/http/mime.properties | 0 .../proxy/jetty/jetty/jmx/mbean_en.properties | 0 .../proxy/jetty/jetty/servlet/webdefault.xml | 0 .../proxy/jetty/util/jmx/mbean_en.properties | 0 .../bmp/proxy/jetty/xml/configure_1_0.dtd | 0 .../bmp/proxy/jetty/xml/configure_1_1.dtd | 0 .../bmp/proxy/jetty/xml/configure_1_2.dtd | 0 .../bmp/proxy/jetty/xml/configure_1_3.dtd | 0 .../lightbody/bmp/proxy/AddHeadersTest.java | 0 .../bmp/proxy/BlackAndWhiteListTest.java | 0 .../net/lightbody/bmp/proxy/BrowserTest.java | 0 .../net/lightbody/bmp/proxy/CookieTest.java | 0 .../bmp/proxy/ErrorResponseTest.java | 0 .../java/net/lightbody/bmp/proxy/HarTest.java | 0 .../lightbody/bmp/proxy/HttpMethodTest.java | 0 .../bmp/proxy/MailingListIssuesTest.java | 0 .../lightbody/bmp/proxy/PhantomJSTest.java | 0 .../bmp/proxy/RepeatableInputStreamTest.java | 0 .../lightbody/bmp/proxy/RewriteRuleTest.java | 0 .../java/net/lightbody/bmp/proxy/SslTest.java | 0 .../test/servlet/EchoPayloadServlet.java | 0 .../bmp/proxy/test/servlet/EchoServlet.java | 0 .../bmp/proxy/test/servlet/JsonServlet.java | 0 .../proxy/test/servlet/SetCookieServlet.java | 0 .../bmp/proxy/test/util/LocalServer.java | 0 .../bmp/proxy/test/util/LocalServerTest.java | 0 .../bmp/proxy/test/util/ProxyServerTest.java | 0 .../proxy/test/util/ProxyServerTestUtil.java | 0 .../StreamManagerTest.java | 0 .../src/test/resources/local-server/a.txt | 0 .../src/test/resources/local-server/a.txt.gz | Bin .../src/test/resources/local-server/b.txt | 0 .../src/test/resources/local-server/c.png | Bin .../src/test/resources/log4j2-test.json | 0 pom.xml | 2 +- 418 files changed, 325 insertions(+), 325 deletions(-) delete mode 100644 browsermob-core-littleproxy/pom.xml rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/BrowserMobProxy.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/client/ClientUtil.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/Har.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarCache.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarCacheStatus.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarContent.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarCookie.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarEntry.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarLog.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarNameValuePair.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarNameVersion.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarPage.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarPageTimings.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarPostData.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarPostDataParam.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarRequest.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarResponse.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/har/HarTimings.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/json/ISO8601DateFormatter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/core/json/ISO8601WithTDZDateFormatter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/exception/DecompressionException.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/exception/UnsupportedCharsetException.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/AddHeadersFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/AutoBasicAuthFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/BlacklistFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/BrowserMobHttpFilterChain.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/ClientRequestCaptureFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/HttpConnectHarCaptureFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/HttpsAwareFiltersAdapter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/HttpsHostCaptureFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/HttpsOriginalHostCaptureFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/LatencyFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/ModifiedRequestAwareFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/RegisterRequestFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/RequestFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/RequestFilterAdapter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/ResolvedHostnameCacheFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/ResponseFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/ResponseFilterAdapter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/RewriteUrlFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/ServerResponseCaptureFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/UnregisterRequestFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/WhitelistFilter.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/support/HttpConnectTiming.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/filters/util/HarCaptureUtil.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/ActivityMonitor.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/CaptureType.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/RewriteRule.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/Whitelist.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/auth/AuthType.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/dns/AbstractHostNameRemapper.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolver.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/dns/BasicHostResolver.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/dns/ChainedHostResolver.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/dns/DelegatingHostResolver.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/dns/DnsJavaResolver.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/dns/HostResolver.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/dns/NativeCacheManipulatingResolver.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/proxy/dns/NativeResolver.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/util/BrowserMobProxyUtil.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/util/HttpMessageContents.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/util/HttpMessageInfo.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/java/net/lightbody/bmp/util/HttpObjectUtil.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/resources/net/lightbody/bmp/version (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/resources/sslSupport/ca-certificate-ec.cer (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/resources/sslSupport/ca-certificate-rsa.cer (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/resources/sslSupport/ca-keystore-ec.p12 (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/main/resources/sslSupport/ca-keystore-rsa.p12 (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/groovy/net/lightbody/bmp/filters/RewriteUrlFilterTest.groovy (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/groovy/net/lightbody/bmp/proxy/AutoAuthTest.groovy (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/groovy/net/lightbody/bmp/proxy/BindAddressTest.groovy (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/groovy/net/lightbody/bmp/proxy/BlacklistTest.groovy (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/groovy/net/lightbody/bmp/proxy/ChainedProxyAuthTest.groovy (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/groovy/net/lightbody/bmp/proxy/FilterChainTest.groovy (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/groovy/net/lightbody/bmp/proxy/NewHarTest.groovy (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/groovy/net/lightbody/bmp/proxy/WhitelistTest.groovy (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverCacheTest.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverTest.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/groovy/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/groovy/net/lightbody/bmp/util/BrowserMobHttpUtilTest.groovy (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/java/net/lightbody/bmp/proxy/NetworkTest.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/java/net/lightbody/bmp/proxy/QuiescenceTest.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/java/net/lightbody/bmp/proxy/test/util/MockServerTest.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTest.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTestUtil.java (100%) rename {browsermob-core-littleproxy => browsermob-core}/src/test/java/net/lightbody/bmp/proxy/test/util/TestConstants.java (100%) create mode 100644 browsermob-legacy/pom.xml rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/core/util/ThreadUtils.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/exception/JettyException.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/exception/NameResolutionException.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/l10n/MessagesUtil.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/BrowserMobProxyHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/HttpObject.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/LegacyProxyServer.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/ProxyServer.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/error/ErrorUtil.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/error/ProxyError.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/AllowAllHostnameVerifier.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/BadURIException.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpRequest.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpResponse.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/CookieHeadersParser.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/HttpClientInterrupter.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/HttpDeleteWithBody.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/LegacyHostResolverAdapter.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/RepeatableInputStreamRequestEntity.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/RequestCallback.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/RequestInfo.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/RequestInterceptor.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/ResponseInterceptor.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/SimulatedSocket.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/SimulatedSocketFactory.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/TrustingSSLSocketFactory.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/http/WildcardMatchingCredentialsProvider.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Applet.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Block.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Break.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Comment.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Composite.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/CompositeFactory.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/DefList.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Element.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Font.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Form.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Frame.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/FrameSet.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Heading.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Image.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Include.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Input.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Link.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/List.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Page.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Script.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Select.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Style.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/StyleLink.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Table.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/TableForm.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Tag.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Target.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/Text.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/html/TextArea.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/Authenticator.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/BasicAuthenticator.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/BufferedOutputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/ChunkingInputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/ChunkingOutputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/ClientCertAuthenticator.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/ContextLoader.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/DigestAuthenticator.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/EOFException.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HashSSORealm.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HashUserRealm.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HostSocketListener.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpConnection.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpContext.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpException.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpFields.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpInputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpListener.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpMessage.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpOnlyCookie.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpOutputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpRequest.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpResponse.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpServer.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpTunnel.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/InclusiveByteRange.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/JDBCUserRealm.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/JsseListener.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/MultiPartResponse.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/NCSARequestLog.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/PathMap.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/RequestLog.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/ResourceCache.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/SSORealm.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/SecurityConstraint.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/SocketListener.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/SslListener.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/SunJsseListener.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/UserRealm.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/Version.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Connection.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13InputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Listener.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13OutputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Packet.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13RequestPacket.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13ResponsePacket.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/jmx/AJP13ListenerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/AbstractHttpHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/DumpHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ErrorPageHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ExpiryHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ForwardHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/HTAccessHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/IPAccessHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/MsieSslHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/NotFoundHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/NullHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ProxyHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ResourceHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/RootNotFoundHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/SecurityHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/SetResponseHeadersHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/jmx/ResourceHandlerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpContextMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpHandlerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpListenerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpServerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/JsseListenerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/NCSARequestLogMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SocketChannelListenerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SocketListenerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SunJsseListenerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/ByteBufferInputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/SocketChannelListener.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/SocketChannelOutputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/Server.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/jmx/ServerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/AbstractSessionManager.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/BasicAuthenticator.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Default.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/DigestAuthenticator.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Dispatcher.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/FilterHolder.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/FormAuthenticator.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/HashSessionManager.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Holder.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Invoker.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/JSR154Filter.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/JettyWebConfiguration.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHolder.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpContext.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpRequest.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpResponse.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletIn.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletOut.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletSSL.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletWriter.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/SessionContext.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/SessionManager.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/TagLibConfiguration.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/WebApplicationContext.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/WebApplicationHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/XMLConfiguration.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/AbstractSessionManagerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ConfigurationMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/FilterHolderMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/HolderMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/JettyWebConfigurationMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHandlerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHolderMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHttpContextMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/SessionManagerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/WebApplicationContextMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/WebApplicationHandlerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/XMLConfigurationMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/win32/Service.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/log/Factory.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/log/Frame.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogFactory.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogImpl.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogSink.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/log/NullLogSink.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/log/OutputStreamLogSink.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/log/services/org.apache.commons.logging.LogFactory (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/AdminServlet.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/CGI.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Debug.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Dump.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Forward.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartFilter.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartRequest.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartResponse.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/NotFoundServlet.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/PostFileFilter.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/ProxyServlet.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/SendRedirect.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/SessionDump.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/WelcomeFilter.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/start/Classpath.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/start/Main.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/start/Monitor.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/start/README.txt (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/start/Version.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/start/start.config (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/stop/Main.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/B64Code.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/BadResource.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/BlockingQueue.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayISO8859Writer.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayOutputStream2.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayPool.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteBufferOutputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/CachedResource.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/CodeException.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/ComponentEvent.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/ComponentListener.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/Container.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/Credential.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/DateCache.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/EventProvider.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/FileResource.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/IO.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/InetAddrPort.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/JarFileResource.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/JarResource.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/KeyPairTool.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/LazyList.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycle.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleEvent.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleListener.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleThread.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/LineInput.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/Loader.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/LogSupport.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/MultiException.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/MultiMap.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/Observed.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/OutputObserver.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/PKCS12Import.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/Password.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/Pool.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/Primitive.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/QuotedStringTokenizer.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/Resource.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/RolloverFileOutputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/SingletonList.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringBufferWriter.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringMap.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringUtil.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/TempByteHolder.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/TestCase.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/ThreadPool.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/ThreadedServer.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/TypeUtil.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/URI.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/URLResource.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/UnixCrypt.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/UrlEncoded.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/WriterOutputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/LifeCycleMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ModelMBeanImpl.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ThreadPoolMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ThreadedServerMBean.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/xml/XmlConfiguration.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/jetty/xml/XmlParser.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/selenium/ExtendedKeyUsageConstants.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/selenium/KeyStoreManager.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/selenium/SeleniumProxyHandler.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/selenium/ServerCertificateCreator.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/selenium/ThumbprintUtil.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/util/CappedByteArrayOutputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/util/ChainableWriter.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/util/ClonedInputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/util/ClonedOutputStream.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/util/IOUtils.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/util/LockingChainingWriter.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/proxy/util/TrustEverythingSSLTrustManager.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/net/lightbody/bmp/util/DeleteDirectoryTask.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/org/java_bandwidthlimiter/BandwidthLimiter.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/org/java_bandwidthlimiter/MaximumTransferExceededException.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/java/org/java_bandwidthlimiter/StreamManager.java (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/html/error.html (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/l10n/messages.properties (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/proxy/jetty/http/ajp/jmx/mbean_en.properties (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/proxy/jetty/http/encoding.properties (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/proxy/jetty/http/handler/jmx/mbean_en.properties (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/proxy/jetty/http/jmx/mbean_en.properties (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/proxy/jetty/http/mime.properties (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/proxy/jetty/jetty/jmx/mbean_en.properties (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/proxy/jetty/jetty/servlet/webdefault.xml (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/proxy/jetty/util/jmx/mbean_en.properties (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_0.dtd (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_1.dtd (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_2.dtd (100%) rename {browsermob-core => browsermob-legacy}/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_3.dtd (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/AddHeadersTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/BlackAndWhiteListTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/BrowserTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/CookieTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/ErrorResponseTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/HarTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/HttpMethodTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/MailingListIssuesTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/PhantomJSTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/RepeatableInputStreamTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/RewriteRuleTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/SslTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/test/servlet/EchoPayloadServlet.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/test/servlet/EchoServlet.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/test/servlet/JsonServlet.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/test/servlet/SetCookieServlet.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/test/util/LocalServer.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/test/util/LocalServerTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTestUtil.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/java/org/java_bandwidthlimiter/StreamManagerTest.java (100%) rename {browsermob-core => browsermob-legacy}/src/test/resources/local-server/a.txt (100%) rename {browsermob-core => browsermob-legacy}/src/test/resources/local-server/a.txt.gz (100%) rename {browsermob-core => browsermob-legacy}/src/test/resources/local-server/b.txt (100%) rename {browsermob-core => browsermob-legacy}/src/test/resources/local-server/c.png (100%) rename {browsermob-core-littleproxy => browsermob-legacy}/src/test/resources/log4j2-test.json (100%) diff --git a/browsermob-core-littleproxy/pom.xml b/browsermob-core-littleproxy/pom.xml deleted file mode 100644 index 6f375cba2..000000000 --- a/browsermob-core-littleproxy/pom.xml +++ /dev/null @@ -1,271 +0,0 @@ - - - jar - - - browsermob-proxy - net.lightbody.bmp - 2.1.0-beta-7-SNAPSHOT - - 4.0.0 - - browsermob-core - BrowserMob Proxy Core (LittleProxy) Module - - - 7.6.16.v20140903 - - - - - - src/main/resources - true - - net/lightbody/bmp/version - - - - src/main/resources - false - - **/** - - - net/lightbody/bmp/version - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Xmx1g -XX:MaxPermSize=256m - - - - - - - - net.lightbody.bmp - littleproxy - - - com.barchart.udt - barchart-udt-bundle - - - - - - com.fasterxml.jackson.core - jackson-core - - - - com.fasterxml.jackson.core - jackson-databind - - - - com.fasterxml.jackson.core - jackson-annotations - - - - net.sf.uadetector - uadetector-resources - 2014.10 - - - - com.google.guava - guava - - - - dnsjava - dnsjava - 2.1.7 - - - - org.seleniumhq.selenium - selenium-api - true - - - - org.slf4j - slf4j-api - - - - org.slf4j - jcl-over-slf4j - - - - - com.jcraft - jzlib - - - io.netty - netty - - - - - - - io.netty - netty-all - - - - org.bouncycastle - bcprov-jdk15on - - - - org.bouncycastle - bcpkix-jdk15on - - - - net.lightbody.bmp - mitm - ${project.version} - - - - - org.javassist - javassist - true - - - - org.apache.logging.log4j - log4j-api - test - - - org.apache.logging.log4j - log4j-core - test - - - org.apache.logging.log4j - log4j-slf4j-impl - test - - - org.seleniumhq.selenium - selenium-firefox-driver - test - - - junit - junit - test - - - - com.codeborne - phantomjsdriver - 1.2.1 - test - - - - io.netty - netty - - - - - - org.jboss.arquillian.extension - arquillian-phantom-driver - test - - - - org.mockito - mockito-core - test - - - - org.mock-server - mockserver-netty - test - - - ch.qos.logback - logback-classic - - - - io.netty - netty-codec-socks - - - io.netty - netty-buffer - - - io.netty - netty-codec - - - io.netty - netty-codec-http - - - io.netty - netty-common - - - io.netty - netty-handler - - - io.netty - netty-transport - - - - - - org.eclipse.jetty - jetty-server - ${unit-test-jetty.version} - test - - - - org.eclipse.jetty - jetty-servlet - ${unit-test-jetty.version} - test - - - - org.eclipse.jetty - jetty-servlets - ${unit-test-jetty.version} - test - - - - org.hamcrest - hamcrest-library - test - - - \ No newline at end of file diff --git a/browsermob-core/pom.xml b/browsermob-core/pom.xml index cc4904e0c..6f375cba2 100644 --- a/browsermob-core/pom.xml +++ b/browsermob-core/pom.xml @@ -9,25 +9,39 @@ 4.0.0 - browsermob-legacy - BrowserMob Proxy Legacy (Jetty) Module + browsermob-core + BrowserMob Proxy Core (LittleProxy) Module 7.6.16.v20140903 - true + + + src/main/resources + true + + net/lightbody/bmp/version + + + + src/main/resources + false + + **/** + + + net/lightbody/bmp/version + + + org.apache.maven.plugins maven-surefire-plugin -Xmx1g -XX:MaxPermSize=256m - - - ${use.littleproxy} - @@ -36,83 +50,130 @@ net.lightbody.bmp - browsermob-core - ${project.version} + littleproxy + + + com.barchart.udt + barchart-udt-bundle + + - net.lightbody.bmp - mitm - ${project.version} + com.fasterxml.jackson.core + jackson-core - org.apache.logging.log4j - log4j-api - test + com.fasterxml.jackson.core + jackson-databind + - org.apache.logging.log4j - log4j-core - test + com.fasterxml.jackson.core + jackson-annotations + - org.apache.logging.log4j - log4j-slf4j-impl - test + net.sf.uadetector + uadetector-resources + 2014.10 - org.apache.httpcomponents - httpclient + com.google.guava + guava + + + + dnsjava + dnsjava + 2.1.7 + + + + org.seleniumhq.selenium + selenium-api + true + + + + org.slf4j + slf4j-api + + + + org.slf4j + jcl-over-slf4j + + + + + com.jcraft + jzlib - commons-logging - commons-logging + io.netty + netty + + + + io.netty + netty-all + + - org.apache.httpcomponents - httpmime + org.bouncycastle + bcprov-jdk15on - commons-io - commons-io - 2.5 + org.bouncycastle + bcpkix-jdk15on - javax.servlet - servlet-api - 2.5 + net.lightbody.bmp + mitm + ${project.version} + - org.seleniumhq.selenium - selenium-api + org.javassist + javassist true + + org.apache.logging.log4j + log4j-api + test + + + org.apache.logging.log4j + log4j-core + test + + + org.apache.logging.log4j + log4j-slf4j-impl + test + org.seleniumhq.selenium selenium-firefox-driver test - junit junit test - - org.hamcrest - hamcrest-library - test - - com.codeborne phantomjsdriver @@ -139,6 +200,47 @@ test + + org.mock-server + mockserver-netty + test + + + ch.qos.logback + logback-classic + + + + io.netty + netty-codec-socks + + + io.netty + netty-buffer + + + io.netty + netty-codec + + + io.netty + netty-codec-http + + + io.netty + netty-common + + + io.netty + netty-handler + + + io.netty + netty-transport + + + + org.eclipse.jetty jetty-server @@ -160,16 +262,10 @@ test + + org.hamcrest + hamcrest-library + test + - - - - - legacy - - false - - - - \ No newline at end of file diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxy.java b/browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxy.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxy.java rename to browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxy.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java b/browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java rename to browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/client/ClientUtil.java b/browsermob-core/src/main/java/net/lightbody/bmp/client/ClientUtil.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/client/ClientUtil.java rename to browsermob-core/src/main/java/net/lightbody/bmp/client/ClientUtil.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/Har.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/Har.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/Har.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/Har.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarCache.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCache.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarCache.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCache.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarCacheStatus.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCacheStatus.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarCacheStatus.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCacheStatus.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarContent.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarContent.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarContent.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarContent.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarCookie.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCookie.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarCookie.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCookie.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarEntry.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarEntry.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarEntry.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarEntry.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarLog.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarLog.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarLog.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarLog.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarNameValuePair.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarNameValuePair.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarNameValuePair.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarNameValuePair.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarNameVersion.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarNameVersion.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarNameVersion.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarNameVersion.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPage.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPage.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPage.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPage.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPageTimings.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPageTimings.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPageTimings.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPageTimings.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPostData.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPostData.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPostData.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPostData.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPostDataParam.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPostDataParam.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarPostDataParam.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPostDataParam.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarRequest.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarRequest.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarRequest.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarRequest.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarResponse.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarResponse.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarResponse.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarResponse.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarTimings.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarTimings.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/har/HarTimings.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarTimings.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/json/ISO8601DateFormatter.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/json/ISO8601DateFormatter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/json/ISO8601DateFormatter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/json/ISO8601DateFormatter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/json/ISO8601WithTDZDateFormatter.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/json/ISO8601WithTDZDateFormatter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/core/json/ISO8601WithTDZDateFormatter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/core/json/ISO8601WithTDZDateFormatter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/exception/DecompressionException.java b/browsermob-core/src/main/java/net/lightbody/bmp/exception/DecompressionException.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/exception/DecompressionException.java rename to browsermob-core/src/main/java/net/lightbody/bmp/exception/DecompressionException.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/exception/UnsupportedCharsetException.java b/browsermob-core/src/main/java/net/lightbody/bmp/exception/UnsupportedCharsetException.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/exception/UnsupportedCharsetException.java rename to browsermob-core/src/main/java/net/lightbody/bmp/exception/UnsupportedCharsetException.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/AddHeadersFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/AddHeadersFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/AddHeadersFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/AddHeadersFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/AutoBasicAuthFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/AutoBasicAuthFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/AutoBasicAuthFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/AutoBasicAuthFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/BlacklistFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/BlacklistFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/BlacklistFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/BlacklistFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/BrowserMobHttpFilterChain.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/BrowserMobHttpFilterChain.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/BrowserMobHttpFilterChain.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/BrowserMobHttpFilterChain.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ClientRequestCaptureFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/ClientRequestCaptureFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ClientRequestCaptureFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/ClientRequestCaptureFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HttpConnectHarCaptureFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpConnectHarCaptureFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HttpConnectHarCaptureFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpConnectHarCaptureFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HttpsAwareFiltersAdapter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpsAwareFiltersAdapter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HttpsAwareFiltersAdapter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpsAwareFiltersAdapter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HttpsHostCaptureFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpsHostCaptureFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HttpsHostCaptureFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpsHostCaptureFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HttpsOriginalHostCaptureFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpsOriginalHostCaptureFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HttpsOriginalHostCaptureFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpsOriginalHostCaptureFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/LatencyFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/LatencyFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/LatencyFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/LatencyFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ModifiedRequestAwareFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/ModifiedRequestAwareFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ModifiedRequestAwareFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/ModifiedRequestAwareFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/RegisterRequestFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/RegisterRequestFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/RegisterRequestFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/RegisterRequestFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/RequestFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/RequestFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/RequestFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/RequestFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/RequestFilterAdapter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/RequestFilterAdapter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/RequestFilterAdapter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/RequestFilterAdapter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ResolvedHostnameCacheFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/ResolvedHostnameCacheFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ResolvedHostnameCacheFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/ResolvedHostnameCacheFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ResponseFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/ResponseFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ResponseFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/ResponseFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ResponseFilterAdapter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/ResponseFilterAdapter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ResponseFilterAdapter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/ResponseFilterAdapter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/RewriteUrlFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/RewriteUrlFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/RewriteUrlFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/RewriteUrlFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ServerResponseCaptureFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/ServerResponseCaptureFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ServerResponseCaptureFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/ServerResponseCaptureFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/UnregisterRequestFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/UnregisterRequestFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/UnregisterRequestFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/UnregisterRequestFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/WhitelistFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/WhitelistFilter.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/WhitelistFilter.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/WhitelistFilter.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/support/HttpConnectTiming.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/support/HttpConnectTiming.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/support/HttpConnectTiming.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/support/HttpConnectTiming.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/util/HarCaptureUtil.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/util/HarCaptureUtil.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/util/HarCaptureUtil.java rename to browsermob-core/src/main/java/net/lightbody/bmp/filters/util/HarCaptureUtil.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/ActivityMonitor.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/ActivityMonitor.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/ActivityMonitor.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/ActivityMonitor.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/CaptureType.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/CaptureType.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/CaptureType.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/CaptureType.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/RewriteRule.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/RewriteRule.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/RewriteRule.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/RewriteRule.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/Whitelist.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/Whitelist.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/Whitelist.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/Whitelist.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/auth/AuthType.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/auth/AuthType.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/auth/AuthType.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/auth/AuthType.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/AbstractHostNameRemapper.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/AbstractHostNameRemapper.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/AbstractHostNameRemapper.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/AbstractHostNameRemapper.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolver.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolver.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolver.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolver.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/BasicHostResolver.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/BasicHostResolver.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/BasicHostResolver.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/BasicHostResolver.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/ChainedHostResolver.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/ChainedHostResolver.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/ChainedHostResolver.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/ChainedHostResolver.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/DelegatingHostResolver.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/DelegatingHostResolver.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/DelegatingHostResolver.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/DelegatingHostResolver.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/DnsJavaResolver.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/DnsJavaResolver.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/DnsJavaResolver.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/DnsJavaResolver.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/HostResolver.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/HostResolver.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/HostResolver.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/HostResolver.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/NativeCacheManipulatingResolver.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/NativeCacheManipulatingResolver.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/NativeCacheManipulatingResolver.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/NativeCacheManipulatingResolver.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/NativeResolver.java b/browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/NativeResolver.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/proxy/dns/NativeResolver.java rename to browsermob-core/src/main/java/net/lightbody/bmp/proxy/dns/NativeResolver.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java b/browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java rename to browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/BrowserMobProxyUtil.java b/browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobProxyUtil.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/BrowserMobProxyUtil.java rename to browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobProxyUtil.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/HttpMessageContents.java b/browsermob-core/src/main/java/net/lightbody/bmp/util/HttpMessageContents.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/HttpMessageContents.java rename to browsermob-core/src/main/java/net/lightbody/bmp/util/HttpMessageContents.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/HttpMessageInfo.java b/browsermob-core/src/main/java/net/lightbody/bmp/util/HttpMessageInfo.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/HttpMessageInfo.java rename to browsermob-core/src/main/java/net/lightbody/bmp/util/HttpMessageInfo.java diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/HttpObjectUtil.java b/browsermob-core/src/main/java/net/lightbody/bmp/util/HttpObjectUtil.java similarity index 100% rename from browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/util/HttpObjectUtil.java rename to browsermob-core/src/main/java/net/lightbody/bmp/util/HttpObjectUtil.java diff --git a/browsermob-core-littleproxy/src/main/resources/net/lightbody/bmp/version b/browsermob-core/src/main/resources/net/lightbody/bmp/version similarity index 100% rename from browsermob-core-littleproxy/src/main/resources/net/lightbody/bmp/version rename to browsermob-core/src/main/resources/net/lightbody/bmp/version diff --git a/browsermob-core-littleproxy/src/main/resources/sslSupport/ca-certificate-ec.cer b/browsermob-core/src/main/resources/sslSupport/ca-certificate-ec.cer similarity index 100% rename from browsermob-core-littleproxy/src/main/resources/sslSupport/ca-certificate-ec.cer rename to browsermob-core/src/main/resources/sslSupport/ca-certificate-ec.cer diff --git a/browsermob-core-littleproxy/src/main/resources/sslSupport/ca-certificate-rsa.cer b/browsermob-core/src/main/resources/sslSupport/ca-certificate-rsa.cer similarity index 100% rename from browsermob-core-littleproxy/src/main/resources/sslSupport/ca-certificate-rsa.cer rename to browsermob-core/src/main/resources/sslSupport/ca-certificate-rsa.cer diff --git a/browsermob-core-littleproxy/src/main/resources/sslSupport/ca-keystore-ec.p12 b/browsermob-core/src/main/resources/sslSupport/ca-keystore-ec.p12 similarity index 100% rename from browsermob-core-littleproxy/src/main/resources/sslSupport/ca-keystore-ec.p12 rename to browsermob-core/src/main/resources/sslSupport/ca-keystore-ec.p12 diff --git a/browsermob-core-littleproxy/src/main/resources/sslSupport/ca-keystore-rsa.p12 b/browsermob-core/src/main/resources/sslSupport/ca-keystore-rsa.p12 similarity index 100% rename from browsermob-core-littleproxy/src/main/resources/sslSupport/ca-keystore-rsa.p12 rename to browsermob-core/src/main/resources/sslSupport/ca-keystore-rsa.p12 diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/filters/RewriteUrlFilterTest.groovy b/browsermob-core/src/test/groovy/net/lightbody/bmp/filters/RewriteUrlFilterTest.groovy similarity index 100% rename from browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/filters/RewriteUrlFilterTest.groovy rename to browsermob-core/src/test/groovy/net/lightbody/bmp/filters/RewriteUrlFilterTest.groovy diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/AutoAuthTest.groovy b/browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/AutoAuthTest.groovy similarity index 100% rename from browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/AutoAuthTest.groovy rename to browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/AutoAuthTest.groovy diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/BindAddressTest.groovy b/browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/BindAddressTest.groovy similarity index 100% rename from browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/BindAddressTest.groovy rename to browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/BindAddressTest.groovy diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/BlacklistTest.groovy b/browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/BlacklistTest.groovy similarity index 100% rename from browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/BlacklistTest.groovy rename to browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/BlacklistTest.groovy diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/ChainedProxyAuthTest.groovy b/browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/ChainedProxyAuthTest.groovy similarity index 100% rename from browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/ChainedProxyAuthTest.groovy rename to browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/ChainedProxyAuthTest.groovy diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/FilterChainTest.groovy b/browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/FilterChainTest.groovy similarity index 100% rename from browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/FilterChainTest.groovy rename to browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/FilterChainTest.groovy diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/NewHarTest.groovy b/browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/NewHarTest.groovy similarity index 100% rename from browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/NewHarTest.groovy rename to browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/NewHarTest.groovy diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/WhitelistTest.groovy b/browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/WhitelistTest.groovy similarity index 100% rename from browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/WhitelistTest.groovy rename to browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/WhitelistTest.groovy diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverCacheTest.java b/browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverCacheTest.java similarity index 100% rename from browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverCacheTest.java rename to browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverCacheTest.java diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverTest.java b/browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverTest.java similarity index 100% rename from browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverTest.java rename to browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/dns/AdvancedHostResolverTest.java diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java b/browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java similarity index 100% rename from browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java rename to browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java diff --git a/browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/util/BrowserMobHttpUtilTest.groovy b/browsermob-core/src/test/groovy/net/lightbody/bmp/util/BrowserMobHttpUtilTest.groovy similarity index 100% rename from browsermob-core-littleproxy/src/test/groovy/net/lightbody/bmp/util/BrowserMobHttpUtilTest.groovy rename to browsermob-core/src/test/groovy/net/lightbody/bmp/util/BrowserMobHttpUtilTest.groovy diff --git a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java similarity index 100% rename from browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java rename to browsermob-core/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java diff --git a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/NetworkTest.java b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/NetworkTest.java similarity index 100% rename from browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/NetworkTest.java rename to browsermob-core/src/test/java/net/lightbody/bmp/proxy/NetworkTest.java diff --git a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/QuiescenceTest.java b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/QuiescenceTest.java similarity index 100% rename from browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/QuiescenceTest.java rename to browsermob-core/src/test/java/net/lightbody/bmp/proxy/QuiescenceTest.java diff --git a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/MockServerTest.java b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/MockServerTest.java similarity index 100% rename from browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/MockServerTest.java rename to browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/MockServerTest.java diff --git a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTest.java b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTest.java similarity index 100% rename from browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTest.java rename to browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTest.java diff --git a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTestUtil.java b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTestUtil.java similarity index 100% rename from browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTestUtil.java rename to browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/NewProxyServerTestUtil.java diff --git a/browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/TestConstants.java b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/TestConstants.java similarity index 100% rename from browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/test/util/TestConstants.java rename to browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/TestConstants.java diff --git a/browsermob-legacy/pom.xml b/browsermob-legacy/pom.xml new file mode 100644 index 000000000..cc4904e0c --- /dev/null +++ b/browsermob-legacy/pom.xml @@ -0,0 +1,175 @@ + + + jar + + + browsermob-proxy + net.lightbody.bmp + 2.1.0-beta-7-SNAPSHOT + + 4.0.0 + + browsermob-legacy + BrowserMob Proxy Legacy (Jetty) Module + + + 7.6.16.v20140903 + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Xmx1g -XX:MaxPermSize=256m + + + ${use.littleproxy} + + + + + + + + + net.lightbody.bmp + browsermob-core + ${project.version} + + + + net.lightbody.bmp + mitm + ${project.version} + + + + org.apache.logging.log4j + log4j-api + test + + + org.apache.logging.log4j + log4j-core + test + + + org.apache.logging.log4j + log4j-slf4j-impl + test + + + + org.apache.httpcomponents + httpclient + + + commons-logging + commons-logging + + + + + org.apache.httpcomponents + httpmime + + + + commons-io + commons-io + 2.5 + + + + javax.servlet + servlet-api + 2.5 + + + + org.seleniumhq.selenium + selenium-api + true + + + + org.seleniumhq.selenium + selenium-firefox-driver + test + + + + junit + junit + test + + + + org.hamcrest + hamcrest-library + test + + + + com.codeborne + phantomjsdriver + 1.2.1 + test + + + + io.netty + netty + + + + + + org.jboss.arquillian.extension + arquillian-phantom-driver + test + + + + org.mockito + mockito-core + test + + + + org.eclipse.jetty + jetty-server + ${unit-test-jetty.version} + test + + + + org.eclipse.jetty + jetty-servlet + ${unit-test-jetty.version} + test + + + + org.eclipse.jetty + jetty-servlets + ${unit-test-jetty.version} + test + + + + + + + + legacy + + false + + + + + \ No newline at end of file diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/util/ThreadUtils.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/core/util/ThreadUtils.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/core/util/ThreadUtils.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/core/util/ThreadUtils.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/exception/JettyException.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/exception/JettyException.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/exception/JettyException.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/exception/JettyException.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/exception/NameResolutionException.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/exception/NameResolutionException.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/exception/NameResolutionException.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/exception/NameResolutionException.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/l10n/MessagesUtil.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/l10n/MessagesUtil.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/l10n/MessagesUtil.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/l10n/MessagesUtil.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/BrowserMobProxyHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/BrowserMobProxyHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/BrowserMobProxyHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/BrowserMobProxyHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/HttpObject.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/HttpObject.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/HttpObject.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/HttpObject.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/LegacyProxyServer.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/LegacyProxyServer.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/LegacyProxyServer.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/LegacyProxyServer.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/ProxyServer.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/ProxyServer.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/ProxyServer.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/ProxyServer.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/error/ErrorUtil.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/error/ErrorUtil.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/error/ErrorUtil.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/error/ErrorUtil.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/error/ProxyError.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/error/ProxyError.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/error/ProxyError.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/error/ProxyError.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/AllowAllHostnameVerifier.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/AllowAllHostnameVerifier.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/AllowAllHostnameVerifier.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/AllowAllHostnameVerifier.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/BadURIException.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BadURIException.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/BadURIException.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BadURIException.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpRequest.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpRequest.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpRequest.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpRequest.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpResponse.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpResponse.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpResponse.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpResponse.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/CookieHeadersParser.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/CookieHeadersParser.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/CookieHeadersParser.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/CookieHeadersParser.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/HttpClientInterrupter.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/HttpClientInterrupter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/HttpClientInterrupter.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/HttpClientInterrupter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/HttpDeleteWithBody.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/HttpDeleteWithBody.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/HttpDeleteWithBody.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/HttpDeleteWithBody.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/LegacyHostResolverAdapter.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/LegacyHostResolverAdapter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/LegacyHostResolverAdapter.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/LegacyHostResolverAdapter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/RepeatableInputStreamRequestEntity.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/RepeatableInputStreamRequestEntity.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/RepeatableInputStreamRequestEntity.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/RepeatableInputStreamRequestEntity.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/RequestCallback.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/RequestCallback.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/RequestCallback.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/RequestCallback.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/RequestInfo.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/RequestInfo.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/RequestInfo.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/RequestInfo.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/RequestInterceptor.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/RequestInterceptor.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/RequestInterceptor.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/RequestInterceptor.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/ResponseInterceptor.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/ResponseInterceptor.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/ResponseInterceptor.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/ResponseInterceptor.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/SimulatedSocket.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/SimulatedSocket.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/SimulatedSocket.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/SimulatedSocket.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/SimulatedSocketFactory.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/SimulatedSocketFactory.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/SimulatedSocketFactory.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/SimulatedSocketFactory.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/TrustingSSLSocketFactory.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/TrustingSSLSocketFactory.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/TrustingSSLSocketFactory.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/TrustingSSLSocketFactory.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/WildcardMatchingCredentialsProvider.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/WildcardMatchingCredentialsProvider.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/http/WildcardMatchingCredentialsProvider.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/WildcardMatchingCredentialsProvider.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Applet.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Applet.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Applet.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Applet.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Block.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Block.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Block.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Block.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Break.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Break.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Break.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Break.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Comment.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Comment.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Comment.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Comment.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Composite.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Composite.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Composite.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Composite.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/CompositeFactory.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/CompositeFactory.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/CompositeFactory.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/CompositeFactory.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/DefList.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/DefList.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/DefList.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/DefList.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Element.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Element.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Element.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Element.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Font.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Font.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Font.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Font.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Form.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Form.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Form.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Form.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Frame.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Frame.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Frame.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Frame.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/FrameSet.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/FrameSet.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/FrameSet.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/FrameSet.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Heading.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Heading.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Heading.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Heading.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Image.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Image.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Image.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Image.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Include.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Include.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Include.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Include.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Input.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Input.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Input.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Input.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Link.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Link.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Link.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Link.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/List.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/List.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/List.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/List.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Page.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Page.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Page.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Page.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Script.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Script.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Script.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Script.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Select.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Select.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Select.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Select.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Style.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Style.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Style.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Style.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/StyleLink.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/StyleLink.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/StyleLink.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/StyleLink.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Table.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Table.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Table.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Table.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/TableForm.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/TableForm.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/TableForm.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/TableForm.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Tag.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Tag.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Tag.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Tag.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Target.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Target.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Target.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Target.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Text.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Text.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/Text.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/Text.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/TextArea.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/TextArea.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/html/TextArea.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/html/TextArea.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/Authenticator.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/Authenticator.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/Authenticator.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/Authenticator.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/BasicAuthenticator.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/BasicAuthenticator.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/BasicAuthenticator.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/BasicAuthenticator.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/BufferedOutputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/BufferedOutputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/BufferedOutputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/BufferedOutputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ChunkingInputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ChunkingInputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ChunkingInputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ChunkingInputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ChunkingOutputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ChunkingOutputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ChunkingOutputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ChunkingOutputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ClientCertAuthenticator.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ClientCertAuthenticator.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ClientCertAuthenticator.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ClientCertAuthenticator.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ContextLoader.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ContextLoader.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ContextLoader.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ContextLoader.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/DigestAuthenticator.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/DigestAuthenticator.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/DigestAuthenticator.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/DigestAuthenticator.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/EOFException.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/EOFException.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/EOFException.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/EOFException.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HashSSORealm.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HashSSORealm.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HashSSORealm.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HashSSORealm.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HashUserRealm.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HashUserRealm.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HashUserRealm.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HashUserRealm.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HostSocketListener.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HostSocketListener.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HostSocketListener.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HostSocketListener.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpConnection.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpConnection.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpConnection.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpConnection.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpContext.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpContext.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpContext.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpContext.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpException.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpException.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpException.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpException.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpFields.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpFields.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpFields.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpFields.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpInputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpInputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpInputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpInputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpListener.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpListener.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpListener.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpListener.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpMessage.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpMessage.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpMessage.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpMessage.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpOnlyCookie.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpOnlyCookie.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpOnlyCookie.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpOnlyCookie.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpOutputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpOutputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpOutputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpOutputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpRequest.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpRequest.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpRequest.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpRequest.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpResponse.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpResponse.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpResponse.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpResponse.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpServer.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpServer.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpServer.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpServer.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpTunnel.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpTunnel.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpTunnel.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/HttpTunnel.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/InclusiveByteRange.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/InclusiveByteRange.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/InclusiveByteRange.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/InclusiveByteRange.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/JDBCUserRealm.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/JDBCUserRealm.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/JDBCUserRealm.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/JDBCUserRealm.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/JsseListener.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/JsseListener.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/JsseListener.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/JsseListener.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/MultiPartResponse.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/MultiPartResponse.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/MultiPartResponse.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/MultiPartResponse.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/NCSARequestLog.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/NCSARequestLog.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/NCSARequestLog.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/NCSARequestLog.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/PathMap.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/PathMap.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/PathMap.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/PathMap.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/RequestLog.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/RequestLog.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/RequestLog.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/RequestLog.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ResourceCache.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ResourceCache.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ResourceCache.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ResourceCache.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/SSORealm.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/SSORealm.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/SSORealm.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/SSORealm.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/SecurityConstraint.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/SecurityConstraint.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/SecurityConstraint.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/SecurityConstraint.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/SocketListener.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/SocketListener.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/SocketListener.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/SocketListener.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/SslListener.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/SslListener.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/SslListener.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/SslListener.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/SunJsseListener.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/SunJsseListener.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/SunJsseListener.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/SunJsseListener.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/UserRealm.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/UserRealm.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/UserRealm.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/UserRealm.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/Version.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/Version.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/Version.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/Version.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Connection.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Connection.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Connection.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Connection.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13InputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13InputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13InputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13InputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Listener.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Listener.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Listener.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Listener.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13OutputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13OutputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13OutputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13OutputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Packet.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Packet.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Packet.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13Packet.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13RequestPacket.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13RequestPacket.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13RequestPacket.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13RequestPacket.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13ResponsePacket.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13ResponsePacket.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13ResponsePacket.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/AJP13ResponsePacket.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/jmx/AJP13ListenerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/jmx/AJP13ListenerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/jmx/AJP13ListenerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/ajp/jmx/AJP13ListenerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/AbstractHttpHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/AbstractHttpHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/AbstractHttpHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/AbstractHttpHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/DumpHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/DumpHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/DumpHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/DumpHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ErrorPageHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ErrorPageHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ErrorPageHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ErrorPageHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ExpiryHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ExpiryHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ExpiryHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ExpiryHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ForwardHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ForwardHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ForwardHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ForwardHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/HTAccessHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/HTAccessHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/HTAccessHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/HTAccessHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/IPAccessHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/IPAccessHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/IPAccessHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/IPAccessHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/MsieSslHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/MsieSslHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/MsieSslHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/MsieSslHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/NotFoundHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/NotFoundHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/NotFoundHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/NotFoundHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/NullHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/NullHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/NullHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/NullHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ProxyHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ProxyHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ProxyHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ProxyHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ResourceHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ResourceHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ResourceHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/ResourceHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/RootNotFoundHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/RootNotFoundHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/RootNotFoundHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/RootNotFoundHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/SecurityHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/SecurityHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/SecurityHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/SecurityHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/SetResponseHeadersHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/SetResponseHeadersHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/SetResponseHeadersHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/SetResponseHeadersHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/jmx/ResourceHandlerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/jmx/ResourceHandlerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/jmx/ResourceHandlerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/handler/jmx/ResourceHandlerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpContextMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpContextMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpContextMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpContextMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpHandlerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpHandlerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpHandlerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpHandlerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpListenerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpListenerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpListenerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpListenerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpServerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpServerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpServerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/HttpServerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/JsseListenerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/JsseListenerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/JsseListenerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/JsseListenerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/NCSARequestLogMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/NCSARequestLogMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/NCSARequestLogMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/NCSARequestLogMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SocketChannelListenerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SocketChannelListenerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SocketChannelListenerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SocketChannelListenerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SocketListenerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SocketListenerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SocketListenerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SocketListenerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SunJsseListenerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SunJsseListenerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SunJsseListenerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/jmx/SunJsseListenerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/ByteBufferInputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/ByteBufferInputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/ByteBufferInputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/ByteBufferInputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/SocketChannelListener.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/SocketChannelListener.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/SocketChannelListener.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/SocketChannelListener.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/SocketChannelOutputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/SocketChannelOutputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/SocketChannelOutputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/http/nio/SocketChannelOutputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/Server.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/Server.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/Server.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/Server.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/jmx/ServerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/jmx/ServerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/jmx/ServerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/jmx/ServerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/AbstractSessionManager.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/AbstractSessionManager.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/AbstractSessionManager.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/AbstractSessionManager.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/BasicAuthenticator.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/BasicAuthenticator.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/BasicAuthenticator.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/BasicAuthenticator.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Default.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Default.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Default.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Default.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/DigestAuthenticator.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/DigestAuthenticator.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/DigestAuthenticator.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/DigestAuthenticator.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Dispatcher.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Dispatcher.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Dispatcher.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Dispatcher.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/FilterHolder.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/FilterHolder.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/FilterHolder.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/FilterHolder.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/FormAuthenticator.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/FormAuthenticator.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/FormAuthenticator.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/FormAuthenticator.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/HashSessionManager.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/HashSessionManager.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/HashSessionManager.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/HashSessionManager.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Holder.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Holder.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Holder.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Holder.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Invoker.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Invoker.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Invoker.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/Invoker.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/JSR154Filter.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/JSR154Filter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/JSR154Filter.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/JSR154Filter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/JettyWebConfiguration.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/JettyWebConfiguration.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/JettyWebConfiguration.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/JettyWebConfiguration.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHolder.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHolder.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHolder.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHolder.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpContext.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpContext.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpContext.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpContext.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpRequest.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpRequest.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpRequest.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpRequest.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpResponse.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpResponse.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpResponse.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletHttpResponse.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletIn.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletIn.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletIn.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletIn.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletOut.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletOut.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletOut.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletOut.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletSSL.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletSSL.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletSSL.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletSSL.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletWriter.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletWriter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletWriter.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/ServletWriter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/SessionContext.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/SessionContext.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/SessionContext.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/SessionContext.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/SessionManager.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/SessionManager.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/SessionManager.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/SessionManager.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/TagLibConfiguration.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/TagLibConfiguration.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/TagLibConfiguration.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/TagLibConfiguration.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/WebApplicationContext.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/WebApplicationContext.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/WebApplicationContext.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/WebApplicationContext.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/WebApplicationHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/WebApplicationHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/WebApplicationHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/WebApplicationHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/XMLConfiguration.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/XMLConfiguration.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/XMLConfiguration.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/XMLConfiguration.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/AbstractSessionManagerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/AbstractSessionManagerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/AbstractSessionManagerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/AbstractSessionManagerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ConfigurationMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ConfigurationMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ConfigurationMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ConfigurationMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/FilterHolderMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/FilterHolderMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/FilterHolderMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/FilterHolderMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/HolderMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/HolderMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/HolderMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/HolderMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/JettyWebConfigurationMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/JettyWebConfigurationMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/JettyWebConfigurationMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/JettyWebConfigurationMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHandlerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHandlerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHandlerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHandlerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHolderMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHolderMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHolderMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHolderMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHttpContextMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHttpContextMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHttpContextMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/ServletHttpContextMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/SessionManagerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/SessionManagerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/SessionManagerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/SessionManagerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/WebApplicationContextMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/WebApplicationContextMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/WebApplicationContextMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/WebApplicationContextMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/WebApplicationHandlerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/WebApplicationHandlerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/WebApplicationHandlerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/WebApplicationHandlerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/XMLConfigurationMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/XMLConfigurationMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/XMLConfigurationMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/servlet/jmx/XMLConfigurationMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/win32/Service.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/win32/Service.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/win32/Service.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/jetty/win32/Service.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/Factory.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/Factory.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/Factory.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/Factory.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/Frame.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/Frame.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/Frame.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/Frame.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogFactory.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogFactory.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogFactory.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogFactory.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogImpl.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogImpl.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogImpl.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogImpl.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogSink.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogSink.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogSink.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogSink.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/LogStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/NullLogSink.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/NullLogSink.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/NullLogSink.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/NullLogSink.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/OutputStreamLogSink.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/OutputStreamLogSink.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/OutputStreamLogSink.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/OutputStreamLogSink.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/services/org.apache.commons.logging.LogFactory b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/services/org.apache.commons.logging.LogFactory similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/log/services/org.apache.commons.logging.LogFactory rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/log/services/org.apache.commons.logging.LogFactory diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/AdminServlet.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/AdminServlet.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/AdminServlet.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/AdminServlet.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/CGI.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/CGI.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/CGI.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/CGI.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Debug.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Debug.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Debug.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Debug.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Dump.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Dump.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Dump.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Dump.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Forward.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Forward.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Forward.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/Forward.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartFilter.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartFilter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartFilter.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartFilter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartRequest.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartRequest.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartRequest.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartRequest.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartResponse.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartResponse.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartResponse.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/MultiPartResponse.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/NotFoundServlet.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/NotFoundServlet.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/NotFoundServlet.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/NotFoundServlet.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/PostFileFilter.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/PostFileFilter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/PostFileFilter.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/PostFileFilter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/ProxyServlet.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/ProxyServlet.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/ProxyServlet.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/ProxyServlet.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/SendRedirect.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/SendRedirect.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/SendRedirect.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/SendRedirect.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/SessionDump.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/SessionDump.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/SessionDump.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/SessionDump.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/WelcomeFilter.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/WelcomeFilter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/WelcomeFilter.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/servlet/WelcomeFilter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/start/Classpath.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/start/Classpath.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/start/Classpath.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/start/Classpath.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/start/Main.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/start/Main.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/start/Main.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/start/Main.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/start/Monitor.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/start/Monitor.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/start/Monitor.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/start/Monitor.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/start/README.txt b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/start/README.txt similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/start/README.txt rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/start/README.txt diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/start/Version.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/start/Version.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/start/Version.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/start/Version.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/start/start.config b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/start/start.config similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/start/start.config rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/start/start.config diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/stop/Main.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/stop/Main.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/stop/Main.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/stop/Main.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/B64Code.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/B64Code.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/B64Code.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/B64Code.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/BadResource.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/BadResource.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/BadResource.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/BadResource.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/BlockingQueue.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/BlockingQueue.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/BlockingQueue.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/BlockingQueue.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayISO8859Writer.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayISO8859Writer.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayISO8859Writer.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayISO8859Writer.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayOutputStream2.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayOutputStream2.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayOutputStream2.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayOutputStream2.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayPool.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayPool.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayPool.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteArrayPool.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteBufferOutputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteBufferOutputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteBufferOutputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ByteBufferOutputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/CachedResource.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/CachedResource.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/CachedResource.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/CachedResource.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/CodeException.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/CodeException.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/CodeException.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/CodeException.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ComponentEvent.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ComponentEvent.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ComponentEvent.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ComponentEvent.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ComponentListener.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ComponentListener.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ComponentListener.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ComponentListener.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Container.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Container.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Container.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Container.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Credential.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Credential.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Credential.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Credential.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/DateCache.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/DateCache.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/DateCache.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/DateCache.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/EventProvider.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/EventProvider.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/EventProvider.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/EventProvider.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/FileResource.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/FileResource.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/FileResource.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/FileResource.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/IO.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/IO.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/IO.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/IO.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/InetAddrPort.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/InetAddrPort.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/InetAddrPort.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/InetAddrPort.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/JarFileResource.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/JarFileResource.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/JarFileResource.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/JarFileResource.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/JarResource.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/JarResource.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/JarResource.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/JarResource.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/KeyPairTool.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/KeyPairTool.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/KeyPairTool.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/KeyPairTool.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LazyList.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LazyList.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LazyList.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LazyList.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycle.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycle.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycle.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycle.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleEvent.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleEvent.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleEvent.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleEvent.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleListener.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleListener.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleListener.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleListener.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleThread.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleThread.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleThread.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LifeCycleThread.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LineInput.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LineInput.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LineInput.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LineInput.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Loader.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Loader.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Loader.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Loader.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LogSupport.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LogSupport.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/LogSupport.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/LogSupport.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/MultiException.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/MultiException.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/MultiException.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/MultiException.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/MultiMap.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/MultiMap.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/MultiMap.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/MultiMap.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Observed.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Observed.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Observed.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Observed.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/OutputObserver.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/OutputObserver.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/OutputObserver.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/OutputObserver.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/PKCS12Import.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/PKCS12Import.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/PKCS12Import.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/PKCS12Import.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Password.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Password.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Password.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Password.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Pool.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Pool.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Pool.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Pool.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Primitive.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Primitive.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Primitive.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Primitive.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/QuotedStringTokenizer.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/QuotedStringTokenizer.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/QuotedStringTokenizer.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/QuotedStringTokenizer.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Resource.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Resource.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/Resource.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/Resource.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/RolloverFileOutputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/RolloverFileOutputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/RolloverFileOutputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/RolloverFileOutputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/SingletonList.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/SingletonList.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/SingletonList.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/SingletonList.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringBufferWriter.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringBufferWriter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringBufferWriter.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringBufferWriter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringMap.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringMap.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringMap.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringMap.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringUtil.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringUtil.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringUtil.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/StringUtil.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/TempByteHolder.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/TempByteHolder.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/TempByteHolder.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/TempByteHolder.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/TestCase.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/TestCase.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/TestCase.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/TestCase.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ThreadPool.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ThreadPool.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ThreadPool.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ThreadPool.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ThreadedServer.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ThreadedServer.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/ThreadedServer.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/ThreadedServer.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/TypeUtil.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/TypeUtil.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/TypeUtil.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/TypeUtil.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/URI.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/URI.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/URI.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/URI.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/URLResource.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/URLResource.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/URLResource.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/URLResource.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/UnixCrypt.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/UnixCrypt.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/UnixCrypt.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/UnixCrypt.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/UrlEncoded.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/UrlEncoded.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/UrlEncoded.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/UrlEncoded.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/WriterOutputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/WriterOutputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/WriterOutputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/WriterOutputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/LifeCycleMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/LifeCycleMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/LifeCycleMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/LifeCycleMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ModelMBeanImpl.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ModelMBeanImpl.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ModelMBeanImpl.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ModelMBeanImpl.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ThreadPoolMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ThreadPoolMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ThreadPoolMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ThreadPoolMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ThreadedServerMBean.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ThreadedServerMBean.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ThreadedServerMBean.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/util/jmx/ThreadedServerMBean.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/xml/XmlConfiguration.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/xml/XmlConfiguration.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/xml/XmlConfiguration.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/xml/XmlConfiguration.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/xml/XmlParser.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/xml/XmlParser.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/jetty/xml/XmlParser.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/jetty/xml/XmlParser.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/selenium/ExtendedKeyUsageConstants.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/selenium/ExtendedKeyUsageConstants.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/selenium/ExtendedKeyUsageConstants.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/selenium/ExtendedKeyUsageConstants.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/selenium/KeyStoreManager.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/selenium/KeyStoreManager.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/selenium/KeyStoreManager.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/selenium/KeyStoreManager.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/selenium/SeleniumProxyHandler.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/selenium/SeleniumProxyHandler.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/selenium/SeleniumProxyHandler.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/selenium/SeleniumProxyHandler.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/selenium/ServerCertificateCreator.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/selenium/ServerCertificateCreator.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/selenium/ServerCertificateCreator.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/selenium/ServerCertificateCreator.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/selenium/ThumbprintUtil.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/selenium/ThumbprintUtil.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/selenium/ThumbprintUtil.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/selenium/ThumbprintUtil.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/CappedByteArrayOutputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/CappedByteArrayOutputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/CappedByteArrayOutputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/CappedByteArrayOutputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/ChainableWriter.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/ChainableWriter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/ChainableWriter.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/ChainableWriter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/ClonedInputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/ClonedInputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/ClonedInputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/ClonedInputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/ClonedOutputStream.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/ClonedOutputStream.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/ClonedOutputStream.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/ClonedOutputStream.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/IOUtils.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/IOUtils.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/IOUtils.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/IOUtils.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/LockingChainingWriter.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/LockingChainingWriter.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/LockingChainingWriter.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/LockingChainingWriter.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/TrustEverythingSSLTrustManager.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/TrustEverythingSSLTrustManager.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/proxy/util/TrustEverythingSSLTrustManager.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/util/TrustEverythingSSLTrustManager.java diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/util/DeleteDirectoryTask.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/util/DeleteDirectoryTask.java similarity index 100% rename from browsermob-core/src/main/java/net/lightbody/bmp/util/DeleteDirectoryTask.java rename to browsermob-legacy/src/main/java/net/lightbody/bmp/util/DeleteDirectoryTask.java diff --git a/browsermob-core/src/main/java/org/java_bandwidthlimiter/BandwidthLimiter.java b/browsermob-legacy/src/main/java/org/java_bandwidthlimiter/BandwidthLimiter.java similarity index 100% rename from browsermob-core/src/main/java/org/java_bandwidthlimiter/BandwidthLimiter.java rename to browsermob-legacy/src/main/java/org/java_bandwidthlimiter/BandwidthLimiter.java diff --git a/browsermob-core/src/main/java/org/java_bandwidthlimiter/MaximumTransferExceededException.java b/browsermob-legacy/src/main/java/org/java_bandwidthlimiter/MaximumTransferExceededException.java similarity index 100% rename from browsermob-core/src/main/java/org/java_bandwidthlimiter/MaximumTransferExceededException.java rename to browsermob-legacy/src/main/java/org/java_bandwidthlimiter/MaximumTransferExceededException.java diff --git a/browsermob-core/src/main/java/org/java_bandwidthlimiter/StreamManager.java b/browsermob-legacy/src/main/java/org/java_bandwidthlimiter/StreamManager.java similarity index 100% rename from browsermob-core/src/main/java/org/java_bandwidthlimiter/StreamManager.java rename to browsermob-legacy/src/main/java/org/java_bandwidthlimiter/StreamManager.java diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/html/error.html b/browsermob-legacy/src/main/resources/net/lightbody/bmp/html/error.html similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/html/error.html rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/html/error.html diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/l10n/messages.properties b/browsermob-legacy/src/main/resources/net/lightbody/bmp/l10n/messages.properties similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/l10n/messages.properties rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/l10n/messages.properties diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/http/ajp/jmx/mbean_en.properties b/browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/http/ajp/jmx/mbean_en.properties similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/http/ajp/jmx/mbean_en.properties rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/http/ajp/jmx/mbean_en.properties diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/http/encoding.properties b/browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/http/encoding.properties similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/http/encoding.properties rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/http/encoding.properties diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/http/handler/jmx/mbean_en.properties b/browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/http/handler/jmx/mbean_en.properties similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/http/handler/jmx/mbean_en.properties rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/http/handler/jmx/mbean_en.properties diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/http/jmx/mbean_en.properties b/browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/http/jmx/mbean_en.properties similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/http/jmx/mbean_en.properties rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/http/jmx/mbean_en.properties diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/http/mime.properties b/browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/http/mime.properties similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/http/mime.properties rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/http/mime.properties diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/jetty/jmx/mbean_en.properties b/browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/jetty/jmx/mbean_en.properties similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/jetty/jmx/mbean_en.properties rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/jetty/jmx/mbean_en.properties diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/jetty/servlet/webdefault.xml b/browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/jetty/servlet/webdefault.xml similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/jetty/servlet/webdefault.xml rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/jetty/servlet/webdefault.xml diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/util/jmx/mbean_en.properties b/browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/util/jmx/mbean_en.properties similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/util/jmx/mbean_en.properties rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/util/jmx/mbean_en.properties diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_0.dtd b/browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_0.dtd similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_0.dtd rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_0.dtd diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_1.dtd b/browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_1.dtd similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_1.dtd rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_1.dtd diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_2.dtd b/browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_2.dtd similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_2.dtd rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_2.dtd diff --git a/browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_3.dtd b/browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_3.dtd similarity index 100% rename from browsermob-core/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_3.dtd rename to browsermob-legacy/src/main/resources/net/lightbody/bmp/proxy/jetty/xml/configure_1_3.dtd diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/AddHeadersTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/AddHeadersTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/AddHeadersTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/AddHeadersTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/BlackAndWhiteListTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/BlackAndWhiteListTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/BlackAndWhiteListTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/BlackAndWhiteListTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/BrowserTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/BrowserTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/BrowserTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/BrowserTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/CookieTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/CookieTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/CookieTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/CookieTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/ErrorResponseTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/ErrorResponseTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/ErrorResponseTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/ErrorResponseTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/HarTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/HarTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/HarTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/HarTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/HttpMethodTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/HttpMethodTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/HttpMethodTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/HttpMethodTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/MailingListIssuesTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/MailingListIssuesTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/MailingListIssuesTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/MailingListIssuesTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/PhantomJSTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/PhantomJSTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/PhantomJSTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/PhantomJSTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/RepeatableInputStreamTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/RepeatableInputStreamTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/RepeatableInputStreamTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/RepeatableInputStreamTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/RewriteRuleTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/RewriteRuleTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/RewriteRuleTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/RewriteRuleTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/SslTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/SslTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/SslTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/SslTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/servlet/EchoPayloadServlet.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/servlet/EchoPayloadServlet.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/servlet/EchoPayloadServlet.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/servlet/EchoPayloadServlet.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/servlet/EchoServlet.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/servlet/EchoServlet.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/servlet/EchoServlet.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/servlet/EchoServlet.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/servlet/JsonServlet.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/servlet/JsonServlet.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/servlet/JsonServlet.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/servlet/JsonServlet.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/servlet/SetCookieServlet.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/servlet/SetCookieServlet.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/servlet/SetCookieServlet.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/servlet/SetCookieServlet.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/LocalServer.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/util/LocalServer.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/LocalServer.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/util/LocalServer.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/LocalServerTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/util/LocalServerTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/LocalServerTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/util/LocalServerTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTest.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTest.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTest.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTest.java diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTestUtil.java b/browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTestUtil.java similarity index 100% rename from browsermob-core/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTestUtil.java rename to browsermob-legacy/src/test/java/net/lightbody/bmp/proxy/test/util/ProxyServerTestUtil.java diff --git a/browsermob-core/src/test/java/org/java_bandwidthlimiter/StreamManagerTest.java b/browsermob-legacy/src/test/java/org/java_bandwidthlimiter/StreamManagerTest.java similarity index 100% rename from browsermob-core/src/test/java/org/java_bandwidthlimiter/StreamManagerTest.java rename to browsermob-legacy/src/test/java/org/java_bandwidthlimiter/StreamManagerTest.java diff --git a/browsermob-core/src/test/resources/local-server/a.txt b/browsermob-legacy/src/test/resources/local-server/a.txt similarity index 100% rename from browsermob-core/src/test/resources/local-server/a.txt rename to browsermob-legacy/src/test/resources/local-server/a.txt diff --git a/browsermob-core/src/test/resources/local-server/a.txt.gz b/browsermob-legacy/src/test/resources/local-server/a.txt.gz similarity index 100% rename from browsermob-core/src/test/resources/local-server/a.txt.gz rename to browsermob-legacy/src/test/resources/local-server/a.txt.gz diff --git a/browsermob-core/src/test/resources/local-server/b.txt b/browsermob-legacy/src/test/resources/local-server/b.txt similarity index 100% rename from browsermob-core/src/test/resources/local-server/b.txt rename to browsermob-legacy/src/test/resources/local-server/b.txt diff --git a/browsermob-core/src/test/resources/local-server/c.png b/browsermob-legacy/src/test/resources/local-server/c.png similarity index 100% rename from browsermob-core/src/test/resources/local-server/c.png rename to browsermob-legacy/src/test/resources/local-server/c.png diff --git a/browsermob-core-littleproxy/src/test/resources/log4j2-test.json b/browsermob-legacy/src/test/resources/log4j2-test.json similarity index 100% rename from browsermob-core-littleproxy/src/test/resources/log4j2-test.json rename to browsermob-legacy/src/test/resources/log4j2-test.json diff --git a/pom.xml b/pom.xml index ab4a2e832..e0dcd2291 100644 --- a/pom.xml +++ b/pom.xml @@ -5,8 +5,8 @@ 2.1.0-beta-7-SNAPSHOT browsermob-core + browsermob-legacy browsermob-rest - browsermob-core-littleproxy browsermob-dist mitm From d9ca5695d3fd84fae20a72f63cf283c60a58ad35 Mon Sep 17 00:00:00 2001 From: Jason Eric Klaes Hoetger Date: Sat, 14 May 2016 20:49:47 -0700 Subject: [PATCH 06/10] Dropped -littleproxy from HAR creator string --- .../src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java b/browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java index 05e240e20..e5450c038 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java +++ b/browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java @@ -86,7 +86,7 @@ public class BrowserMobProxyServer implements BrowserMobProxy { private static final Logger log = LoggerFactory.getLogger(BrowserMobProxyServer.class); - private static final HarNameVersion HAR_CREATOR_VERSION = new HarNameVersion("BrowserMob Proxy", BrowserMobProxyUtil.getVersionString() + "-littleproxy"); + private static final HarNameVersion HAR_CREATOR_VERSION = new HarNameVersion("BrowserMob Proxy", BrowserMobProxyUtil.getVersionString()); /* Default MITM resources */ private static final String RSA_KEYSTORE_RESOURCE = "/sslSupport/ca-keystore-rsa.p12"; From 62b8e02bed979fcbdaff69e789ef21d730d0297f Mon Sep 17 00:00:00 2001 From: Jason Eric Klaes Hoetger Date: Sat, 14 May 2016 20:53:27 -0700 Subject: [PATCH 07/10] Updated version to 2.1.0-SNAPSHOT --- browsermob-core/pom.xml | 2 +- browsermob-dist/pom.xml | 2 +- browsermob-legacy/pom.xml | 2 +- browsermob-rest/pom.xml | 2 +- mitm/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/browsermob-core/pom.xml b/browsermob-core/pom.xml index 6f375cba2..1557c7fec 100644 --- a/browsermob-core/pom.xml +++ b/browsermob-core/pom.xml @@ -5,7 +5,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.0-beta-7-SNAPSHOT + 2.1.0-SNAPSHOT 4.0.0 diff --git a/browsermob-dist/pom.xml b/browsermob-dist/pom.xml index 4097953e0..d55f8565d 100644 --- a/browsermob-dist/pom.xml +++ b/browsermob-dist/pom.xml @@ -3,7 +3,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.0-beta-7-SNAPSHOT + 2.1.0-SNAPSHOT 4.0.0 diff --git a/browsermob-legacy/pom.xml b/browsermob-legacy/pom.xml index cc4904e0c..48b8f3746 100644 --- a/browsermob-legacy/pom.xml +++ b/browsermob-legacy/pom.xml @@ -5,7 +5,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.0-beta-7-SNAPSHOT + 2.1.0-SNAPSHOT 4.0.0 diff --git a/browsermob-rest/pom.xml b/browsermob-rest/pom.xml index dbf1a2fc8..55390646f 100644 --- a/browsermob-rest/pom.xml +++ b/browsermob-rest/pom.xml @@ -5,7 +5,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.0-beta-7-SNAPSHOT + 2.1.0-SNAPSHOT 4.0.0 diff --git a/mitm/pom.xml b/mitm/pom.xml index 7150e52ae..dbbfbd882 100644 --- a/mitm/pom.xml +++ b/mitm/pom.xml @@ -3,7 +3,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.0-beta-7-SNAPSHOT + 2.1.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index e0dcd2291..192c3b020 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 net.lightbody.bmp browsermob-proxy - 2.1.0-beta-7-SNAPSHOT + 2.1.0-SNAPSHOT browsermob-core browsermob-legacy From 3c05783c69e37e6e80908a08f4b7efd3f7e91285 Mon Sep 17 00:00:00 2001 From: Jason Eric Klaes Hoetger Date: Sat, 14 May 2016 22:16:36 -0700 Subject: [PATCH 08/10] Removing unnecessary transitive dependency from LP --- browsermob-core/pom.xml | 4 ++++ mitm/pom.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/browsermob-core/pom.xml b/browsermob-core/pom.xml index 1557c7fec..f90335ffa 100644 --- a/browsermob-core/pom.xml +++ b/browsermob-core/pom.xml @@ -56,6 +56,10 @@ com.barchart.udt barchart-udt-bundle + + commons-cli + commons-cli + diff --git a/mitm/pom.xml b/mitm/pom.xml index dbbfbd882..64238ae92 100644 --- a/mitm/pom.xml +++ b/mitm/pom.xml @@ -29,6 +29,10 @@ com.barchart.udt barchart-udt-bundle + + commons-cli + commons-cli + true From f758faecc51406134bd1cc2412ba54f25fb9e28b Mon Sep 17 00:00:00 2001 From: Jason Eric Klaes Hoetger Date: Sat, 14 May 2016 22:31:09 -0700 Subject: [PATCH 09/10] Removed obsolete profile from browsermob-dist --- browsermob-dist/pom.xml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/browsermob-dist/pom.xml b/browsermob-dist/pom.xml index d55f8565d..a58675169 100644 --- a/browsermob-dist/pom.xml +++ b/browsermob-dist/pom.xml @@ -97,23 +97,6 @@ - - include-littleproxy - - - include.littleproxy - true - - - - - - net.lightbody.bmp - browsermob-core-littleproxy - ${project.version} - - - release From 6222a127b9689d1fbc47afa276af77e664915af7 Mon Sep 17 00:00:00 2001 From: Jason Eric Klaes Hoetger Date: Sat, 14 May 2016 23:18:33 -0700 Subject: [PATCH 10/10] Documentation updates for 2.1.0 --- README.md | 125 ++++++++++++++------------------- new-interface-compatibility.md | 13 +--- 2 files changed, 55 insertions(+), 83 deletions(-) diff --git a/README.md b/README.md index e570ef64f..ecc911fca 100644 --- a/README.md +++ b/README.md @@ -2,37 +2,56 @@ BrowserMob Proxy is a simple utility that makes it easy to capture performance data from browsers, typically written using automation toolkits such as Selenium and Watir. -The latest version of BrowserMobProxy is 2.1.0-beta-6. It is the latest release that supports the [new BrowserMobProxy interface](#new-browsermobproxy-api), with the `BrowserMobProxyServer` implementation [powered by LittleProxy](#littleproxy-support). We highly recommend that you use 2.1.0-beta-6 instead of the [previous 2.0.0 release](https://github.com/lightbody/browsermob-proxy/tree/2.0). +The latest version of BrowserMobProxy is 2.1.0, powered by [LittleProxy](https://github.com/adamfisk/LittleProxy). -To use BrowserMob Proxy in your tests, add the `browsermob-core-littleproxy` dependency to your pom: +To use BrowserMob Proxy in your tests or application, add the `browsermob-core` dependency to your pom: ```xml net.lightbody.bmp - browsermob-core-littleproxy - 2.1.0-beta-6 + browsermob-core + 2.1.0 test ``` To run in standalone mode from the command line, download the latest release from the [releases page](https://github.com/lightbody/browsermob-proxy/releases), or [build the latest from source](#building-the-latest-from-source). -## Important Changes since 2.0.0 +For more information on using BrowserMob Proxy with Selenium, see the [Using with Selenium](#using-with-selenium) section. -Since the 2.1 release is still in beta, some features and functionality (including the BrowserMobProxy interface) may change, although the new interface is largely stable. The most important changes from 2.0 are: +## Changes since the 2.1-beta series -- [Separate REST API and Embedded Mode modules](#embedded-mode). Include only the functionality you need. -- [New BrowserMobProxy interface](https://github.com/lightbody/browsermob-proxy/blob/master/browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxy.java). The new interface will completely replace the legacy 2.0 ProxyServer contract in version 3.0 and higher. -- [LittleProxy support](#littleproxy-support). More powerful than the legacy Jetty back-end. For 2.1 releases, LittleProxy support will be provided through the `browsermob-core-littleproxy` module. +**The `browsermob-core-littleproxy` module is now `browsermob-core`** + +After six beta releases, the LittleProxy implementation now supports more features and is more stable than the legacy implementation. To reflect that level of maturity and long-term support, the `browsermob-core` module now uses LittleProxy by default. + +**Note about Legacy support**: In the 2.1-betas, if you were using the `ProxyServer` or `LegacyProxyServer` classes, use the `browsermob-core-legacy` module in 2.1.0. + +*LittleProxy support for `LegacyProxyServer` has moved to `BrowserMobProxyServerLegacyAdapter`*. Using the LittleProxy implementation with the `LegacyProxyServer` interface is still fully supported as a means to help you transition from 2.0.0. Unlike the 2.1-beta series, the `BrowserMobProxyServer` class +no longer implements `LegacyProxyServer`; however, the `BrowserMobProxyServerLegacyAdapter` can be used to integrate legacy code with the new LittleProxy interface. You must still use the `browsermob-core-legacy` module when using the LegacyAdapter. + +```java + LegacyProxyServer proxy = new BrowserMobProxyServerLegacyAdapter(); + proxy.setPort(8081); // method only supported by the legacy interface + proxy.start(); +``` + +## Changes since 2.0.0 + +The new [BrowserMobProxyServer class](browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java) has replaced the legacy ProxyServer implementation. The legacy implementation is no longer actively supported; all new code should use `BrowserMobProxyServer`. We highly recommend that existing code migrate to the new implementation. -See the [New Interface Compatibility Guide](new-interface-compatibility.md) for information on using the new BrowserMobProxy interface with the legacy ProxyServer implementation. +The most important changes from 2.0 are: + +- [Separate REST API and Embedded Mode modules](#embedded-mode). Include only the functionality you need. +- [New BrowserMobProxy interface](browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxy.java). The new interface will completely replace the legacy 2.0 ProxyServer contract in version 3.0 and higher. +- [LittleProxy support](#littleproxy-support). More stable and more powerful than the legacy Jetty back-end. ### New BrowserMobProxy API -BrowserMob Proxy 2.1 includes a [new BrowserMobProxy interface](https://github.com/lightbody/browsermob-proxy/blob/master/browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxy.java) to interact with BrowserMob Proxy programmatically. The new interface defines the functionality that BrowserMob Proxy will support in future releases (including 3.0+). Both the legacy (Jetty-based) ProxyServer class and the new, LittleProxy-powered BrowserMobProxy class support the new BrowserMobProxy interface. +BrowserMob Proxy 2.1 includes a [new BrowserMobProxy interface](browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxy.java) to interact with BrowserMob Proxy programmatically. The new interface defines the functionality that BrowserMob Proxy will support in future releases (including 3.0+). To ease migration, both the legacy (Jetty-based) ProxyServer class and the new, LittleProxy-powered BrowserMobProxy class support the new BrowserMobProxy interface. -To ease the upgrade path to 3.0 and beyond, we _highly_ recommend using the BrowserMobProxy interface, even if you continue to use the legacy ProxyServer implementation. +We _highly_ recommend migrating existing code to the BrowserMobProxy interface using the `BrowserMobProxyServer` class. -### Using the LittleProxy implementation with existing code +### Using the LittleProxy implementation with 2.0.0 code The legacy interface, implicitly defined by the ProxyServer class, has been extracted into `net.lightbody.bmp.proxy.LegacyProxyServer` and is now officially deprecated. The new LittleProxy-based implementation will implement LegacyProxyServer for all 2.1.x releases. This means you can switch to the LittleProxy-powered implementation with minimal change to existing code ([with the exception of interceptors](#http-request-manipulation)): @@ -43,35 +62,18 @@ The legacy interface, implicitly defined by the ProxyServer class, has been extr // [...] // To use the LittleProxy-powered 2.1.0 release, simply change to - // the LegacyProxyServer interface and the new LittleProxy-based implementation: - LegacyProxyServer proxyServer = new BrowserMobProxyServer(); + // the LegacyProxyServer interface and the adapter for the new + // LittleProxy-based implementation: + LegacyProxyServer proxyServer = new BrowserMobProxyServerLegacyAdapter(); proxyServer.start(); // Almost all deprecated 2.0.0 methods are supported by the - // new BrowserMobProxyServer implementation, so in most cases, + // new BrowserMobProxyServerLegacyAdapter implementation, so in most cases, // no further code changes are necessary ``` LegacyProxyServer will not be supported after 3.0 is released, so we recommend migrating to the `BrowserMobProxy` interface as soon as possible. The new interface provides additional functionality and is compatible with both the legacy Jetty-based ProxyServer implementation [(with some exceptions)](new-interface-compatibility.md) and the new LittleProxy implementation. -### LittleProxy Support - -BrowserMob Proxy now supports using LittleProxy instead of Jetty 5 + Apache HTTP Client. To enable LittleProxy support, include the `browsermob-core-littleproxy` artifact: -```xml - - net.lightbody.bmp - browsermob-core-littleproxy - 2.1.0-beta-6 - test - -``` - -Instead of creating a `ProxyServer` instance, create a `BrowserMobProxyServer` instance: -```java - BrowserMobProxy proxy = new BrowserMobProxyServer(); - proxy.start(); -``` - -To continue using the legacy Jetty-based implementation, include the `browsermob-core` artifact. +If you must continue using the legacy Jetty-based implementation, include the `browsermob-core-legacy` artifact instead of `browsermob-core`. ## Features and Usage @@ -208,15 +210,14 @@ system properties will be used to specify the upstream proxy. **New in 2.1:** New [BrowserMobProxy interface](#new-browsermobproxy-api) for Embedded Mode -BrowserMob Proxy 2.1 separates the Embedded Mode and REST API into two modules. If you only need Embedded Mode functionality, add the `browsermob-core-littleproxy` artifact as a dependency. The REST API artifact is `browsermob-rest`. +BrowserMob Proxy 2.1 separates the Embedded Mode and REST API into two modules. If you only need Embedded Mode functionality, add the `browsermob-core` artifact as a dependency. The REST API artifact is `browsermob-rest`. If you're using Java and Selenium, the easiest way to get started is to embed the project directly in your test. First, you'll need to make sure that all the dependencies are imported in to the project. You can find them in the *lib* directory. Or, if you're using Maven, you can add this to your pom: ```xml net.lightbody.bmp - - browsermob-core-littleproxy - 2.1.0-beta-6 + browsermob-core + 2.1.0 test ``` @@ -251,6 +252,9 @@ You can use the REST API with Selenium however you want. But if you're writing y // start the browser up WebDriver driver = new FirefoxDriver(capabilities); + // enable more detailed HAR capture, if desired (see CaptureType for the complete list) + proxy.enableHarCaptureTypes(CaptureType.REQUEST_CONTENT, CaptureType.RESPONSE_CONTENT); + // create a new HAR with the label "yahoo.com" proxy.newHar("yahoo.com"); @@ -263,9 +267,9 @@ You can use the REST API with Selenium however you want. But if you're writing y ### HTTP Request Manipulation -**HTTP request manipulation is changing with LittleProxy.** The LittleProxy-based interceptors are easier to use and more reliable. The legacy ProxyServer implementation **will not** support the new interceptor methods. +**HTTP request manipulation has changed in 2.1.0 with LittleProxy.** The LittleProxy-based interceptors are easier to use and more reliable. The legacy ProxyServer implementation **will not** support the new interceptor methods. -#### LittleProxy interceptors +#### 2.1.0 (LittleProxy) interceptors There are four new methods to support request and response interception in LittleProxy: @@ -365,13 +369,13 @@ Consult the Java API docs for more info. ### SSL Support -**BrowserMob with LittleProxy now supports full MITM:** For most users, MITM will work out-of-the-box with default settings. Install the [ca-certificate-rsa.cer](/browsermob-core/src/main/resources/sslSupport/ca-certificate-rsa.cer) file in your browser or HTTP client to avoid untrusted certificate warnings. Generally, it is safer to generate your own private key, rather than using the .cer files distributed with BrowserMob Proxy. See the [README file in the `mitm` module](/mitm/README.md) for instructions on generating or using your own root certificate and private key with MITM. +**BrowserMob Proxy 2.1.0 now supports full MITM:** For most users, MITM will work out-of-the-box with default settings. Install the [ca-certificate-rsa.cer](/browsermob-core/src/main/resources/sslSupport/ca-certificate-rsa.cer) file in your browser or HTTP client to avoid untrusted certificate warnings. Generally, it is safer to generate your own private key, rather than using the .cer files distributed with BrowserMob Proxy. See the [README file in the `mitm` module](/mitm/README.md) for instructions on generating or using your own root certificate and private key with MITM. -**Legacy Jetty-based ProxyServer support for MITM:** As of version 2.1.0-beta-4, the legacy `ProxyServer` implementation uses the same `ca-certificate-rsa.cer` root certificate as the LittleProxy implementation. The previous cybervillainsCA.cer certificate has been removed. +**Legacy Jetty-based ProxyServer support for MITM:** The legacy `ProxyServer` implementation uses the same `ca-certificate-rsa.cer` root certificate as the default BrowserMobProxyServer implementation. The previous cybervillainsCA.cer certificate has been removed. **Note: DO NOT** permanently install the .cer files distributed with BrowserMob Proxy in users' browsers. They should be used for testing only and must not be used with general web browsing. -If you're doing testing with Selenium, you'll want to make sure that the browser profile that gets set up by Selenium not only has the proxy configured, but also has the CA installed. Unfortuantely, there is no API for doing this in Selenium, so you'll have to solve it uniquely for each browser type. We hope to make this easier in upcoming releases. +If you're doing testing with Selenium, you'll want to make sure that the browser profile that gets set up by Selenium not only has the proxy configured, but also has the CA installed. Unfortunately, there is no API for doing this in Selenium; it must be done manually for each browser and environment. ### NodeJS Support @@ -381,34 +385,9 @@ NodeJS bindings for browswermob-proxy are available [here](https://github.com/zz When running in stand-alone mode, the proxy loads the default logging configuration from the conf/bmp-logging.yaml file. To increase/decrease the logging level, change the logging entry for net.lightbody.bmp. -**New in 2.1:** Neither Embedded Mode nor the REST API include an slf4j static binding, so you no longer need to exclude the slf4j-jdk14 dependency when including `browsermob-core`, `browsermob-core-littleproxy` or `browsermob-rest`. - ### DNS Resolution -**New in 2.1:** BrowserMob Proxy enables native DNS resolution by default. - -The legacy Jetty-based ProxyServer implementation uses XBill (dnsjava) resolution, but automatically falls back to the default JVM DNS resolution if XBill cannot resolve the address. To disable native DNS fallback, set the `bmp.allowNativeDnsFallback` JVM property to `false`. You can also use the `BrowserMobProxy.setHostNameResolver()` method to disable native DNS fallback and/or dnsjava resolution itself. - -When running from the command line: - - $ JAVA_OPTS="-Dbmp.allowNativeDnsFallback=false" sh browsermob-proxy - -or in Windows: - - C:\browsermob-proxy\bin> set JAVA_OPTS="-Dbmp.allowNativeDnsFallback=false" - C:\browsermob-proxy\bin> browsermob-proxy.bat - -If you are running in Embedded Mode (for example, within a Selenium test) you can disable native fallback or dnsjava by setting the implementation directly: - -```java - BrowserMobProxy proxyServer = new BrowserMobProxyServer(); - // use only dnsjava - proxyServer.setHostNameResolver(ClientUtil.createDnsJavaResolver()); - // or use only native resolution - proxyServer.setHostNameResolver(ClientUtil.createNativeCacheManipulatingResolver()); - //... - proxyServer.start(0); -``` +The BrowserMobProxyServer implementation uses native DNS resolution by default, but supports custom DNS resolution and advanced DNS manipulation. See the [ClientUtil](browsermob-proxy/browsermob-core/src/main/java/net/lightbody/bmp/client/ClientUtil.java) class for information on DNS manipulation using the dnsjava resolver. ## Building the latest from source @@ -416,14 +395,14 @@ You'll need maven (`brew install maven` if you're on OS X); use the `release` pr [~]$ mvn -DskipTests -P release -You'll find the standalone BrowserMob Proxy distributable zip at `browsermob-dist/target/browsermob-proxy-2.1.0-beta-6-SNAPSHOT-bin.zip`. Unzip the contents and run the `browsermob-proxy` or `browsermob-proxy.bat` files in the `bin` directory. +You'll find the standalone BrowserMob Proxy distributable zip at `browsermob-dist/target/browsermob-proxy-2.1.1-SNAPSHOT-bin.zip`. Unzip the contents and run the `browsermob-proxy` or `browsermob-proxy.bat` files in the `bin` directory. When you build the latest code from source, you'll have access to the latest snapshot release. To use the SNAPSHOT version in your code, modify the version in your pom: ```xml net.lightbody.bmp - browsermob-core-littleproxy - 2.1.0-beta-7-SNAPSHOT + browsermob-core + 2.1.1-SNAPSHOT test ``` diff --git a/new-interface-compatibility.md b/new-interface-compatibility.md index 95a3bfda4..718df7b96 100644 --- a/new-interface-compatibility.md +++ b/new-interface-compatibility.md @@ -1,14 +1,7 @@ -New BrowserMobProxy Interface -============================= -The 2.1 beta releases of BrowserMob Proxy contain the new `BrowserMobProxy` interface. This interface specifies the methods that will be available in BrowserMob Proxy 3.0 and beyond. -Both the legacy `ProxyServer` class and the new LittleProxy-based `BrowserMobProxyServer` class implement the `BrowserMobProxy` interface, so all users can begin using the new -interface, even when using the legacy `ProxyServer` implementation. +# New BrowserMobProxy interface +The `BrowserMobProxyServer` class, powered by LitleProxy, implements the ``BrowserMobProxy` interface. The following table lists the current level of support for the new interface in the modern and legacy BMP implementations: -# New Interface Support -The LittleProxy-based implementation will support the entire `BrowserMobProxy` interface. The Jetty-based implementation in `ProxyServer` will support most, but not all, features of -the new interface. The following table lists the current level of support for the new interface: - -`BrowserMobProxy` method | `ProxyServer` (Jetty 5) | `BrowserMobProxyServer` (LittleProxy) +`BrowserMobProxy` method | Legacy `ProxyServer` (Jetty 5) | `BrowserMobProxyServer` (LittleProxy) :----------------------- | :---------------------: | :-----------------------------------: `start` (and related) | X | X `stop` | X | X