Example viewers have been removed so we no longer depend on java.desk…

…top.
jakartaee · Mar 25, 2020 · d92464b · d92464b
1 parent 4f8b72e
commit d92464b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/activation/src/main/java/module-info.java b/activation/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -11,5 +11,4 @@
 module jakarta.activation {
     exports jakarta.activation;
     requires java.logging;
-    requires java.desktop;	// for image/jpeg handler
 }
diff --git a/activation/src/main/resources/META-INF/mailcap.default b/activation/src/main/resources/META-INF/mailcap.default
@@ -1,7 +1,9 @@
 #
-# This is a very simple 'mailcap' file
+# This is a very simple 'mailcap' file as an example.
+# Example JavaBean viewers and editors are no longer
+# provided as they conflicted with applications.
 #
-image/gif;;		x-java-view=com.sun.activation.viewers.ImageViewer
-image/jpeg;;		x-java-view=com.sun.activation.viewers.ImageViewer
-text/*;;		x-java-view=com.sun.activation.viewers.TextViewer
-text/*;;		x-java-edit=com.sun.activation.viewers.TextEditor
+#image/gif;;		x-java-view=com.sun.activation.viewers.ImageViewer
+#image/jpeg;;		x-java-view=com.sun.activation.viewers.ImageViewer
+#text/*;;		x-java-view=com.sun.activation.viewers.TextViewer
+#text/*;;		x-java-edit=com.sun.activation.viewers.TextEditor