# HG changeset patch
# User katleman
# Date 1326327175 28800
# Node ID e1dd9987d5a76f51838a9b8f46614662a3694b10
# Parent  075fe3928b7fe89169d856977a69db6bcf4c0b39# Parent  90950a02c070c3d63b861318ffc5020f23d20653
Merge

diff -r 075fe3928b7f -r e1dd9987d5a7 jaxws/build-defs.xml
--- a/jaxws/build-defs.xml	Thu Jan 05 08:42:37 2012 -0800
+++ b/jaxws/build-defs.xml	Wed Jan 11 16:12:55 2012 -0800
@@ -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}"/>