yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Connection.java, [...]: Moved to gnu/java/net/protocol.

Browse Source 
2003-10-08  Michael Koch  <konqueror@gmx.de>

	* gnu/gcj/protocol/core/Connection.java,
	gnu/gcj/protocol/core/CoreInputStream.java,
	gnu/gcj/protocol/core/Handler.java,
	gnu/gcj/protocol/core/natCoreInputStream.cc,
	gnu/gcj/protocol/file/Connection.java,
	gnu/gcj/protocol/file/Handler.java,
	gnu/gcj/protocol/gcjlib/Connection.java,
	gnu/gcj/protocol/gcjlib/Handler.java,
	gnu/gcj/protocol/http/Connection.java,
	gnu/gcj/protocol/http/Handler.java,
	gnu/gcj/protocol/jar/Connection.java,
	gnu/gcj/protocol/jar/Handler.java: Moved to gnu/java/net/protocol.
	* gnu/java/net/protocol/core/Connection.java,
	gnu/java/net/protocol/core/CoreInputStream.java,
	gnu/java/net/protocol/core/Handler.java,
	gnu/java/net/protocol/core/natCoreInputStream.cc,
	gnu/java/net/protocol/file/Connection.java,
	gnu/java/net/protocol/file/Handler.java,
	gnu/java/net/protocol/gcjlib/Connection.java,
	gnu/java/net/protocol/gcjlib/Handler.java,
	gnu/java/net/protocol/http/Connection.java,
	gnu/java/net/protocol/http/Handler.java,
	gnu/java/net/protocol/jar/Connection.java,
	gnu/java/net/protocol/jar/Handler.java: Moved from gnu/gcj/protocol.
	* gnu/gcj/runtime/FirstThread.java,
	java/net/URL.java: Use moved protocol handlers.
	* Makefile.am
	(ordinary_java_source_files): Moved files.
	(nat_source_files): Likewise.
	* Makefile.in: Regenerated.

From-SVN: r72233
This commit is contained in:
Michael Koch
2003-10-08 16:28:30 +00:00
committed by Michael Koch
parent 36805693cb
commit 85aa13b287
17 changed files with 197 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/gnu/gcj/runtime/FirstThread.java
+3 -3
View File
@@ -90,7 +90,7 @@ final class FirstThread extends Thread
// classes are only referred to via Class.forName(), so we add an
// explicit mention of them here.
static final Class Kcert = java.security.cert.Certificate.class;
static final Class Kfile = gnu.gcj.protocol.file.Handler.class;
static final Class Khttp = gnu.gcj.protocol.http.Handler.class;
static final Class Kjar = gnu.gcj.protocol.jar.Handler.class;
static final Class Kfile = gnu.java.net.protocol.file.Handler.class;
static final Class Khttp = gnu.java.net.protocol.http.Handler.class;
static final Class Kjar = gnu.java.net.protocol.jar.Handler.class;
}
libjava/gnu/gcj/protocol/core/Connection.java → libjava/gnu/java/net/protocol/core/Connection.java
+9 -6
View File
@@ -8,11 +8,14 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package gnu.gcj.protocol.core;
package gnu.java.net.protocol.core;
import gnu.gcj.Core;
import java.net.*;
import java.io.*;
import java.io.InputStream;
import java.io.IOException;
import java.net.ProtocolException;
import java.net.URL;
import java.net.URLConnection;
import java.util.Map;
import java.util.Vector;
import java.util.Hashtable;
@@ -31,7 +34,7 @@ class Connection extends URLConnection
private Core core;
public Connection(URL url)
public Connection (URL url)
{
super(url);
}
@@ -98,7 +101,7 @@ class Connection extends URLConnection
return null;
}
if (n < hdrVec.size())
return getField((String) hdrVec.elementAt(n));
return getField ((String) hdrVec.elementAt(n));
return null;
}
@@ -115,7 +118,7 @@ class Connection extends URLConnection
return null;
}
if (n < hdrVec.size())
return getKey((String) hdrVec.elementAt(n));
return getKey ((String) hdrVec.elementAt(n));
return null;
}
libjava/gnu/gcj/protocol/core/CoreInputStream.java → libjava/gnu/java/net/protocol/core/CoreInputStream.java
+4 -3
View File
@@ -8,11 +8,12 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package gnu.gcj.protocol.core;
package gnu.java.net.protocol.core;
import java.io.*;
import gnu.gcj.Core;
import gnu.gcj.RawData;
import java.io.InputStream;
import java.io.IOException;
public class CoreInputStream extends InputStream
{
@@ -82,7 +83,7 @@ public class CoreInputStream extends InputStream
// be larger than an int since the result of subtracting 2 positive
// ints will always fit in an int. Since we have to return a long
// anyway, numBytes might as well just be a long.
long numBytes = Math.min((long) (count - pos), n < 0 ? 0L : n);
long numBytes = Math.min ((long) (count - pos), n < 0 ? 0L : n);
pos += numBytes;
return numBytes;
}
libjava/gnu/gcj/protocol/core/Handler.java → libjava/gnu/java/net/protocol/core/Handler.java
+2 -3
View File
@@ -8,18 +8,17 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package gnu.gcj.protocol.core;
package gnu.java.net.protocol.core;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
import java.io.IOException;
/**
* @author Anthony Green <green@redhat.com>
* @date August 13, 2001.
*/
public class Handler extends URLStreamHandler
{
protected URLConnection openConnection(URL url) throws IOException
libjava/gnu/gcj/protocol/core/natCoreInputStream.cc → libjava/gnu/java/net/protocol/core/natCoreInputStream.cc
+12 -10
View File
@@ -18,28 +18,30 @@ details. */
#include <java/lang/NullPointerException.h>
#include <java/lang/ArrayIndexOutOfBoundsException.h>
#include <gnu/gcj/protocol/core/CoreInputStream.h>
#include <gnu/java/net/protocol/core/CoreInputStream.h>
jint
gnu::gcj::protocol::core::CoreInputStream::unsafeGetByte (jlong offset)
gnu::java::net::protocol::core::CoreInputStream::unsafeGetByte (jlong offset)
{
return ((char *)ptr)[offset];
return ((char*) ptr) [offset];
}
jint
gnu::gcj::protocol::core::CoreInputStream::copyIntoByteArray (jbyteArray dest,
jint offset,
jint numBytes)
gnu::java::net::protocol::core::CoreInputStream::copyIntoByteArray (jbyteArray dest,
jint offset,
jint numBytes)
{
if (! dest)
throw new java::lang::NullPointerException;
if (!dest)
throw new ::java::lang::NullPointerException;
jsize destSize = JvGetArrayLength (dest);
if (offset < 0 || numBytes < 0 || offset + numBytes < 0
|| offset + numBytes > destSize
|| pos + numBytes > count)
throw new java::lang::ArrayIndexOutOfBoundsException;
throw new ::java::lang::ArrayIndexOutOfBoundsException;
void *pcore = (void *) &((char*)ptr)[pos];
void *pcore = (void *) &((char*) ptr) [pos];
void *pdest = (void *) (elements (dest) + offset);
memcpy (pdest, pcore, numBytes);
libjava/gnu/gcj/protocol/file/Connection.java → libjava/gnu/java/net/protocol/file/Connection.java
+14 -5
View File
@@ -8,10 +8,19 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package gnu.gcj.protocol.file;
package gnu.java.net.protocol.file;
import java.net.*;
import java.io.*;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.net.ProtocolException;
import java.net.URL;
import java.net.URLConnection;
import java.util.Map;
import java.util.Vector;
import java.util.Hashtable;
@@ -122,7 +131,7 @@ class Connection extends URLConnection
return null;
}
if (n < hdrVec.size())
return getField((String) hdrVec.elementAt(n));
return getField ((String) hdrVec.elementAt(n));
return null;
}
@@ -139,7 +148,7 @@ class Connection extends URLConnection
return null;
}
if (n < hdrVec.size())
return getKey((String) hdrVec.elementAt(n));
return getKey ((String) hdrVec.elementAt(n));
return null;
}
libjava/gnu/gcj/protocol/file/Handler.java → libjava/gnu/java/net/protocol/file/Handler.java
+2 -2
View File
@@ -8,12 +8,12 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package gnu.gcj.protocol.file;
package gnu.java.net.protocol.file;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
import java.io.IOException;
/**
* @author Warren Levy <warrenl@cygnus.com>
libjava/gnu/gcj/protocol/gcjlib/Connection.java → libjava/gnu/java/net/protocol/gcjlib/Connection.java
+13 -9
View File
@@ -9,18 +9,21 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package gnu.gcj.protocol.gcjlib;
import java.io.*;
import java.net.*;
package gnu.java.net.protocol.gcjlib;
import java.io.InputStream;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import gnu.gcj.Core;
import gnu.gcj.protocol.core.CoreInputStream;
import gnu.gcj.runtime.SharedLibHelper;
import gnu.java.net.protocol.core.CoreInputStream;
/**
* @author Tom Tromey <tromey@redhat.com>
* @date January 10, 2003
*/
class Connection extends URLConnection
{
String solib;
@@ -30,12 +33,13 @@ class Connection extends URLConnection
public Connection (URL url) throws MalformedURLException
{
super (url);
int index = url.getFile().indexOf("!/");
int index = url.getFile().indexOf ("!/");
if (index == -1)
throw new MalformedURLException("couldn't find !/ in gcjlib URL");
throw new MalformedURLException ("couldn't find !/ in gcjlib URL");
name = url.getFile().substring(index + 2);
solib = url.getFile().substring(0, index);
name = url.getFile().substring (index + 2);
solib = url.getFile().substring (0, index);
}
public void connect() throws IOException
libjava/gnu/gcj/protocol/gcjlib/Handler.java → libjava/gnu/java/net/protocol/gcjlib/Handler.java
+4 -4
View File
@@ -8,17 +8,17 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package gnu.gcj.protocol.gcjlib;
package gnu.java.net.protocol.gcjlib;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
import java.io.IOException;
public class Handler extends URLStreamHandler
{
protected URLConnection openConnection(URL url) throws IOException
protected URLConnection openConnection (URL url) throws IOException
{
return new Connection(url);
return new Connection (url);
}
}
libjava/gnu/gcj/protocol/http/Connection.java → libjava/gnu/java/net/protocol/http/Connection.java
+18 -10
View File
@@ -8,20 +8,24 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package gnu.gcj.protocol.http;
package gnu.java.net.protocol.http;
import java.net.*;
import java.io.*;
import java.io.BufferedInputStream;
import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.net.HttpURLConnection;
import java.net.InetAddress;
import java.net.ProtocolException;
import java.net.Socket;
import java.net.URL;
import java.net.URLConnection;
import java.util.Map;
import java.util.Vector;
import java.util.Hashtable;
import java.util.Enumeration;
/**
* @author Warren Levy <warrenl@cygnus.com>
* @date March 29, 1999.
*/
/**
* Written using on-line Java Platform 1.2 API Specification, as well
* as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
@@ -32,6 +36,10 @@ import java.util.Enumeration;
* doOutput.
*/
/**
* @author Warren Levy <warrenl@cygnus.com>
* @date March 29, 1999.
*/
class Connection extends HttpURLConnection
{
protected Socket sock = null;
@@ -233,7 +241,7 @@ class Connection extends HttpURLConnection
}
if (n < hdrVec.size())
return getField((String) hdrVec.elementAt(n));
return getField ((String) hdrVec.elementAt(n));
return null;
}
@@ -251,7 +259,7 @@ class Connection extends HttpURLConnection
}
if (n < hdrVec.size())
return getKey((String) hdrVec.elementAt(n));
return getKey ((String) hdrVec.elementAt(n));
return null;
}
libjava/gnu/gcj/protocol/http/Handler.java → libjava/gnu/java/net/protocol/http/Handler.java
+10 -11
View File
@@ -8,18 +8,12 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package gnu.gcj.protocol.http;
package gnu.java.net.protocol.http;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
import java.io.IOException;
/**
* @author Warren Levy
* @author Anthony Green <green@redhat.com>
* @date March 26, 1999.
*/
/**
* Written using on-line Java Platform 1.2 API Specification, as well
@@ -27,14 +21,19 @@ import java.io.IOException;
* Status: Minimal functionality.
*/
/**
* @author Warren Levy
* @author Anthony Green <green@redhat.com>
* @date March 26, 1999.
*/
public class Handler extends URLStreamHandler
{
protected URLConnection openConnection(URL url) throws IOException
protected URLConnection openConnection (URL url) throws IOException
{
return new Connection(url);
return new Connection (url);
}
protected int getDefaultPort ()
protected int getDefaultPort()
{
return 80;
}
libjava/gnu/gcj/protocol/jar/Connection.java → libjava/gnu/java/net/protocol/jar/Connection.java
+15 -18
View File
@@ -6,21 +6,21 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package gnu.gcj.protocol.jar;
package gnu.java.net.protocol.jar;
import java.net.URL;
import java.net.URLConnection;
import java.net.JarURLConnection;
import java.net.URLStreamHandler;
import java.net.MalformedURLException;
import java.net.ProtocolException;
import java.io.IOException;
import java.io.InputStream;
import java.io.IOException;
import java.io.File;
import java.io.FileOutputStream;
import java.net.JarURLConnection;
import java.net.MalformedURLException;
import java.net.ProtocolException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
import java.util.Hashtable;
import java.util.jar.JarFile;
import java.util.zip.ZipFile;
import java.util.Hashtable;
/**
* Written using on-line Java Platform 1.2 API Specification.
@@ -28,9 +28,6 @@ import java.util.Hashtable;
* @author Kresten Krab Thorup <krab@gnu.org>
* @date Aug 10, 1999.
*/
public class Connection extends JarURLConnection
{
static Hashtable file_cache = new Hashtable();
@@ -53,22 +50,22 @@ public class Connection extends JarURLConnection
if (jarfile != null)
return jarfile;
URL jarFileURL = getJarFileURL ();
URL jarFileURL = getJarFileURL();
if (jarFileURL.getProtocol ().equals ("file")
&& jarFileURL.getHost ().equals (""))
if (jarFileURL.getProtocol().equals ("file")
&& jarFileURL.getHost().equals (""))
{
if (getUseCaches())
{
jarfile = (JarFile) file_cache.get(jarFileURL);
if (jarfile == null)
{
jarfile = new JarFile (jarFileURL.getFile ());
jarfile = new JarFile (jarFileURL.getFile());
file_cache.put (jarFileURL, jarfile);
}
}
else
jarfile = new JarFile (jarFileURL.getFile ());
jarfile = new JarFile (jarFileURL.getFile());
}
else
{
@@ -78,7 +75,7 @@ public class Connection extends JarURLConnection
File f = File.createTempFile("cache", "jar");
FileOutputStream fos = new FileOutputStream(f);
int len = 0;
while((len = is.read(buf)) != -1)
while ((len = is.read(buf)) != -1)
fos.write(buf, 0, len);
fos.close();
// Always verify the Manifest, open read only and delete when done.
libjava/gnu/gcj/protocol/jar/Handler.java → libjava/gnu/java/net/protocol/jar/Handler.java
+2 -3
View File
@@ -8,18 +8,17 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package gnu.gcj.protocol.jar;
package gnu.java.net.protocol.jar;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
import java.io.IOException;
/**
* @author Kresten Krab Thorup <krab@gnu.org>
* @date August 13, 1999.
*/
public class Handler extends URLStreamHandler
{
protected URLConnection openConnection(URL url) throws IOException