AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
zzz
2022-05-11 07:54:56 -04:00
parent bf27bf140d
commit 07dbab9f02
20 changed files with 35 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/build.xml
View File

@@ -43,13 +43,6 @@
<condition property="translation.includes" value="NOTHING" else="gnu/getopt/*.properties" >
<istrue value="${with-libgetopt-java}" />
</condition>
<!-- fixups if we're using httpclient.jar and httpcore.jar for org.apache.http classes -->
<condition property="source.exclude3" value="org/apache/http/**" else="NOTHING" >
<istrue value="${with-libhttpclient-java}" />
</condition>
<condition property="javac.classpath.mod3" value="build/httpclient.jar:build/httpcore.jar:" else="" >
<istrue value="${with-libhttpclient-java}" />
</condition>
<!-- fixups if we're using json-simple.jar for org.json.simple classes -->
<condition property="source.exclude4" value="org/json/simple/**" else="NOTHING" >
<istrue value="${with-libjson-simple-java}" />
@@ -57,7 +50,7 @@
<condition property="javac.classpath.mod4" value="build/json-simple.jar:" else="" >
<istrue value="${with-libjson-simple-java}" />
</condition>
<property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath.mod3}${javac.classpath.mod4}${javac.classpath}" />
<property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath.mod4}${javac.classpath}" />
<!-- jar classpath fixups -->
<condition property="gettext.jar" value="/usr/share/java/libintl.jar" else="" >
@@ -66,9 +59,6 @@
<condition property="getopt.jar" value="/usr/share/java/gnu-getopt.jar" else="" >
<istrue value="${with-libgetopt-java}" />
</condition>
<condition property="httpclient.jar" value="/usr/share/java/httpclient.jar /usr/share/java/httpcore.jar" else="" >
<istrue value="${with-libhttpclient-java}" />
</condition>
<condition property="json-simple.jar" value="/usr/share/java/json-simple.jar" else="" >
<istrue value="${with-libjson-simple-java}" />
</condition>
@@ -87,7 +77,6 @@
<include name="**/*.java" />
<exclude name="${source.exclude1}" />
<exclude name="${source.exclude2}" />
<exclude name="${source.exclude3}" />
<exclude name="${source.exclude4}" />
</javac>
</target>
@@ -118,7 +107,7 @@
<!-- the getopt translation files -->
<fileset dir="src" includes="${translation.includes}" />
<manifest>
<attribute name="${manifest.classpath.name}" value="${gettext.jar} ${getopt.jar} ${httpclient.jar}" />
<attribute name="${manifest.classpath.name}" value="${gettext.jar} ${getopt.jar}" />
<attribute name="Specification-Title" value="I2P Core API" />
<attribute name="Specification-Version" value="${api.version}" />
<attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />
@@ -341,7 +330,7 @@
</copy>
<jar destfile="./build/i2pscalatest.jar" basedir="./build/obj_scala_jar" includes="**/*.class">
<manifest>
<attribute name="${manifest.classpath.name}" value="${gettext.jar} ${getopt.jar} ${httpclient.jar}" />
<attribute name="${manifest.classpath.name}" value="${gettext.jar} ${getopt.jar}" />
<attribute name="Specification-Title" value="I2P Core API" />
<attribute name="Specification-Version" value="${api.version}" />
<attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />
@@ -371,7 +360,7 @@
<!-- the getopt translation files -->
<fileset dir="src" includes="${translation.includes}" />
<manifest>
<attribute name="${manifest.classpath.name}" value="${gettext.jar} ${getopt.jar} ${httpclient.jar}" />
<attribute name="${manifest.classpath.name}" value="${gettext.jar} ${getopt.jar}" />
<attribute name="Specification-Title" value="I2P Core API" />
<attribute name="Specification-Version" value="${api.version}" />
<attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />

6
core/java/src/org/apache/http/conn/ssl/DefaultHostnameVerifier.java → core/java/src/net/i2p/apache/http/conn/ssl/DefaultHostnameVerifier.java
View File

@@ -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;

3
core/java/src/org/apache/http/conn/ssl/package.html → core/java/src/net/i2p/apache/http/conn/ssl/package.html
View File

@@ -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>

2
core/java/src/org/apache/http/conn/util/InetAddressUtils.java → core/java/src/net/i2p/apache/http/conn/util/InetAddressUtils.java
View File

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

4
core/java/src/org/apache/http/conn/util/PublicSuffixList.java → core/java/src/net/i2p/apache/http/conn/util/PublicSuffixList.java
View File

@@ -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

2
core/java/src/org/apache/http/conn/util/PublicSuffixListParser.java → core/java/src/net/i2p/apache/http/conn/util/PublicSuffixListParser.java
View File

@@ -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;

6
core/java/src/org/apache/http/conn/util/PublicSuffixMatcher.java → core/java/src/net/i2p/apache/http/conn/util/PublicSuffixMatcher.java
View File

@@ -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
*/

3
core/java/src/org/apache/http/conn/util/package.html → core/java/src/net/i2p/apache/http/conn/util/package.html
View File

@@ -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>

2
core/java/src/org/apache/http/util/Args.java → core/java/src/net/i2p/apache/http/util/Args.java
View File

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

3
core/java/src/org/apache/http/util/package.html → core/java/src/net/i2p/apache/http/util/package.html
View File

@@ -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>

2
core/java/src/net/i2p/util/Addresses.java
View File

@@ -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;

8
core/java/src/net/i2p/util/I2PSSLSocketFactory.java
View File

@@ -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/.