Skip to content

R
riscv-gcc-1
Commit 8d288df0 by Tom Tromey Committed by Tom Tromey
Options

sources.am, [...]: Rebuilt. 

	* sources.am, Makefile.in: Rebuilt.
	* gnu/java/net/protocol/jar/Connection.java: Removed.
	* java/net/JarURLConnection.java: Removed.

From-SVN: r113739
parent 793da155
Showing with 18 additions and 581 deletions
libjava/ChangeLog
2006-05-13 Tom Tromey <tromey@redhat.com>
* sources.am, Makefile.in: Rebuilt.
* gnu/java/net/protocol/jar/Connection.java: Removed.
* java/net/JarURLConnection.java: Removed.
2006-05-13 Tom Tromey <tromey@redhat.com>
* include/java-interp.h (_Jv_InterpMethod::dump_object): Removed
declaration.
......
libjava/Makefile.in
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Makefile.in generated by automake 1.9.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -17,6 +17,8 @@
SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(lib_gnu_java_awt_peer_qt_la_SOURCES) $(libgcj_la_SOURCES) $(libgcjawt_la_SOURCES) $(libgij_la_SOURCES) $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
......@@ -1709,7 +1711,7 @@ classpath/gnu/java/net/protocol/https/Handler.java
gnu_java_net_protocol_https_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_https_source_files)))
gnu_java_net_protocol_jar_source_files = \
gnu/java/net/protocol/jar/Connection.java \
classpath/gnu/java/net/protocol/jar/Connection.java \
classpath/gnu/java/net/protocol/jar/Handler.java
gnu_java_net_protocol_jar_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_jar_source_files)))
......@@ -3718,7 +3720,7 @@ classpath/java/net/Inet4Address.java \
classpath/java/net/Inet6Address.java \
java/net/InetAddress.java \
classpath/java/net/InetSocketAddress.java \
java/net/JarURLConnection.java \
classpath/java/net/JarURLConnection.java \
classpath/java/net/MalformedURLException.java \
classpath/java/net/MimeTypeMapper.java \
classpath/java/net/MulticastSocket.java \
......@@ -7992,13 +7994,7 @@ uninstall-toolexecmainlibDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
@set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
......@@ -8010,7 +8006,7 @@ $(RECURSIVE_TARGETS):
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
......@@ -8018,13 +8014,7 @@ $(RECURSIVE_TARGETS):
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
@set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
......@@ -8045,7 +8035,7 @@ maintainer-clean-recursive:
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
......
libjava/gnu/java/net/protocol/jar/Connection.java deleted 100644 → 0
/* Connection - jar url connection for java.net
Copyright (C) 1999, 2002, 2003, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package gnu.java.net.protocol.jar;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.JarURLConnection;
import java.net.MalformedURLException;
import java.net.ProtocolException;
import java.net.URL;
import java.net.URLConnection;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Locale;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.JarInputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
/**
* This subclass of java.net.JarURLConnection models a URLConnection via
* the "jar" protocol.
*
* @author Kresten Krab Thorup (krab@gnu.org)
*/
public final class Connection extends JarURLConnection
{
private static Hashtable file_cache = new Hashtable();
/**
* HTTP-style DateFormat, used to format the last-modified header.
*/
private static SimpleDateFormat dateFormat
= new SimpleDateFormat("EEE, dd MMM yyyy hh:mm:ss 'GMT'",
new Locale ("En", "Us", "Unix"));
private JarFile jar_file;
/**
* Cached JarURLConnection objects.
*/
static HashMap connectionCache = new HashMap();
protected Connection(URL url)
throws MalformedURLException
{
super(url);
}
public synchronized void connect() throws IOException
{
// Call is ignored if already connected.
if (connected)
return;
if (getUseCaches())
{
jarFileURLConnection =
(URLConnection) connectionCache.get(getJarFileURL());
if (jarFileURLConnection == null)
{
jarFileURLConnection = getJarFileURL().openConnection();
jarFileURLConnection.setUseCaches(true);
jarFileURLConnection.connect();
connectionCache.put(getJarFileURL(), jarFileURLConnection);
}
}
else
{
jarFileURLConnection = getJarFileURL().openConnection();
jarFileURLConnection.connect();
}
connected = true;
}
public InputStream getInputStream() throws IOException
{
if (!connected)
connect();
if (! doInput)
throw new ProtocolException("Can't open InputStream if doInput is false");
if (getEntryName() == null)
{
// This is a JarURLConnection for the entire jar file.
InputStream in = new BufferedInputStream
(jarFileURLConnection.getInputStream());
return new JarInputStream(in);
}
// Reaching this point, we're looking for an entry of a jar file.
JarFile jarfile = null;
try
{
jarfile = getJarFile ();
}
catch (IOException x)
{
/* ignore */
}
if (jarfile != null)
{
// this is the easy way...
ZipEntry entry = jarfile.getEntry
(gnu.java.net.protocol.file.Connection.unquote(getEntryName()));
if (entry != null)
return jarfile.getInputStream (entry);
else
return null;
}
else
{
// If the jar file is not local, ...
JarInputStream zis = new JarInputStream(
jarFileURLConnection.getInputStream ());
String entryName = gnu.java.net.protocol.file.Connection.unquote(getEntryName());
// This is hideous, we're doing a linear search...
for (ZipEntry entry = zis.getNextEntry();
entry != null;
entry = zis.getNextEntry())
{
if (entryName.equals(entry.getName()))
{
int size = (int) entry.getSize();
byte[] data = new byte[size];
zis.read (data, 0, size);
return new ByteArrayInputStream (data);
}
}
}
return null;
}
public synchronized JarFile getJarFile() throws IOException
{
if (!connected)
connect();
if (! doInput)
throw new ProtocolException("Can't open JarFile if doInput is false");
if (jar_file != null)
return jar_file;
URL jarFileURL = getJarFileURL();
if (jarFileURL.getProtocol().equals ("file")
&& jarFileURL.getHost().equals (""))
{
if (getUseCaches())
{
jar_file = (JarFile) file_cache.get (jarFileURL);
if (jar_file == null)
{
jar_file = new JarFile
(gnu.java.net.protocol.file.Connection.unquote(jarFileURL.getFile()));
file_cache.put (jarFileURL, jar_file);
}
}
else
jar_file = new JarFile
(gnu.java.net.protocol.file.Connection.unquote(jarFileURL.getFile()));
}
else
{
URLConnection urlconn = jarFileURL.openConnection();
InputStream is = urlconn.getInputStream();
byte[] buf = new byte[4*1024];
File f = File.createTempFile("cache", "jar");
FileOutputStream fos = new FileOutputStream(f);
int len = 0;
while ((len = is.read(buf)) != -1)
fos.write(buf, 0, len);
fos.close();
// Always verify the Manifest, open read only and delete when done.
jar_file = new JarFile (f, true,
ZipFile.OPEN_READ | ZipFile.OPEN_DELETE);
}
return jar_file;
}
public String getHeaderField(String field)
{
try
{
if (!connected)
connect();
if (field.equals("content-type"))
return guessContentTypeFromName(getJarEntry().getName());
else if (field.equals("content-length"))
return Long.toString(getJarEntry().getSize());
else if (field.equals("last-modified"))
{
synchronized (dateFormat)
{
return dateFormat.format(new Date(getJarEntry().getTime()));
}
}
}
catch (IOException e)
{
// Fall through.
}
return null;
}
public int getContentLength()
{
if (!connected)
return -1;
try
{
return (int) getJarEntry().getSize();
}
catch (IOException e)
{
return -1;
}
}
public long getLastModified()
{
if (!connected)
return -1;
try
{
return getJarEntry().getTime();
}
catch (IOException e)
{
return -1;
}
}
}
libjava/java/net/JarURLConnection.java deleted 100644 → 0
/* JarURLConnection.java -- Class for manipulating remote jar files
Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package java.net;
import java.io.IOException;
import java.security.cert.Certificate;
import java.util.jar.Attributes;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
/**
* This abstract class represents a common superclass for implementations
* of jar URL's. A jar URL is a special type of URL that allows JAR
* files on remote systems to be accessed. It has the form:
* <p>
* jar:&lt;standard URL pointing to jar filei&gt;!/file/within/jarfile
* <p> for example:
* <p>
* jar:http://www.urbanophile.com/java/foo.jar!/com/urbanophile/bar.class
* <p>
* That example URL points to the file /com/urbanophile/bar.class in the
* remote JAR file http://www.urbanophile.com/java/foo.jar. The HTTP
* protocol is used only as an example. Any supported remote protocol
* can be used.
* <p>
* This class currently works by retrieving the entire jar file into a
* local cache file, then performing standard jar operations on it.
* (At least this is true for the default protocol implementation).
*
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Kresten Krab Thorup (krab@gnu.org)
* @date Aug 10, 1999.
*
* @since 1.2
*/
public abstract class JarURLConnection extends URLConnection
{
/**
* This is the actual URL that points the remote jar file. This is parsed
* out of the jar URL by the constructor.
*/
private final URL jarFileURL;
/**
* The connection to the jar file itself. A JarURLConnection
* can represent an entry in a jar file or an entire jar file. In
* either case this describes just the jar file itself.
*/
protected URLConnection jarFileURLConnection;
/**
* This is the jar file "entry name" or portion after the "!/" in the
* URL which represents the pathname inside the actual jar file.
*/
private final String entryName;
/**
* Creates a JarURLConnection from an URL object
*
* @param url The URL object for this connection.
*
* @exception MalformedURLException If url is invalid
*
* @specnote This constructor is protected since JDK 1.4
*/
protected JarURLConnection(URL url) throws MalformedURLException
{
super(url);
if (! url.getProtocol().equals("jar"))
throw new MalformedURLException(url + ": Not jar protocol.");
String spec = url.getFile();
int bang = spec.indexOf("!/");
if (bang == -1)
throw new MalformedURLException(url + ": No `!/' in spec.");
// Extract the url for the jar itself.
jarFileURL = new URL(spec.substring(0, bang));
// Get the name of the entry, if any.
entryName = spec.length() == (bang + 2) ? null : spec.substring(bang + 2);
}
/**
* This method returns the "real" URL where the JarFile is located.
* //****Is this right?*****
*
* @return The remote URL
*/
public URL getJarFileURL()
{
return jarFileURL;
}
/**
* Returns the "entry name" portion of the jar URL. This is the portion
* after the "!/" in the jar URL that represents the pathname inside the
* actual jar file.
*
* @return The entry name.
*/
public String getEntryName()
{
return entryName;
}
/**
* Returns the entry in this jar file specified by the URL.
*
* @return The jar entry
*
* @exception IOException If an error occurs
*/
public JarEntry getJarEntry() throws IOException
{
JarFile jarfile = null;
if (entryName == null)
return null;
if (! doInput)
throw new ProtocolException("Can't open JarEntry if doInput is false");
try
{
jarfile = getJarFile ();
}
catch (IOException x)
{
/* ignore */
}
if (jarfile == null)
{
JarInputStream zis = new JarInputStream(
jarFileURLConnection.getInputStream ());
// This is hideous, we're doing a linear search for the thing...
for (ZipEntry ent = zis.getNextEntry ();
ent != null;
ent = zis.getNextEntry ())
{
if (entryName.equals (ent.getName()))
{
return new JarEntry (ent);
}
}
}
else
{
return jarfile.getJarEntry (entryName);
}
return null;
}
/**
* Returns a read-only JarFile object for the remote jar file
*
* @return The JarFile object
*
* @exception IOException If an error occurs
*/
public abstract JarFile getJarFile() throws IOException;
/**
* Returns an array of Certificate objects for the jar file entry specified
* by this URL or null if there are none
*
* @return A Certificate array
*
* @exception IOException If an error occurs
*/
public Certificate[] getCertificates() throws IOException
{
JarEntry entry = getJarEntry();
return entry != null ? entry.getCertificates() : null;
}
/**
* Returns the main Attributes for the jar file specified in the URL or
* null if there are none
*
* @return The main Attributes for the JAR file for this connection
*
* @exception IOException If an error occurs
*/
public Attributes getMainAttributes() throws IOException
{
Manifest manifest = getManifest();
return manifest != null ? manifest.getMainAttributes() : null;
}
/**
* Returns the Attributes for the Jar entry specified by the URL or null
* if none
*
* @return The Attributes object for this connection if the URL for it points
* to a JAR file entry, null otherwise
*
* @exception IOException If an error occurs
*/
public Attributes getAttributes() throws IOException
{
JarEntry entry = getJarEntry();
return entry != null ? entry.getAttributes() : null;
}
/**
* Returns a Manifest object for this jar file, or null if there is no
* manifest.
*
* @return The Manifest for this connection, or null if none
*
* @exception IOException If an error occurs
*/
public Manifest getManifest() throws IOException
{
JarFile file = getJarFile();
return file != null ? file.getManifest() : null;
}
}
libjava/sources.am
......@@ -1290,7 +1290,7 @@ gnu/java/net/protocol/https.list: $(gnu_java_net_protocol_https_source_files)
gnu_java_net_protocol_jar_source_files = \
gnu/java/net/protocol/jar/Connection.java \
classpath/gnu/java/net/protocol/jar/Connection.java \
classpath/gnu/java/net/protocol/jar/Handler.java
gnu_java_net_protocol_jar_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_jar_source_files)))
......@@ -4394,7 +4394,7 @@ classpath/java/net/Inet4Address.java \
classpath/java/net/Inet6Address.java \
java/net/InetAddress.java \
classpath/java/net/InetSocketAddress.java \
java/net/JarURLConnection.java \
classpath/java/net/JarURLConnection.java \
classpath/java/net/MalformedURLException.java \
classpath/java/net/MimeTypeMapper.java \
classpath/java/net/MulticastSocket.java \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment