Index: /applications/editors/josm/plugins/build.xml
===================================================================
--- /applications/editors/josm/plugins/build.xml	(revision 24624)
+++ /applications/editors/josm/plugins/build.xml	(revision 24625)
@@ -8,4 +8,7 @@
     <target name="dist" depends="compile">
         <mkdir dir="../dist"/>
+        <!-- must be before other plugins using it -->
+        <ant antfile="build.xml" target="dist" dir="remotecontrol"/>
+
         <ant antfile="build.xml" target="dist" dir="addrinterpolation"/>
         <ant antfile="build.xml" target="dist" dir="alignways"/>
@@ -17,17 +20,22 @@
         <ant antfile="build.xml" target="dist" dir="czechaddress"/>
         <ant antfile="build.xml" target="dist" dir="dataimport"/>
+        <ant antfile="build.xml" target="dist" dir="DirectDownload"/>
         <ant antfile="build.xml" target="dist" dir="DirectUpload"/>
         <ant antfile="build.xml" target="dist" dir="download_along"/>
         <ant antfile="build.xml" target="dist" dir="editgpx"/>
         <ant antfile="build.xml" target="dist" dir="ElevationProfile"/>
+        <ant antfile="build.xml" target="dist" dir="epsg31287"/>
         <ant antfile="build.xml" target="dist" dir="ext_tools"/>
         <ant antfile="build.xml" target="dist" dir="FixAddresses"/>
         <ant antfile="build.xml" target="dist" dir="globalsat"/>
+        <ant antfile="build.xml" target="dist" dir="gpxfilter"/>
         <ant antfile="build.xml" target="dist" dir="graphview"/>
+        <ant antfile="build.xml" target="dist" dir="imagery"/>
         <ant antfile="build.xml" target="dist" dir="imagewaypoint"/>
         <ant antfile="build.xml" target="dist" dir="ImportImagePlugin"/>
+        <ant antfile="build.xml" target="dist" dir="importvec"/>
         <ant antfile="build.xml" target="dist" dir="lakewalker"/>
         <ant antfile="build.xml" target="dist" dir="livegps"/>
-    	<ant antfile="build.xml" target="dist" dir="mapdust"/>
+        <ant antfile="build.xml" target="dist" dir="mapdust"/>
         <ant antfile="build.xml" target="dist" dir="measurement"/>
         <ant antfile="build.xml" target="dist" dir="michigan_left"/>
@@ -36,13 +44,13 @@
         <ant antfile="build.xml" target="dist" dir="nearclick"/>
         <ant antfile="build.xml" target="dist" dir="OpeningHoursEditor"/>
-        <ant antfile="build.xml" target="dist" dir="openlayers"/>
         <ant antfile="build.xml" target="dist" dir="openstreetbugs"/>
         <ant antfile="build.xml" target="dist" dir="openvisible"/>
         <ant antfile="build.xml" target="dist" dir="osmarender"/>
+        <ant antfile="build.xml" target="dist" dir="pdfimport"/>
         <ant antfile="build.xml" target="dist" dir="photo_geotagging"/>
         <ant antfile="build.xml" target="dist" dir="piclayer"/>
         <ant antfile="build.xml" target="dist" dir="plastic_laf"/>
         <ant antfile="build.xml" target="dist" dir="public_transport"/>
-        <ant antfile="build.xml" target="dist" dir="remotecontrol"/>
+        <ant antfile="build.xml" target="dist" dir="restart"/>
         <ant antfile="build.xml" target="dist" dir="reverter"/>
         <ant antfile="build.xml" target="dist" dir="roadsigns"/>
@@ -51,4 +59,6 @@
         <ant antfile="build.xml" target="dist" dir="simplifyarea"/>
         <ant antfile="build.xml" target="dist" dir="slippymap"/>
+        <ant antfile="build.xml" target="dist" dir="smed"/>
+        <ant antfile="build.xml" target="dist" dir="smed_fw"/>
         <ant antfile="build.xml" target="dist" dir="surveyor"/>
         <ant antfile="build.xml" target="dist" dir="tageditor"/>
@@ -60,5 +70,5 @@
         <ant antfile="build.xml" target="dist" dir="turnrestrictions"/>
         <ant antfile="build.xml" target="dist" dir="undelete"/>
-        <ant antfile="build.xml" target="dist" dir="validator"/>
+        <ant antfile="build.xml" target="dist" dir="utilsplugin2"/>
         <ant antfile="build.xml" target="dist" dir="videomapping"/>
         <ant antfile="build.xml" target="dist" dir="walkingpapers"/>
@@ -72,6 +82,7 @@
     </target>
     <target name="build_defect" depends="compile">
-        <ant antfile="build.xml" target="dist" dir="duplicateway"/>
-        <ant antfile="build.xml" target="dist" dir="grid"/>
+        <ant antfile="build.xml" target="dist" dir="rgisopen"/>
+        <ant antfile="build.xml" target="dist" dir="smed_bfw"/>
+        <ant antfile="build.xml" target="dist" dir="trustosm"/>
     </target>
     <target name="clean">
@@ -84,14 +95,17 @@
         <ant antfile="build.xml" target="clean" dir="czechaddress"/>
         <ant antfile="build.xml" target="clean" dir="dataimport"/>
+        <ant antfile="build.xml" target="clean" dir="DirectDownload"/>
         <ant antfile="build.xml" target="clean" dir="DirectUpload"/>
         <ant antfile="build.xml" target="clean" dir="download_along"/>
-        <ant antfile="build.xml" target="clean" dir="duplicateway"/>
         <ant antfile="build.xml" target="clean" dir="editgpx"/>
+        <ant antfile="build.xml" target="clean" dir="epsg31287"/>
         <ant antfile="build.xml" target="clean" dir="ext_tools"/>
         <ant antfile="build.xml" target="clean" dir="globalsat"/>
+        <ant antfile="build.xml" target="clean" dir="gpxfilter"/>
         <ant antfile="build.xml" target="clean" dir="graphview"/>
-        <ant antfile="build.xml" target="clean" dir="grid"/>
+        <ant antfile="build.xml" target="clean" dir="imagery"/>
         <ant antfile="build.xml" target="clean" dir="imagewaypoint"/>
         <ant antfile="build.xml" target="clean" dir="ImportImagePlugin"/>
+        <ant antfile="build.xml" target="clean" dir="importvec"/>
         <ant antfile="build.xml" target="clean" dir="irsrectify"/>
         <ant antfile="build.xml" target="clean" dir="lakewalker"/>
@@ -104,8 +118,8 @@
         <ant antfile="build.xml" target="clean" dir="nearclick"/>
         <ant antfile="build.xml" target="clean" dir="OpeningHoursEditor"/>
-        <ant antfile="build.xml" target="clean" dir="openlayers"/>
         <ant antfile="build.xml" target="clean" dir="openstreetbugs"/>
         <ant antfile="build.xml" target="clean" dir="openvisible"/>
         <ant antfile="build.xml" target="clean" dir="osmarender"/>
+        <ant antfile="build.xml" target="clean" dir="pdfimport"/>
         <ant antfile="build.xml" target="clean" dir="photo_geotagging"/>
         <ant antfile="build.xml" target="clean" dir="piclayer"/>
@@ -113,5 +127,7 @@
         <ant antfile="build.xml" target="clean" dir="public_transport"/>
         <ant antfile="build.xml" target="clean" dir="remotecontrol"/>
+        <ant antfile="build.xml" target="clean" dir="restart"/>
         <ant antfile="build.xml" target="clean" dir="reverter"/>
+        <ant antfile="build.xml" target="clean" dir="rgisopen"/>
         <ant antfile="build.xml" target="clean" dir="roadsigns"/>
         <ant antfile="build.xml" target="clean" dir="routes"/>
@@ -119,4 +135,7 @@
         <ant antfile="build.xml" target="clean" dir="simplifyarea"/>
         <ant antfile="build.xml" target="clean" dir="slippymap"/>
+        <ant antfile="build.xml" target="clean" dir="smed"/>
+        <ant antfile="build.xml" target="clean" dir="smed_bfw"/>
+        <ant antfile="build.xml" target="clean" dir="smed_fw"/>
         <ant antfile="build.xml" target="clean" dir="surveyor"/>
         <ant antfile="build.xml" target="clean" dir="tageditor"/>
@@ -126,7 +145,8 @@
         <ant antfile="build.xml" target="clean" dir="touchscreenhelper"/>
         <ant antfile="build.xml" target="clean" dir="tracer"/>
+        <ant antfile="build.xml" target="clean" dir="trustosm"/>
         <ant antfile="build.xml" target="clean" dir="turnrestrictions"/>
         <ant antfile="build.xml" target="clean" dir="undelete"/>
-        <ant antfile="build.xml" target="clean" dir="validator"/>
+        <ant antfile="build.xml" target="clean" dir="utilsplugin2"/>
         <ant antfile="build.xml" target="clean" dir="videomapping"/>
         <ant antfile="build.xml" target="clean" dir="walkingpapers"/>
Index: /applications/editors/josm/plugins/editgpx/build.xml
===================================================================
--- /applications/editors/josm/plugins/editgpx/build.xml	(revision 24624)
+++ /applications/editors/josm/plugins/editgpx/build.xml	(revision 24625)
@@ -32,8 +32,6 @@
 
 
-	<!-- <property name="josm"                   location="../../core/dist/josm-custom.jar"/> -->
-	<property name="josm"                   location="../JOSM/dist/josm-custom.jar"/>
-	<!-- <property name="plugin.dist.dir"        value="../../dist"/>-->
-	<property name="plugin.dist.dir"        value=".."/>
+	<property name="josm"                   location="../../core/dist/josm-custom.jar"/>
+	<property name="plugin.dist.dir"        value="../../dist"/>
 	<property name="plugin.build.dir"       value="build"/>
 	<property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
Index: /applications/editors/josm/plugins/wmsplugin/webkit-image.cpp
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/webkit-image.cpp	(revision 24624)
+++ /applications/editors/josm/plugins/wmsplugin/webkit-image.cpp	(revision 24625)
@@ -152,7 +152,7 @@
   QObject::connect(s, SIGNAL(finish(void)), &a, SLOT(quit()));
   /* set some useful defaults for a webpage */
-//  page->setViewportSize(QSize(1280,1024));
-//  page->mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
-//  page->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
+  page->setViewportSize(QSize(1280,1024));
+  page->mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
+  page->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
   page->mainFrame()->load (QUrl(url));
   return a.exec();