# HG changeset patch
# User duke
# Date 1499270364 -7200
# Node ID 789279fa935ee090a9bb4c0699c9b2af8aa1c651
# Parent  e1dd9987d5a76f51838a9b8f46614662a3694b10# Parent  3900d8061ee5384b1263a5c684476a22a9d0f284
Merge

diff -r 3900d8061ee5 -r 789279fa935e jaxws/.hgtags
--- a/jaxws/.hgtags	Wed Jul 05 17:59:21 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 17:59:24 2017 +0200
@@ -141,3 +141,4 @@
 3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b16
 54928c8850f5498670dd43d6c9299f36de1a6746 jdk8-b18
 b73b733214aa43648d69a2da51e6b48fda902a2d jdk8-b19
+2b2818e3386f4510c390f6aea90d77e1c6a5bf9e jdk8-b20
diff -r 3900d8061ee5 -r 789279fa935e jaxws/build-defs.xml
--- a/jaxws/build-defs.xml	Wed Jul 05 17:59:21 2017 +0200
+++ b/jaxws/build-defs.xml	Wed Jul 05 17:59:24 2017 +0200
@@ -96,6 +96,10 @@
         </replaceregexp>
 
         <mkdir dir="${build.classes.dir}/META-INF/services"/>
+        <copy todir="${build.classes.dir}/META-INF"
+              file="${secondary.src.dir}/META-INF/mailcap.default"/>
+        <copy todir="${build.classes.dir}/META-INF"
+              file="${secondary.src.dir}/META-INF/mimetypes.default"/>
         <copy todir="${build.classes.dir}/META-INF/services"
               file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory"/>
         <copy todir="${build.classes.dir}/META-INF/services"
@@ -118,6 +122,7 @@
     <!-- Set up source to use drop.dir. -->
     <target name="-use-drop" depends="-set-props">
         <property name="primary.src.dir" value="${jaxws_src.src.dir}"/>
+        <property name="secondary.src.dir" value="${jaf_src.src.dir}"/>
         <path id="src.dir.id">
             <pathelement path="${primary.src.dir}"/>
             <pathelement path="${jaf_src.src.dir}"/>