Switch from MIME to media
svn path=/trunk/; revision=468
diff --git a/src/jsr311-api/src/javax/ws/rs/Consumes.java b/src/jsr311-api/src/javax/ws/rs/Consumes.java
index cd35e9f..c8ed9e8 100644
--- a/src/jsr311-api/src/javax/ws/rs/Consumes.java
+++ b/src/jsr311-api/src/javax/ws/rs/Consumes.java
@@ -26,9 +26,9 @@
import java.lang.annotation.Target;
/**
- * Defines the MIME types that the methods of a resource class or MessageBodyReader
+ * Defines the media types that the methods of a resource class or MessageBodyReader
* can accept. If
- * not specified, a container will assume that any MIME type is acceptable.
+ * not specified, a container will assume that any media type is acceptable.
* Method level annotations override a class level annotation. A container
* is responsible for ensuring that the method invoked is capable of consuming
* the media type of the HTTP request entity body. If no such method is
@@ -42,7 +42,7 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface Consumes {
/**
- * A list of MIME types. E.g. {"image/jpeg","image/gif"}
+ * A list of media types. E.g. {"image/jpeg","image/gif"}
*/
String[] value() default "*/*";
}
diff --git a/src/jsr311-api/src/javax/ws/rs/Produces.java b/src/jsr311-api/src/javax/ws/rs/Produces.java
index 664f450..cdb10fc 100644
--- a/src/jsr311-api/src/javax/ws/rs/Produces.java
+++ b/src/jsr311-api/src/javax/ws/rs/Produces.java
@@ -26,12 +26,12 @@
import java.lang.annotation.Target;
/**
- * Defines the MIME type(s) that the methods of a resource class or
+ * Defines the media type(s) that the methods of a resource class or
* MessageBodyWriter can produce.
* If not specified then a container will assume that any type can be produced.
* Method level annotations override a class level annotation. A container
* is responsible for ensuring that the method invoked is capable of producing
- * one of the MIME types requested in the HTTP request. If no such method is
+ * one of the media types requested in the HTTP request. If no such method is
* available the container must respond with a HTTP "406 Not Acceptable" as
* specified by RFC 2616.
*
@@ -47,7 +47,7 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface Produces {
/**
- * A list of MIME types. E.g. "image/jpeg,image/gif"
+ * A list of media types. E.g. "image/jpeg,image/gif"
*/
String[] value() default "*/*";
}
