After merge fixes

Author: slaskawi

common/src/main/java/org/jgroups/ping/common/stream/InsecureStreamProvider.java

@@ -27,7 +27,7 @@ public boolean verify(String arg0, SSLSession arg1) {
         }
     };
 
-    static final TrustManager[] INSECURE_TRUST_MANAGERS = new TrustManager[] {
+    public static final TrustManager[] INSECURE_TRUST_MANAGERS = new TrustManager[] {
         new X509TrustManager() {
             @Override
             public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {}

common/src/main/java/org/openshift/ping/common/stream/TokenStreamProvider.java

@@ -1,9 +1,8 @@
 package org.openshift.ping.common.stream;
 
-import static org.openshift.ping.common.Utils.openFile;
+import static org.jgroups.ping.common.Utils.openFile;
 
 import java.io.FileNotFoundException;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLConnection;
@@ -20,6 +19,9 @@
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 
+import org.jgroups.ping.common.stream.BaseStreamProvider;
+import org.jgroups.ping.common.stream.InsecureStreamProvider;
+
 /**
  * @author <a href="mailto:[email protected]">Ricardo Martinelli</a>
  */