Updated java.net package to OpenJDK 7.

This commit is contained in:
jfrijters 2011-07-07 11:32:17 +00:00
Родитель 01c195a581
Коммит 8efcba73b7
3 изменённых файлов: 89 добавлений и 67 удалений

Просмотреть файл

@ -8686,72 +8686,77 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK7@/jdk/src/share/classes/java/math/package-info.java @OPENJDK7@/jdk/src/share/classes/java/math/package-info.java
@OPENJDK7@/jdk/src/share/classes/java/math/RoundingMode.java @OPENJDK7@/jdk/src/share/classes/java/math/RoundingMode.java
@OPENJDK7@/jdk/src/share/classes/java/math/SignedMutableBigInteger.java @OPENJDK7@/jdk/src/share/classes/java/math/SignedMutableBigInteger.java
@OPENJDK6@/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java @OPENJDK7@/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
@OPENJDK6@/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java @OPENJDK7@/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
@OPENJDK6@/jdk/src/share/classes/java/net/Authenticator.java @OPENJDK7@/jdk/src/share/classes/java/net/Authenticator.java
@OPENJDK6@/jdk/src/share/classes/java/net/BindException.java @OPENJDK7@/jdk/src/share/classes/java/net/BindException.java
@OPENJDK6@/jdk/src/share/classes/java/net/CacheRequest.java @OPENJDK7@/jdk/src/share/classes/java/net/CacheRequest.java
@OPENJDK6@/jdk/src/share/classes/java/net/CacheResponse.java @OPENJDK7@/jdk/src/share/classes/java/net/CacheResponse.java
@OPENJDK6@/jdk/src/share/classes/java/net/ConnectException.java @OPENJDK7@/jdk/src/share/classes/java/net/ConnectException.java
@OPENJDK6@/jdk/src/share/classes/java/net/ContentHandler.java @OPENJDK7@/jdk/src/share/classes/java/net/ContentHandler.java
@OPENJDK6@/jdk/src/share/classes/java/net/ContentHandlerFactory.java @OPENJDK7@/jdk/src/share/classes/java/net/ContentHandlerFactory.java
@OPENJDK6@/jdk/src/share/classes/java/net/CookieHandler.java @OPENJDK7@/jdk/src/share/classes/java/net/CookieHandler.java
@OPENJDK7@/jdk/src/share/classes/java/net/CookieManager.java @OPENJDK7@/jdk/src/share/classes/java/net/CookieManager.java
@OPENJDK6@/jdk/src/share/classes/java/net/CookiePolicy.java @OPENJDK7@/jdk/src/share/classes/java/net/CookiePolicy.java
@OPENJDK6@/jdk/src/share/classes/java/net/CookieStore.java @OPENJDK7@/jdk/src/share/classes/java/net/CookieStore.java
@OPENJDK6@/jdk/src/share/classes/java/net/DatagramPacket.java @OPENJDK7@/jdk/src/share/classes/java/net/DatagramPacket.java
@OPENJDK6@/jdk/src/share/classes/java/net/DatagramSocket.java @OPENJDK7@/jdk/src/share/classes/java/net/DatagramSocket.java
@OPENJDK6@/jdk/src/share/classes/java/net/DatagramSocketImpl.java @OPENJDK7@/jdk/src/share/classes/java/net/DatagramSocketImpl.java
@OPENJDK6@/jdk/src/share/classes/java/net/DatagramSocketImplFactory.java @OPENJDK7@/jdk/src/share/classes/java/net/DatagramSocketImplFactory.java
@OPENJDK6@/jdk/src/share/classes/java/net/FileNameMap.java @OPENJDK7@/jdk/src/share/classes/java/net/FileNameMap.java
@OPENJDK7@/jdk/src/share/classes/java/net/HttpCookie.java @OPENJDK7@/jdk/src/share/classes/java/net/HttpCookie.java
@OPENJDK6@/jdk/src/share/classes/java/net/HttpRetryException.java @OPENJDK7@/jdk/src/share/classes/java/net/HttpRetryException.java
@OPENJDK7@/jdk/src/share/classes/java/net/HttpURLConnection.java @OPENJDK7@/jdk/src/share/classes/java/net/HttpURLConnection.java
@OPENJDK6@/jdk/src/share/classes/java/net/IDN.java @OPENJDK7@/jdk/src/share/classes/java/net/IDN.java
@OPENJDK6@/jdk/src/share/classes/java/net/Inet4Address.java @OPENJDK7@/jdk/src/share/classes/java/net/Inet4Address.java
@OPENJDK6@/jdk/src/share/classes/java/net/Inet4AddressImpl.java @OPENJDK7@/jdk/src/share/classes/java/net/Inet4AddressImpl.java
@OPENJDK6@/jdk/src/share/classes/java/net/Inet6Address.java @OPENJDK7@/jdk/src/share/classes/java/net/Inet6Address.java
@OPENJDK6@/jdk/src/share/classes/java/net/Inet6AddressImpl.java @OPENJDK7@/jdk/src/share/classes/java/net/Inet6AddressImpl.java
@OPENJDK6@/jdk/src/share/classes/java/net/InetAddress.java @OPENJDK7@/jdk/src/share/classes/java/net/InetAddress.java
@OPENJDK6@/jdk/src/share/classes/java/net/InetAddressImpl.java @OPENJDK7@/jdk/src/share/classes/java/net/InetAddressImpl.java
@OPENJDK7@/jdk/src/share/classes/java/net/InetSocketAddress.java @OPENJDK7@/jdk/src/share/classes/java/net/InetSocketAddress.java
@OPENJDK7@/jdk/src/share/classes/java/net/InMemoryCookieStore.java @OPENJDK7@/jdk/src/share/classes/java/net/InMemoryCookieStore.java
@OPENJDK6@/jdk/src/share/classes/java/net/InterfaceAddress.java @OPENJDK7@/jdk/src/share/classes/java/net/InterfaceAddress.java
@OPENJDK6@/jdk/src/share/classes/java/net/JarURLConnection.java @OPENJDK7@/jdk/src/share/classes/java/net/JarURLConnection.java
@OPENJDK6@/jdk/src/share/classes/java/net/MalformedURLException.java @OPENJDK7@/jdk/src/share/classes/java/net/MalformedURLException.java
@OPENJDK6@/jdk/src/share/classes/java/net/MulticastSocket.java @OPENJDK7@/jdk/src/share/classes/java/net/MulticastSocket.java
@OPENJDK6@/jdk/src/share/classes/java/net/NetPermission.java @OPENJDK7@/jdk/src/share/classes/java/net/NetPermission.java
@OPENJDK6@/jdk/src/share/classes/java/net/NetworkInterface.java @OPENJDK7@/jdk/src/share/classes/java/net/NetworkInterface.java
@OPENJDK6@/jdk/src/share/classes/java/net/NoRouteToHostException.java @OPENJDK7@/jdk/src/share/classes/java/net/NoRouteToHostException.java
@OPENJDK6@/jdk/src/share/classes/java/net/PasswordAuthentication.java @OPENJDK7@/jdk/src/share/classes/java/net/PasswordAuthentication.java
@OPENJDK6@/jdk/src/share/classes/java/net/PortUnreachableException.java @OPENJDK7@/jdk/src/share/classes/java/net/PortUnreachableException.java
@OPENJDK6@/jdk/src/share/classes/java/net/ProtocolException.java @OPENJDK7@/jdk/src/share/classes/java/net/ProtocolException.java
@OPENJDK6@/jdk/src/share/classes/java/net/Proxy.java @OPENJDK7@/jdk/src/share/classes/java/net/ProtocolFamily.java
@OPENJDK6@/jdk/src/share/classes/java/net/ProxySelector.java @OPENJDK7@/jdk/src/share/classes/java/net/Proxy.java
@OPENJDK6@/jdk/src/share/classes/java/net/ResponseCache.java @OPENJDK7@/jdk/src/share/classes/java/net/ProxySelector.java
@OPENJDK6@/jdk/src/share/classes/java/net/SecureCacheResponse.java @OPENJDK7@/jdk/src/share/classes/java/net/ResponseCache.java
@OPENJDK6@/jdk/src/share/classes/java/net/ServerSocket.java @OPENJDK7@/jdk/src/share/classes/java/net/SdpSocketImpl.java
@OPENJDK6@/jdk/src/share/classes/java/net/Socket.java @OPENJDK7@/jdk/src/share/classes/java/net/SecureCacheResponse.java
@OPENJDK6@/jdk/src/share/classes/java/net/SocketAddress.java @OPENJDK7@/jdk/src/share/classes/java/net/ServerSocket.java
@OPENJDK6@/jdk/src/share/classes/java/net/SocketException.java @OPENJDK7@/jdk/src/share/classes/java/net/Socket.java
@OPENJDK6@/jdk/src/share/classes/java/net/SocketImpl.java @OPENJDK7@/jdk/src/share/classes/java/net/SocketAddress.java
@OPENJDK6@/jdk/src/share/classes/java/net/SocketImplFactory.java @OPENJDK7@/jdk/src/share/classes/java/net/SocketException.java
@OPENJDK6@/jdk/src/share/classes/java/net/SocketOptions.java @OPENJDK7@/jdk/src/share/classes/java/net/SocketImpl.java
@OPENJDK6@/jdk/src/share/classes/java/net/SocketPermission.java @OPENJDK7@/jdk/src/share/classes/java/net/SocketImplFactory.java
@OPENJDK6@/jdk/src/share/classes/java/net/SocketTimeoutException.java @OPENJDK7@/jdk/src/share/classes/java/net/SocketOption.java
@OPENJDK6@/jdk/src/share/classes/java/net/SocksConsts.java @OPENJDK7@/jdk/src/share/classes/java/net/SocketOptions.java
@OPENJDK6@/jdk/src/share/classes/java/net/SocksSocketImpl.java @OPENJDK7@/jdk/src/share/classes/java/net/SocketPermission.java
@OPENJDK6@/jdk/src/share/classes/java/net/UnknownHostException.java @OPENJDK7@/jdk/src/share/classes/java/net/SocketTimeoutException.java
@OPENJDK6@/jdk/src/share/classes/java/net/UnknownServiceException.java @OPENJDK7@/jdk/src/share/classes/java/net/SocksConsts.java
@OPENJDK6@/jdk/src/share/classes/java/net/URI.java @OPENJDK7@/jdk/src/share/classes/java/net/SocksSocketImpl.java
@OPENJDK6@/jdk/src/share/classes/java/net/URISyntaxException.java @OPENJDK7@/jdk/src/share/classes/java/net/StandardProtocolFamily.java
@OPENJDK6@/jdk/src/share/classes/java/net/URL.java @OPENJDK7@/jdk/src/share/classes/java/net/StandardSocketOptions.java
@OPENJDK6@/jdk/src/share/classes/java/net/URLClassLoader.java @OPENJDK7@/jdk/src/share/classes/java/net/UnknownHostException.java
@OPENJDK7@/jdk/src/share/classes/java/net/UnknownServiceException.java
@OPENJDK7@/jdk/src/share/classes/java/net/URI.java
@OPENJDK7@/jdk/src/share/classes/java/net/URISyntaxException.java
@OPENJDK7@/jdk/src/share/classes/java/net/URL.java
@OPENJDK7@/jdk/src/share/classes/java/net/URLClassLoader.java
@OPENJDK7@/jdk/src/share/classes/java/net/URLConnection.java @OPENJDK7@/jdk/src/share/classes/java/net/URLConnection.java
@OPENJDK6@/jdk/src/share/classes/java/net/URLDecoder.java @OPENJDK7@/jdk/src/share/classes/java/net/URLDecoder.java
@OPENJDK6@/jdk/src/share/classes/java/net/URLEncoder.java @OPENJDK7@/jdk/src/share/classes/java/net/URLEncoder.java
@OPENJDK6@/jdk/src/share/classes/java/net/URLStreamHandler.java @OPENJDK7@/jdk/src/share/classes/java/net/URLStreamHandler.java
@OPENJDK6@/jdk/src/share/classes/java/net/URLStreamHandlerFactory.java @OPENJDK7@/jdk/src/share/classes/java/net/URLStreamHandlerFactory.java
@OPENJDK6@/jdk/src/share/classes/java/nio/Buffer.java @OPENJDK6@/jdk/src/share/classes/java/nio/Buffer.java
@OPENJDK6@/jdk/src/share/classes/java/nio/ByteOrder.java @OPENJDK6@/jdk/src/share/classes/java/nio/ByteOrder.java
@OPENJDK7@/jdk/src/share/classes/java/nio/channels/AsynchronousChannel.java @OPENJDK7@/jdk/src/share/classes/java/nio/channels/AsynchronousChannel.java
@ -11552,7 +11557,7 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/Timer.java @OPENJDK6@/jdk/src/share/classes/sun/misc/Timer.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/UCDecoder.java @OPENJDK6@/jdk/src/share/classes/sun/misc/UCDecoder.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/UCEncoder.java @OPENJDK6@/jdk/src/share/classes/sun/misc/UCEncoder.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/URLClassPath.java @OPENJDK7@/jdk/src/share/classes/sun/misc/URLClassPath.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/UUDecoder.java @OPENJDK6@/jdk/src/share/classes/sun/misc/UUDecoder.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/UUEncoder.java @OPENJDK6@/jdk/src/share/classes/sun/misc/UUEncoder.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/VMNotification.java @OPENJDK6@/jdk/src/share/classes/sun/misc/VMNotification.java
@ -11619,7 +11624,8 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/sun/net/TelnetProtocolException.java @OPENJDK6@/jdk/src/share/classes/sun/net/TelnetProtocolException.java
@OPENJDK6@/jdk/src/share/classes/sun/net/TransferProtocolClient.java @OPENJDK6@/jdk/src/share/classes/sun/net/TransferProtocolClient.java
@OPENJDK6@/jdk/src/share/classes/sun/net/URLCanonicalizer.java @OPENJDK6@/jdk/src/share/classes/sun/net/URLCanonicalizer.java
@OPENJDK6@/jdk/src/share/classes/sun/net/util/IPAddressUtil.java @OPENJDK7@/jdk/src/share/classes/sun/net/util/IPAddressUtil.java
@OPENJDK7@/jdk/src/share/classes/sun/net/util/URLUtil.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/ApplicationLaunchException.java @OPENJDK6@/jdk/src/share/classes/sun/net/www/ApplicationLaunchException.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/content/image/gif.java @OPENJDK6@/jdk/src/share/classes/sun/net/www/content/image/gif.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/content/image/jpeg.java @OPENJDK6@/jdk/src/share/classes/sun/net/www/content/image/jpeg.java
@ -13137,8 +13143,8 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/windows/classes/java/io/Win32FileSystem.java @OPENJDK6@/jdk/src/windows/classes/java/io/Win32FileSystem.java
@OPENJDK6@/jdk/src/windows/classes/java/lang/ProcessEnvironment.java @OPENJDK6@/jdk/src/windows/classes/java/lang/ProcessEnvironment.java
@OPENJDK6@/jdk/src/windows/classes/java/lang/Terminator.java @OPENJDK6@/jdk/src/windows/classes/java/lang/Terminator.java
@OPENJDK6@/jdk/src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java @OPENJDK7@/jdk/src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java
@OPENJDK6@/jdk/src/windows/classes/java/net/PlainSocketImpl.java @OPENJDK7@/jdk/src/windows/classes/java/net/PlainSocketImpl.java
@OPENJDK6@/jdk/src/windows/classes/java/util/prefs/WindowsPreferences.java @OPENJDK6@/jdk/src/windows/classes/java/util/prefs/WindowsPreferences.java
@OPENJDK6@/jdk/src/windows/classes/java/util/prefs/WindowsPreferencesFactory.java @OPENJDK6@/jdk/src/windows/classes/java/util/prefs/WindowsPreferencesFactory.java
@OPENJDK7@/jdk/src/windows/classes/sun/net/NetHooks.java @OPENJDK7@/jdk/src/windows/classes/sun/net/NetHooks.java

Просмотреть файл

@ -82,7 +82,6 @@ assembly.class
@OPENJDK7@/jdk/src/share/classes/java/lang/ref/*.class @OPENJDK7@/jdk/src/share/classes/java/lang/ref/*.class
@OPENJDK7@/jdk/src/share/classes/java/lang/reflect/*.class @OPENJDK7@/jdk/src/share/classes/java/lang/reflect/*.class
@OPENJDK7@/jdk/src/share/classes/java/math/*.class @OPENJDK7@/jdk/src/share/classes/java/math/*.class
@OPENJDK6@/jdk/src/share/classes/java/net/*.class
@OPENJDK7@/jdk/src/share/classes/java/net/*.class @OPENJDK7@/jdk/src/share/classes/java/net/*.class
@OPENJDK6@/jdk/src/share/classes/java/nio/*.class @OPENJDK6@/jdk/src/share/classes/java/nio/*.class
@OPENJDK6@/jdk/src/share/classes/java/nio/channels/*.class @OPENJDK6@/jdk/src/share/classes/java/nio/channels/*.class
@ -115,7 +114,7 @@ assembly.class
@OPENJDK6@/jdk/src/share/classes/sun/net/smtp/*.class @OPENJDK6@/jdk/src/share/classes/sun/net/smtp/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/spi/*.class @OPENJDK6@/jdk/src/share/classes/sun/net/spi/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/spi/nameservice/*.class @OPENJDK6@/jdk/src/share/classes/sun/net/spi/nameservice/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/util/*.class @OPENJDK7@/jdk/src/share/classes/sun/net/util/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/www/*.class @OPENJDK6@/jdk/src/share/classes/sun/net/www/*.class
@OPENJDK7@/jdk/src/share/classes/sun/net/www/*.class @OPENJDK7@/jdk/src/share/classes/sun/net/www/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/www/content/text/*.class @OPENJDK6@/jdk/src/share/classes/sun/net/www/content/text/*.class
@ -161,7 +160,8 @@ assembly.class
@OPENJDK7@/jdk/src/solaris/classes/sun/net/www/protocol/http/ntlm/*.class @OPENJDK7@/jdk/src/solaris/classes/sun/net/www/protocol/http/ntlm/*.class
@OPENJDK6@/jdk/src/windows/classes/java/io/*.class @OPENJDK6@/jdk/src/windows/classes/java/io/*.class
@OPENJDK6@/jdk/src/windows/classes/java/lang/*.class @OPENJDK6@/jdk/src/windows/classes/java/lang/*.class
@OPENJDK6@/jdk/src/windows/classes/java/net/*.class @OPENJDK7@/jdk/src/windows/classes/java/net/*.class
@OPENJDK7@/jdk/src/windows/classes/sun/net/*.class
@OPENJDK6@/jdk/src/windows/classes/sun/nio/ch/*.class @OPENJDK6@/jdk/src/windows/classes/sun/nio/ch/*.class
@OPENJDK7@/jdk/src/windows/classes/sun/security/provider/NativePRNG.class @OPENJDK7@/jdk/src/windows/classes/sun/security/provider/NativePRNG.class
} }

Просмотреть файл

@ -4269,6 +4269,22 @@ namespace IKVM.NativeCode.java
#endif #endif
} }
public static object getByIndex0(int index)
{
#if FIRST_PASS
return null;
#else
foreach (jnNetworkInterface iface in GetInterfaces().javaInterfaces)
{
if (iface.getIndex() == index)
{
return iface;
}
}
return null;
#endif
}
public static object getByInetAddress0(object addr) public static object getByInetAddress0(object addr)
{ {
#if FIRST_PASS #if FIRST_PASS