commit 070e308763249bb180325b1323e63d50693351c2
author ejona <ejona@google.com> Thu Aug 21 16:12:14 2014 -0700
committer Eric Anderson <ejona@google.com> Thu Jan 08 14:42:38 2015 -0800
tree 374cdb584ec6b00b56859b566fe2b7635e51d486
parent 7a2d8df753454700aeee0495abd0aee43a8374e1

Have stricter dependencies and build in modules.

This is useful in making sure we don't have stray dependencies and brings us closer to compiling for platforms like Android. We can now remove unwanted dependencies one module at a time, or get individual modules to build on Android.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=73849551

core/src/main/java/com/google/net/stubby/http2/okhttp/Http2Request.java

diff --git a/core/src/main/java/com/google/net/stubby/http2/okhttp/Http2Request.java b/core/src/main/java/com/google/net/stubby/http2/okhttp/Http2Request.java
index 67cce9f..5f8d47c 100644
--- a/core/src/main/java/com/google/net/stubby/http2/okhttp/Http2Request.java
+++ b/core/src/main/java/com/google/net/stubby/http2/okhttp/Http2Request.java
@@ -4,6 +4,7 @@
 import com.google.net.stubby.RequestRegistry;
 import com.google.net.stubby.Response;
 import com.google.net.stubby.Status;
+import com.google.net.stubby.newtransport.okhttp.Headers;
 import com.google.net.stubby.transport.Framer;
 import com.google.net.stubby.transport.Transport;
 
@@ -44,4 +45,4 @@
   public Response getResponse() {
     return response;
   }
-}
\ No newline at end of file
+}

core/src/main/java/com/google/net/stubby/http2/okhttp/Http2Response.java

diff --git a/core/src/main/java/com/google/net/stubby/http2/okhttp/Http2Response.java b/core/src/main/java/com/google/net/stubby/http2/okhttp/Http2Response.java
index f112764..205b488 100644
--- a/core/src/main/java/com/google/net/stubby/http2/okhttp/Http2Response.java
+++ b/core/src/main/java/com/google/net/stubby/http2/okhttp/Http2Response.java
@@ -2,6 +2,7 @@
 
 import com.google.net.stubby.Response;
 import com.google.net.stubby.Status;
+import com.google.net.stubby.newtransport.okhttp.Headers;
 import com.google.net.stubby.transport.Framer;
 import com.google.net.stubby.transport.Transport;
 
@@ -37,4 +38,4 @@
       close(new Status(Transport.Code.INTERNAL, ioe));
     }
   }
-}
\ No newline at end of file
+}

core/src/main/java/com/google/net/stubby/newtransport/okhttp/Headers.java

diff --git a/core/src/main/java/com/google/net/stubby/http2/okhttp/Headers.java b/core/src/main/java/com/google/net/stubby/newtransport/okhttp/Headers.java
similarity index 94%
rename from core/src/main/java/com/google/net/stubby/http2/okhttp/Headers.java
rename to core/src/main/java/com/google/net/stubby/newtransport/okhttp/Headers.java
index dd62408..1775f7b 100644
--- a/core/src/main/java/com/google/net/stubby/http2/okhttp/Headers.java
+++ b/core/src/main/java/com/google/net/stubby/newtransport/okhttp/Headers.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.http2.okhttp;
+package com.google.net.stubby.newtransport.okhttp;
 
 import com.google.common.collect.Lists;
 
@@ -29,4 +29,4 @@
     headers.add(RESPONSE_STATUS_OK);
     return headers;
   }
-}
\ No newline at end of file
+}

core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java b/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java
index 292adc3..114e024 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java
+++ b/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java
@@ -7,7 +7,6 @@
 import com.google.common.io.ByteStreams;
 import com.google.net.stubby.MethodDescriptor;
 import com.google.net.stubby.Status;
-import com.google.net.stubby.http2.okhttp.Headers;
 import com.google.net.stubby.newtransport.AbstractClientTransport;
 import com.google.net.stubby.newtransport.AbstractStream;
 import com.google.net.stubby.newtransport.ClientStream;

testing/src/main/java/com/google/net/stubby/testing/utils/ssl/SslContextFactory.java

diff --git a/testing/src/main/java/com/google/net/stubby/testing/utils/ssl/SslContextFactory.java b/testing/src/main/java/com/google/net/stubby/testing/utils/ssl/SslContextFactory.java
index 84a17b8..8225bb8 100644
--- a/testing/src/main/java/com/google/net/stubby/testing/utils/ssl/SslContextFactory.java
+++ b/testing/src/main/java/com/google/net/stubby/testing/utils/ssl/SslContextFactory.java
@@ -1,7 +1,5 @@
 package com.google.net.stubby.testing.utils.ssl;
 
-import io.netty.util.internal.SystemPropertyUtil;
-
 import java.security.KeyStore;
 
 import javax.net.ssl.KeyManagerFactory;
@@ -33,7 +31,7 @@
       keyStore.load(SslKeyStore.asInputStream(), SslKeyStore.getKeyStorePassword());
 
       // Set up key manager factory to use our key store
-      String algorithm = SystemPropertyUtil.get("ssl.KeyManagerFactory.algorithm");
+      String algorithm = System.getProperty("ssl.KeyManagerFactory.algorithm");
       if (algorithm == null) {
         algorithm = "SunX509";
       }