* Patch: FYI: remove old MimeTypes
@ 2007-03-28 1:58 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2007-03-28 1:58 UTC (permalink / raw)
To: GCJ-patches
I'm checking this in on the trunk.
The old gnu.gcj.io.MimeTypes is no longer used. This patch removes
this file and a couple other related files. The same functionality is
now in Classpath.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* sources.am, Makefile.in: Rebuilt.
* scripts/mime.types: Removed.
* scripts/MakeDefaultMimeTypes.java: Removed.
* gnu/gcj/io/MimeTypes.java: Removed.
* gnu/gcj/io/MimeTypes.h: Removed.
* gnu/gcj/io/DefaultMimeTypes.java: Removed.
* gnu/gcj/io/DefaultMimeTypes.h: Removed.
Index: scripts/MakeDefaultMimeTypes.java
===================================================================
--- scripts/MakeDefaultMimeTypes.java (revision 123266)
+++ scripts/MakeDefaultMimeTypes.java (working copy)
@@ -1,77 +0,0 @@
-/* Copyright (C) 2000, 2003 Free Software Foundation
-
- This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
-
-import gnu.gcj.io.MimeTypes;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-
-public class MakeDefaultMimeTypes
-{
- private static void fatal (String message)
- {
- System.err.println ("MakeDefaultMimeTypes Error: " + message);
- System.exit (-1);
- }
-
- public static void main (String[] args)
- {
- Hashtable mime_table = new Hashtable ();
-
- if (args.length != 1)
- fatal ("missing mime type filename");
-
- try {
- MimeTypes.fillFromFile (mime_table, args[0]);
- } catch (FileNotFoundException ex) {
- fatal ("can't open " + args[0]);
- } catch (IOException ex) {
- fatal ("error reading " + args[0]);
- }
-
- System.out.println ("// Do not edit this file! Create a new version with MakeDefaultMimeTypes.\n\n/* Copyright (C) 2000 Free Software Foundation\n\n This file is part of libgcj.\n\nThis software is copyrighted work licensed under the terms of the\nLibgcj License. Please consult the file \"LIBGCJ_LICENSE\" for\ndetails. */\n\npackage gnu.gcj.io; \n\npublic class DefaultMimeTypes\n{\n public static final String[] types = {");
-
- Enumeration keys = mime_table.keys();
- Enumeration values = mime_table.elements();
-
- // Prepend first element with open bracket
- StringBuffer result = new StringBuffer("");
-
- try
- {
- result.append(" \""
- + keys.nextElement().toString()
- + "\",\t\""
- + values.nextElement().toString()
- + "\"\n");
- }
- catch (NoSuchElementException ex)
- {
- }
-
- // Prepend subsequent elements with ", "
- try
- {
- while (true)
- result.append(" , \""
- + keys.nextElement().toString()
- + "\",\t\""
- + values.nextElement().toString()
- + "\"\n");
- }
- catch (NoSuchElementException ex)
- {
- }
-
- // Append last element with closing bracket
- result.append(" };\n}\n");
- System.out.println(result);
- }
-}
Index: scripts/mime.types
===================================================================
--- scripts/mime.types (revision 123266)
+++ scripts/mime.types (working copy)
@@ -1,276 +0,0 @@
-# This is the default mime.types file from the Apache web server distribution
-
-# This file controls what Internet media types are sent to the client for
-# given file extension(s). Sending the correct media type to the client
-# is important so they know how to handle the content of the file.
-# Extra types can either be added here or by using an AddType directive
-# in your config files. For more information about Internet media types,
-# please read RFC 2045, 2046, 2047, 2048, and 2077. The Internet media type
-# registry is at <ftp://ftp.iana.org/in-notes/iana/assignments/media-types/>.
-
-# MIME type Extension
-application/EDI-Consent
-application/EDI-X12
-application/EDIFACT
-application/activemessage
-application/andrew-inset ez
-application/applefile
-application/atomicmail
-application/cals-1840
-application/commonground
-application/cybercash
-application/dca-rft
-application/dec-dx
-application/eshop
-application/hyperstudio
-application/iges
-application/mac-binhex40 hqx
-application/mac-compactpro cpt
-application/macwriteii
-application/marc
-application/mathematica
-application/msword doc
-application/news-message-id
-application/news-transmission
-application/octet-stream bin dms lha lzh exe class
-application/oda oda
-application/pdf pdf
-application/pgp-encrypted
-application/pgp-keys
-application/pgp-signature
-application/pkcs10
-application/pkcs7-mime
-application/pkcs7-signature
-application/postscript ai eps ps
-application/prs.alvestrand.titrax-sheet
-application/prs.cww
-application/prs.nprend
-application/remote-printing
-application/riscos
-application/rtf rtf
-application/set-payment
-application/set-payment-initiation
-application/set-registration
-application/set-registration-initiation
-application/sgml
-application/sgml-open-catalog
-application/slate
-application/smil smi smil
-application/vemmi
-application/vnd.3M.Post-it-Notes
-application/vnd.FloGraphIt
-application/vnd.acucobol
-application/vnd.anser-web-certificate-issue-initiation
-application/vnd.anser-web-funds-transfer-initiation
-application/vnd.audiograph
-application/vnd.businessobjects
-application/vnd.claymore
-application/vnd.comsocaller
-application/vnd.dna
-application/vnd.dxr
-application/vnd.ecdis-update
-application/vnd.ecowin.chart
-application/vnd.ecowin.filerequest
-application/vnd.ecowin.fileupdate
-application/vnd.ecowin.series
-application/vnd.ecowin.seriesrequest
-application/vnd.ecowin.seriesupdate
-application/vnd.enliven
-application/vnd.epson.salt
-application/vnd.fdf
-application/vnd.ffsns
-application/vnd.framemaker
-application/vnd.fujitsu.oasys
-application/vnd.fujitsu.oasys2
-application/vnd.fujitsu.oasys3
-application/vnd.fujitsu.oasysgp
-application/vnd.fujitsu.oasysprs
-application/vnd.fujixerox.docuworks
-application/vnd.hp-HPGL
-application/vnd.hp-PCL
-application/vnd.hp-PCLXL
-application/vnd.hp-hps
-application/vnd.ibm.MiniPay
-application/vnd.ibm.modcap
-application/vnd.intercon.formnet
-application/vnd.intertrust.digibox
-application/vnd.intertrust.nncp
-application/vnd.is-xpr
-application/vnd.japannet-directory-service
-application/vnd.japannet-jpnstore-wakeup
-application/vnd.japannet-payment-wakeup
-application/vnd.japannet-registration
-application/vnd.japannet-registration-wakeup
-application/vnd.japannet-setstore-wakeup
-application/vnd.japannet-verification
-application/vnd.japannet-verification-wakeup
-application/vnd.koan
-application/vnd.lotus-1-2-3
-application/vnd.lotus-approach
-application/vnd.lotus-freelance
-application/vnd.lotus-organizer
-application/vnd.lotus-screencam
-application/vnd.lotus-wordpro
-application/vnd.meridian-slingshot
-application/vnd.mif mif
-application/vnd.minisoft-hp3000-save
-application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.ms-artgalry
-application/vnd.ms-asf
-application/vnd.ms-excel
-application/vnd.ms-powerpoint ppt
-application/vnd.ms-project
-application/vnd.ms-tnef
-application/vnd.ms-works
-application/vnd.music-niff
-application/vnd.musician
-application/vnd.netfpx
-application/vnd.noblenet-directory
-application/vnd.noblenet-sealer
-application/vnd.noblenet-web
-application/vnd.novadigm.EDM
-application/vnd.novadigm.EDX
-application/vnd.novadigm.EXT
-application/vnd.osa.netdeploy
-application/vnd.powerbuilder6
-application/vnd.powerbuilder6-s
-application/vnd.rapid
-application/vnd.seemail
-application/vnd.shana.informed.formtemplate
-application/vnd.shana.informed.interchange
-application/vnd.shana.informed.package
-application/vnd.street-stream
-application/vnd.svd
-application/vnd.swiftview-ics
-application/vnd.truedoc
-application/vnd.visio
-application/vnd.webturbo
-application/vnd.wrq-hp3000-labelled
-application/vnd.wt.stf
-application/vnd.xara
-application/vnd.yellowriver-custom-menu
-application/wita
-application/wordperfect5.1
-application/x-bcpio bcpio
-application/x-cdlink vcd
-application/x-chess-pgn pgn
-application/x-compress
-application/x-cpio cpio
-application/x-csh csh
-application/x-director dcr dir dxr
-application/x-dvi dvi
-application/x-futuresplash spl
-application/x-gtar gtar
-application/x-gzip
-application/x-hdf hdf
-application/x-javascript js
-application/x-koan skp skd skt skm
-application/x-latex latex
-application/x-netcdf nc cdf
-# The standard is that rpm is audio/x-pn-realaudio-plugin... oh well...
-application/x-rpm rpm
-application/x-sh sh
-application/x-shar shar
-application/x-shockwave-flash swf
-application/x-stuffit sit
-application/x-sv4cpio sv4cpio
-application/x-sv4crc sv4crc
-application/x-tar tar
-application/x-tcl tcl
-application/x-tex tex
-application/x-texinfo texinfo texi
-application/x-troff t tr roff
-application/x-troff-man man
-application/x-troff-me me
-application/x-troff-ms ms
-application/x-ustar ustar
-application/x-wais-source src
-application/x400-bp
-application/xml
-application/zip zip
-audio/32kadpcm
-audio/basic au snd
-audio/midi mid midi kar
-audio/mpeg mpga mp2 mp3
-audio/vnd.qcelp
-audio/x-aiff aif aiff aifc
-audio/x-pn-realaudio ram rm
-audio/x-realaudio ra
-audio/x-wav wav
-chemical/x-pdb pdb xyz
-image/cgm
-image/g3fax
-image/gif gif
-image/ief ief
-image/jpeg jpeg jpg jpe
-image/naplps
-image/png png
-image/prs.btif
-image/tiff tiff tif
-image/vnd.dwg
-image/vnd.dxf
-image/vnd.fpx
-image/vnd.net-fpx
-image/vnd.svf
-image/vnd.xiff
-image/x-cmu-raster ras
-image/x-portable-anymap pnm
-image/x-portable-bitmap pbm
-image/x-portable-graymap pgm
-image/x-portable-pixmap ppm
-image/x-rgb rgb
-image/x-xbitmap xbm
-image/x-xpixmap xpm
-image/x-xwindowdump xwd
-message/delivery-status
-message/disposition-notification
-message/external-body
-message/http
-message/news
-message/partial
-message/rfc822
-model/iges igs iges
-model/mesh msh mesh silo
-model/vnd.dwf
-model/vrml wrl vrml
-multipart/alternative
-multipart/appledouble
-multipart/byteranges
-multipart/digest
-multipart/encrypted
-multipart/form-data
-multipart/header-set
-multipart/mixed
-multipart/parallel
-multipart/related
-multipart/report
-multipart/signed
-multipart/voice-message
-text/css css
-text/directory
-text/enriched
-text/html html htm
-text/plain asc txt
-text/prs.lines.tag
-text/rfc822-headers
-text/richtext rtx
-text/rtf rtf
-text/sgml sgml sgm
-text/tab-separated-values tsv
-text/uri-list
-text/vnd.abc
-text/vnd.flatland.3dml
-text/vnd.fmi.flexstor
-text/vnd.in3d.3dml
-text/vnd.in3d.spot
-text/vnd.latex-z
-text/x-setext etx
-text/xml xml
-video/mpeg mpeg mpg mpe
-video/quicktime qt mov
-video/vnd.motorola.video
-video/vnd.motorola.videop
-video/vnd.vivo
-video/x-msvideo avi
-video/x-sgi-movie movie
-x-conference/x-cooltalk ice
Index: gnu/gcj/io/DefaultMimeTypes.java
===================================================================
--- gnu/gcj/io/DefaultMimeTypes.java (revision 123266)
+++ gnu/gcj/io/DefaultMimeTypes.java (working copy)
@@ -1,139 +0,0 @@
-// Do not edit this file! Create a new version with MakeDefaultMimeTypes.
-
-/* Copyright (C) 2000 Free Software Foundation
-
- This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
-
-package gnu.gcj.io;
-
-public class DefaultMimeTypes
-{
- public static final String[] types = {
- "midi", "audio/midi"
- , "sit", "application/x-stuffit"
- , "ram", "audio/x-pn-realaudio"
- , "ez", "application/andrew-inset"
- , "jpeg", "image/jpeg"
- , "sv4crc", "application/x-sv4crc"
- , "sv4cpio", "application/x-sv4cpio"
- , "txt", "text/plain"
- , "spl", "application/x-futuresplash"
- , "ras", "image/x-cmu-raster"
- , "sh", "application/x-sh"
- , "dcr", "application/x-director"
- , "msh", "model/mesh"
- , "swf", "application/x-shockwave-flash"
- , "hdf", "application/x-hdf"
- , "bcpio", "application/x-bcpio"
- , "zip", "application/zip"
- , "gif", "image/gif"
- , "me", "application/x-troff-me"
- , "gtar", "application/x-gtar"
- , "tex", "application/x-tex"
- , "xyz", "chemical/x-pdb"
- , "hqx", "application/mac-binhex40"
- , "ms", "application/x-troff-ms"
- , "oda", "application/oda"
- , "vcd", "application/x-cdlink"
- , "aifc", "audio/x-aiff"
- , "skd", "application/x-koan"
- , "smil", "application/smil"
- , "asc", "text/plain"
- , "aiff", "audio/x-aiff"
- , "xml", "text/xml"
- , "tr", "application/x-troff"
- , "nc", "application/x-netcdf"
- , "dxr", "application/x-director"
- , "skm", "application/x-koan"
- , "wrl", "model/vrml"
- , "tsv", "text/tab-separated-values"
- , "mpeg", "video/mpeg"
- , "skp", "application/x-koan"
- , "src", "application/x-wais-source"
- , "rpm", "application/x-rpm"
- , "skt", "application/x-koan"
- , "ai", "application/postscript"
- , "cpt", "application/mac-compactpro"
- , "mp2", "audio/mpeg"
- , "man", "application/x-troff-man"
- , "mp3", "audio/mpeg"
- , "mesh", "model/mesh"
- , "igs", "model/iges"
- , "shar", "application/x-shar"
- , "au", "audio/basic"
- , "texi", "application/x-texinfo"
- , "cpio", "application/x-cpio"
- , "jpe", "image/jpeg"
- , "lzh", "application/octet-stream"
- , "jpg", "image/jpeg"
- , "cdf", "application/x-netcdf"
- , "etx", "text/x-setext"
- , "texinfo", "application/x-texinfo"
- , "sgml", "text/sgml"
- , "roff", "application/x-troff"
- , "pgm", "image/x-portable-graymap"
- , "pgn", "application/x-chess-pgn"
- , "bin", "application/octet-stream"
- , "png", "image/png"
- , "tar", "application/x-tar"
- , "mid", "audio/midi"
- , "mov", "video/quicktime"
- , "movie", "video/x-sgi-movie"
- , "mif", "application/vnd.mif"
- , "pnm", "image/x-portable-anymap"
- , "mpga", "audio/mpeg"
- , "smi", "application/smil"
- , "t", "application/x-troff"
- , "tiff", "image/tiff"
- , "xbm", "image/x-xbitmap"
- , "htm", "text/html"
- , "mpe", "video/mpeg"
- , "dms", "application/octet-stream"
- , "mpg", "video/mpeg"
- , "lha", "application/octet-stream"
- , "latex", "application/x-latex"
- , "ps", "application/postscript"
- , "sgm", "text/sgml"
- , "tif", "image/tiff"
- , "ice", "x-conference/x-cooltalk"
- , "snd", "audio/basic"
- , "html", "text/html"
- , "pbm", "image/x-portable-bitmap"
- , "xpm", "image/x-xpixmap"
- , "iges", "model/iges"
- , "aif", "audio/x-aiff"
- , "avi", "video/x-msvideo"
- , "csh", "application/x-csh"
- , "wav", "audio/x-wav"
- , "xwd", "image/x-xwindowdump"
- , "js", "application/x-javascript"
- , "silo", "model/mesh"
- , "vrml", "model/vrml"
- , "tcl", "application/x-tcl"
- , "css", "text/css"
- , "eps", "application/postscript"
- , "class", "application/octet-stream"
- , "qt", "video/quicktime"
- , "doc", "application/msword"
- , "ustar", "application/x-ustar"
- , "ppm", "image/x-portable-pixmap"
- , "ppt", "application/vnd.ms-powerpoint"
- , "ra", "audio/x-realaudio"
- , "rgb", "image/x-rgb"
- , "rtf", "text/rtf"
- , "kar", "audio/midi"
- , "dvi", "application/x-dvi"
- , "rm", "audio/x-pn-realaudio"
- , "exe", "application/octet-stream"
- , "pdb", "chemical/x-pdb"
- , "pdf", "application/pdf"
- , "rtx", "text/richtext"
- , "dir", "application/x-director"
- , "ief", "image/ief"
- };
-}
-
Index: gnu/gcj/io/MimeTypes.java
===================================================================
--- gnu/gcj/io/MimeTypes.java (revision 123266)
+++ gnu/gcj/io/MimeTypes.java (working copy)
@@ -1,86 +0,0 @@
-/* Copyright (C) 2000 Free Software Foundation
-
- This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
-
-package gnu.gcj.io;
-
-import java.util.*;
-import java.io.*;
-
-public class MimeTypes
-{
- private static Hashtable mime_types;
-
- public static void fillFromFile (Hashtable table, String fname)
- throws IOException
- {
- LineNumberReader reader =
- new LineNumberReader (new FileReader (fname));
-
- while (reader.ready ())
- {
- StringTokenizer tokenizer =
- new StringTokenizer (reader.readLine ());
-
- try
- {
- String t = tokenizer.nextToken ();
-
- if (! t.startsWith ("#"))
- {
- while (true)
- {
- // Read the next extension
- String e = tokenizer.nextToken ();
- if ((e != null) && (! e.startsWith ("#")))
- table.put (e, t);
- else
- break;
- }
- }
- } catch (NoSuchElementException ex) {
- // Do nothing.
- }
- }
- }
-
- // This is the primary interface to this class.
- public static String getMimeTypeFromExtension (String extension)
- {
- if (mime_types == null)
- {
- mime_types = new Hashtable ();
-
- // First populate the hash table with the default mime type
- // mappings.
- int i = DefaultMimeTypes.types.length;
- while (i > 1)
- {
- mime_types.put (DefaultMimeTypes.types[i - 2],
- DefaultMimeTypes.types[i - 1]);
- i = i - 2;
- }
-
- // Now read mime types from /etc/mime.types if it exists.
- // This should override the default values.
- try {
- fillFromFile (mime_types, "/etc/mime.types");
- } catch (IOException ex) {
- // Do nothing.
- }
-
- // Now read mime types from ~/.mime.types.
- // FIXME: We can't currently parse this file.
- }
-
- String type = (String) mime_types.get (extension);
- if (type == null)
- return ("application/octet-stream");
- else
- return (type);
- }
-}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-03-28 1:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-28 1:58 Patch: FYI: remove old MimeTypes Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).