Index: /applications/editors/josm/plugins/00_tools/jaxb-ri/bin/schemagen.bat
===================================================================
--- /applications/editors/josm/plugins/00_tools/jaxb-ri/bin/schemagen.bat	(revision 34387)
+++ /applications/editors/josm/plugins/00_tools/jaxb-ri/bin/schemagen.bat	(revision 34388)
@@ -67,9 +67,9 @@
 :SETCLASSPATH
 if "%CLASSPATH%" == "" goto NOUSERCLASSPATH
-set LOCALCLASSPATH=%JAXB_HOME%\lib\jaxb-core.jar;%JAXB_HOME%\lib\jaxb-xjc.jar;%JAXB_HOME%\lib\jaxb-jxc.jar;%JAXB_HOME%\lib\jaxb-impl.jar;%CLASSPATH%
+set LOCALCLASSPATH=%JAXB_HOME%\lib\jaxb-core.jar;%JAXB_HOME%\lib\jaxb-xjc.jar;%JAXB_HOME%\lib\jaxb-jxc.jar;%JAXB_HOME%\lib\jaxb-impl.jar;%JAXB_HOME%\lib\javax.activation.jar;%CLASSPATH%
 goto LAUNCHSCHEMAGEN
 
 :NOUSERCLASSPATH
-set LOCALCLASSPATH=%JAXB_HOME%\lib\jaxb-core.jar;%JAXB_HOME%\lib\jaxb-xjc.jar;%JAXB_HOME%\lib\jaxb-jxc.jar;%JAXB_HOME%\lib\jaxb-impl.jar
+set LOCALCLASSPATH=%JAXB_HOME%\lib\jaxb-core.jar;%JAXB_HOME%\lib\jaxb-xjc.jar;%JAXB_HOME%\lib\jaxb-jxc.jar;%JAXB_HOME%\lib\jaxb-impl.jar;%JAXB_HOME%\lib\javax.activation.jar
 goto LAUNCHSCHEMAGEN
 
Index: /applications/editors/josm/plugins/00_tools/jaxb-ri/bin/schemagen.sh
===================================================================
--- /applications/editors/josm/plugins/00_tools/jaxb-ri/bin/schemagen.sh	(revision 34387)
+++ /applications/editors/josm/plugins/00_tools/jaxb-ri/bin/schemagen.sh	(revision 34388)
@@ -79,7 +79,7 @@
 # add the api jar file
 if [ -z "$LOCALCLASSPATH" ] ; then
-    LOCALCLASSPATH="$JAXB_HOME"/lib/jaxb-api.jar:"$JAXB_HOME"/lib/jaxb-core.jar:"$JAXB_HOME"/lib/jaxb-xjc.jar:"$JAXB_HOME"/lib/jaxb-jxc.jar:"$JAXB_HOME"/lib/jaxb-impl.jar
+    LOCALCLASSPATH="$JAXB_HOME"/lib/jaxb-api.jar:"$JAXB_HOME"/lib/jaxb-core.jar:"$JAXB_HOME"/lib/jaxb-xjc.jar:"$JAXB_HOME"/lib/jaxb-jxc.jar:"$JAXB_HOME"/lib/jaxb-impl.jar:"$JAXB_HOME"/lib/javax.activation.jar
 else
-    LOCALCLASSPATH="$JAXB_HOME"/lib/jaxb-api.jar:"$JAXB_HOME"/lib/jaxb-core.jar:"$JAXB_HOME"/lib/jaxb-xjc.jar:"$JAXB_HOME"/lib/jaxb-jxc.jar:"$JAXB_HOME"/lib/jaxb-impl.jar:"$LOCALCLASSPATH"
+    LOCALCLASSPATH="$JAXB_HOME"/lib/jaxb-api.jar:"$JAXB_HOME"/lib/jaxb-core.jar:"$JAXB_HOME"/lib/jaxb-xjc.jar:"$JAXB_HOME"/lib/jaxb-jxc.jar:"$JAXB_HOME"/lib/jaxb-impl.jar:"$JAXB_HOME"/lib/javax.activation.jar:"$LOCALCLASSPATH"
 fi
 
Index: /applications/editors/josm/plugins/00_tools/jaxb-ri/bin/xjc.bat
===================================================================
--- /applications/editors/josm/plugins/00_tools/jaxb-ri/bin/xjc.bat	(revision 34387)
+++ /applications/editors/josm/plugins/00_tools/jaxb-ri/bin/xjc.bat	(revision 34388)
@@ -66,5 +66,5 @@
 
 :LAUNCHXJC
-%JAVA% %XJC_OPTS% -jar "%JAXB_HOME%\lib\jaxb-xjc.jar" %*
+%JAVA% %XJC_OPTS% -cp "%JAXB_HOME%\lib\javax.activation.jar" -jar "%JAXB_HOME%\lib\jaxb-xjc.jar" %*
 
 :END
Index: /applications/editors/josm/plugins/00_tools/jaxb-ri/bin/xjc.sh
===================================================================
--- /applications/editors/josm/plugins/00_tools/jaxb-ri/bin/xjc.sh	(revision 34387)
+++ /applications/editors/josm/plugins/00_tools/jaxb-ri/bin/xjc.sh	(revision 34388)
@@ -85,3 +85,3 @@
 fi
 
-exec "$JAVA" $XJC_OPTS -jar "$JAXB_HOME/lib/jaxb-xjc.jar" "$@"
+exec "$JAVA" $XJC_OPTS -cp "$JAXB_HOME/lib/javax.activation.jar" -jar "$JAXB_HOME/lib/jaxb-xjc.jar" "$@"
