Util: Rename modified apache classes (Gitlab ticket #353)

to avoid conflict in applications linking to apache jars
As requested by 'mesh' project
Remove with-libhttpclient-java build option
No known external uses other than obsolete i2pcontrol plugin

core/java/src/net/i2p/apache/http/conn/ssl/DefaultHostnameVerifier.java

@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.conn.ssl;
+package net.i2p.apache.http.conn.ssl;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -49,8 +49,8 @@ import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSession;
 import javax.security.auth.x500.X500Principal;
 
-import org.apache.http.conn.util.InetAddressUtils;
-import org.apache.http.conn.util.PublicSuffixMatcher;
+import net.i2p.apache.http.conn.util.InetAddressUtils;
+import net.i2p.apache.http.conn.util.PublicSuffixMatcher;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;

core/java/src/net/i2p/apache/http/conn/ssl/package.html

@@ -5,4 +5,7 @@ For I2PSSSLSocketFactory.
 Small modifications to remove additional Apache dependencies.
 Apache 2.0 license.
 </p>
+<p>
+Moved to net.i2p.apache.* packages in release 1.8.0 (API 0.9.54).
+</p>
 </body></html>

core/java/src/net/i2p/apache/http/conn/util/InetAddressUtils.java

@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.conn.util;
+package net.i2p.apache.http.conn.util;
 
 import java.util.regex.Pattern;
 

core/java/src/net/i2p/apache/http/conn/util/PublicSuffixList.java

@@ -24,12 +24,12 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.conn.util;
+package net.i2p.apache.http.conn.util;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.http.util.Args;
+import net.i2p.apache.http.util.Args;
 
 /**
  * Public suffix is a set of DNS names or wildcards concatenated with dots. It represents

core/java/src/net/i2p/apache/http/conn/util/PublicSuffixListParser.java

@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.conn.util;
+package net.i2p.apache.http.conn.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;

core/java/src/net/i2p/apache/http/conn/util/PublicSuffixMatcher.java

@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.conn.util;
+package net.i2p.apache.http.conn.util;
 
 import java.net.IDN;
 import java.util.Collection;
@@ -32,7 +32,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.http.util.Args;
+import net.i2p.apache.http.util.Args;
 
 /**
  * Utility class that can test if DNS names match the content of the Public Suffix List.
@@ -40,7 +40,7 @@ import org.apache.http.util.Args;
  * An up-to-date list of suffixes can be obtained from
  * <a href="http://publicsuffix.org/">publicsuffix.org</a>
  *
- * @see org.apache.http.conn.util.PublicSuffixList
+ * @see net.i2p.apache.http.conn.util.PublicSuffixList
  *
  * @since 4.4
  */

core/java/src/net/i2p/apache/http/conn/util/package.html

@@ -5,4 +5,7 @@ For HostnameVerifier.
 Small modifications to remove additional Apache dependencies.
 Apache 2.0 license.
 </p>
+<p>
+Moved to net.i2p.apache.* packages in release 1.8.0 (API 0.9.54).
+</p>
 </body></html>

core/java/src/net/i2p/apache/http/util/Args.java

@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.util;
+package net.i2p.apache.http.util;
 
 public class Args {
 

core/java/src/net/i2p/apache/http/util/package.html

@@ -5,4 +5,7 @@ For HostnameVerifier.
 Small modifications to remove additional Apache dependencies.
 Apache 2.0 license.
 </p>
+<p>
+Moved to net.i2p.apache.* packages in release 1.8.0 (API 0.9.54).
+</p>
 </body></html>

core/java/src/net/i2p/util/Addresses.java

@@ -28,7 +28,7 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.http.conn.util.InetAddressUtils;
+import net.i2p.apache.http.conn.util.InetAddressUtils;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;

core/java/src/net/i2p/util/I2PSSLSocketFactory.java

@@ -85,10 +85,10 @@ import net.i2p.I2PAppContext;
 import net.i2p.crypto.KeyStoreUtil;
 import net.i2p.data.DataHelper;
 
-import org.apache.http.conn.ssl.DefaultHostnameVerifier;
-import org.apache.http.conn.util.PublicSuffixList;
-import org.apache.http.conn.util.PublicSuffixListParser;
-import org.apache.http.conn.util.PublicSuffixMatcher;
+import net.i2p.apache.http.conn.ssl.DefaultHostnameVerifier;
+import net.i2p.apache.http.conn.util.PublicSuffixList;
+import net.i2p.apache.http.conn.util.PublicSuffixListParser;
+import net.i2p.apache.http.conn.util.PublicSuffixMatcher;
 
 /**
  * Loads trusted ASCII certs from ~/.i2p/certificates/ and $I2P/certificates/.