infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-24 22:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

8162745: content-types.properties files are missing some modern types

Browse Source 
Add some content types from HTML5 and Xiph.

Reviewed-by: rriggs, chegar
This commit is contained in:
Brian Burkhalter 2016-08-08 13:58:14 -07:00
parent 522e112b4a
commit 97b666ee29
3 changed files with 83 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
jdk/src/java.base/unix/classes/sun/net/www/content-types.properties
View File

@ -144,6 +144,10 @@ application/x-ustar: \
file_extensions=.ustar;\
action=save
audio/aac: \
description=Advanced Audio Coding Audio;\
file_extensions=.aac
audio/basic: \
description=Basic Audio;\
file_extensions=.snd,.au;\
@ -151,6 +155,22 @@ audio/basic: \
action=application;\
application=audiotool %s
audio/flac: \
description=Free Lossless Audio Codec Audio;\
file_extensions=.flac
audio/mp4: \
description=MPEG-4 Audio;\
file_extensions=.m4a
audio/mpeg: \
description=MPEG Audio;\
file_extensions=.mp2,.mp3
audio/ogg: \
description=Ogg Audio;\
file_extensions=.oga,.ogg,.opus,.spx
audio/x-aiff: \
description=Audio Interchange Format File;\
file_extensions=.aifc,.aif,.aiff;\
@ -178,6 +198,10 @@ image/jpeg: \
action=browser;\
application=imagetool %s
image/svg+xml: \
description=Scalable Vector Graphics;\
file_extensions=.svg,.svgz
image/tiff: \
description=TIFF Image;\
file_extensions=.tif,.tiff;\
@ -248,6 +272,10 @@ text/x-setext: \
description=Structure Enhanced Text;\
file_extensions=.etx
video/mp4: \
description=MPEG-4 Video;\
file_extensions=.m4v,.mp4
video/mpeg: \
description=MPEG Video Clip;\
file_extensions=.mpg,.mpe,.mpeg;\
@ -255,10 +283,18 @@ video/mpeg: \
action=application;\
application=mpeg_play %s
video/ogg: \
description=Ogg Video;\
file_extensions=.ogv
video/quicktime: \
description=QuickTime Video Clip;\
file_extensions=.mov,.qt
video/webm: \
description=WebM Video;\
file_extensions=.webm
application/x-troff-msvideo: \
description=AVI Video;\
file_extensions=.avi;\

36
jdk/src/java.base/windows/classes/sun/net/www/content-types.properties
View File

@ -142,11 +142,31 @@ application/x-ustar: \
file_extensions=.ustar;\
action=save
audio/aac: \
description=Advanced Audio Coding Audio;\
file_extensions=.aac
audio/basic: \
description=Basic Audio;\
file_extensions=.snd,.au;\
icon=audio
audio/flac: \
description=Free Lossless Audio Codec Audio;\
file_extensions=.flac
audio/mp4: \
description=MPEG-4 Audio;\
file_extensions=.m4a
audio/mpeg: \
description=MPEG Audio;\
file_extensions=.mp2,.mp3
audio/ogg: \
description=Ogg Audio;\
file_extensions=.oga,.ogg,.opus,.spx
audio/x-aiff: \
description=Audio Interchange Format File;\
file_extensions=.aifc,.aif,.aiff;\
@ -175,6 +195,10 @@ image/jpeg: \
icon=jpeg;\
action=browser
image/svg+xml: \
description=Scalable Vector Graphics;\
file_extensions=.svg,.svgz
image/tiff: \
description=TIFF Image;\
file_extensions=.tif,.tiff;\
@ -245,15 +269,27 @@ text/x-setext: \
description=Structure Enhanced Text;\
file_extensions=.etx
video/mp4: \
description=MPEG-4 Video;\
file_extensions=.m4v,.mp4
video/mpeg: \
description=MPEG Video Clip;\
file_extensions=.mpg,.mpe,.mpeg;\
icon=mpeg
video/ogg: \
description=Ogg Video;\
file_extensions=.ogv
video/quicktime: \
description=QuickTime Video Clip;\
file_extensions=.mov,.qt
video/webm: \
description=WebM Video;\
file_extensions=.webm
application/x-troff-msvideo: \
description=AVI Video;\
file_extensions=.avi;\

25
jdk/test/java/nio/file/Files/probeContentType/Basic.java
View File

@ -22,7 +22,7 @@
*/
/* @test
* @bug 4313887 8129632 8129633 8162624 8146215
* @bug 4313887 8129632 8129633 8162624 8146215 8162745
* @summary Unit test for probeContentType method
* @library ../..
* @build Basic SimpleFileTypeDetector
@ -95,7 +95,7 @@ public class Basic {
return 0;
}
static int checkOSXContentTypes(String[] extensions, String[] expectedTypes)
static int checkContentTypes(String[] extensions, String[] expectedTypes)
throws IOException {
if (extensions.length != expectedTypes.length) {
System.err.println("Parameter array lengths differ");
@ -157,18 +157,15 @@ public class Basic {
Files.delete(file);
}
// Verify that common file extensions are mapped to the correct content
// types on Mac OS X only which has consistent Uniform Type Identifiers.
if (System.getProperty("os.name").contains("OS X")) {
String[] extensions = new String[]{
"jpg", "mp3", "mp4", "pdf", "png"
};
String[] expectedTypes = new String[]{
"image/jpeg", "audio/mpeg", "video/mp4", "application/pdf",
"image/png"
};
failures += checkOSXContentTypes(extensions, expectedTypes);
}
// Verify that certain media extensions are mapped to the correct type.
String[] extensions = new String[]{
"aac", "flac", "jpg", "mp3", "mp4", "pdf", "png", "webm"
};
String[] expectedTypes = new String[]{
"audio/aac", "audio/flac", "image/jpeg", "audio/mpeg",
"video/mp4", "application/pdf", "image/png", "video/webm"
};
failures += checkContentTypes(extensions, expectedTypes);
if (failures > 0) {
throw new RuntimeException("Test failed!");