Index: applications/editors/josm/plugins/build.xml
===================================================================
--- applications/editors/josm/plugins/build.xml	(revision 13328)
+++ applications/editors/josm/plugins/build.xml	(revision 13332)
@@ -21,5 +21,4 @@
         <ant antfile="build.xml" target="dist" dir="osmarender"/>
         <ant antfile="build.xml" target="dist" dir="plastic_laf"/>
-        <ant antfile="build.xml" target="dist" dir="pluginmanager"/>
         <ant antfile="build.xml" target="dist" dir="remotecontrol"/>
         <ant antfile="build.xml" target="dist" dir="slippymap"/>
@@ -37,4 +36,5 @@
         <ant antfile="build.xml" target="dist" dir="grid"/>
         <ant antfile="build.xml" target="dist" dir="navigator"/>
+        <ant antfile="build.xml" target="dist" dir="pluginmanager"/>
     </target>
     <target name="clean">
Index: applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- applications/editors/josm/plugins/surveyor/build.xml	(revision 13328)
+++ applications/editors/josm/plugins/surveyor/build.xml	(revision 13332)
@@ -1,23 +1,23 @@
 <project name="surveyor" default="dist" basedir=".">
-<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-    <property environment="env"/>
-    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-        <and>
-            <os family="windows"/>
-        </and>
-    </condition>
-<!-- compilation properties -->
-    <property name="josm.build.dir"   value="../../core"/>
-    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-    <property name="josm"         location="../../core/dist/josm-custom.jar" />
-    <property name="plugin.build.dir" value="build"/>
-    <property name="plugin.dist.dir"  value="../../dist"/>
-    <property name="plugin.name"      value="${ant.project.name}"/>
-    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
-    <property name="livegpsplugin.jar" value="../../dist/livegps.jar"/>
-    <property name="plugin.description" value="Allow adding markers/nodes on current gps positions."/>
-    <property name="plugin.stage" value="60"/>
-    <property name="plugin.class" value="at.dallermassl.josm.plugin.surveyor.SurveyorPlugin"/>
+    <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"/>
+    <property name="livegpsplugin.jar"      value="${plugin.dist.dir}/livegps.jar"/>
     <property name="ant.build.javac.target" value="1.5"/>
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}"/>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" destdir="${plugin.build.dir}" debug="true">
+            <compilerarg value="-Xlint:deprecation"/>
+            <compilerarg value="-Xlint:unchecked"/>
+            <classpath>
+                <pathelement location="${josm}"/>
+                <pathelement location="${livegpsplugin.jar}"/>
+            </classpath>
+        </javac>
+    </target>
     <target name="dist" depends="compile">
         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
@@ -29,5 +29,4 @@
         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
         <delete file="REVISION"/>
-<!-- images -->
         <copy todir="${plugin.build.dir}/">
             <fileset dir="resources">
@@ -36,39 +35,18 @@
             </fileset>
         </copy>
-<!-- create jar file -->
+        <copy todir="${plugin.build.dir}/images" >
+            <fileset dir="images" />
+        </copy>
         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
             <manifest>
-                <attribute name="Plugin-Class" value="${plugin.class}" />
-                <attribute name="Plugin-Description" value="${plugin.description}" />
-                <attribute name="Plugin-Stage" value="${plugin.stage}" />
+                <attribute name="Plugin-Class" value="at.dallermassl.josm.plugin.surveyor.SurveyorPlugin" />
+                <attribute name="Plugin-Description" value="Allow adding markers/nodes on current gps positions." />
+                <attribute name="Plugin-Stage" value="60" />
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Mainversion" value="1180" />
+                <attribute name="Plugin-Mainversion" value="1326" />
+                <attribute name="Plugin-Requires" value="livegps" />
             </manifest>
         </jar>
-    </target>
-    <target name="compile" depends="init">
-        <echo message="creating ${plugin.jar}"/>
-        <mkdir dir="${plugin.build.dir}"/>
-        <copy todir="build/images" >
-            <fileset dir="images" />
-        </copy>
-        <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
-            <compilerarg value="-Xlint:deprecation"/>
-            <compilerarg value="-Xlint:unchecked"/>
-            <classpath>
-                <pathelement path="${josm.build.dir}/build"/>
-                <fileset dir="${josm.build.dir}/lib">
-                    <include name="**/*.jar"/>
-                </fileset>
-                <pathelement location="${livegpsplugin.jar}"/>
-            </classpath>
-        </javac>
-    </target>
-    <target name="install" depends="dist">
-        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-    </target>
-    <target name="init">
-        <echo>java version: ${java.version}</echo>
     </target>
     <target name="clean">
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java	(revision 13328)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java	(revision 13332)
@@ -22,5 +22,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MainMenu;
-import org.openstreetmap.josm.plugins.PluginProxy;
+import org.openstreetmap.josm.plugins.PluginHandler;
 
 /**
@@ -44,35 +44,5 @@
         super();
 
-        // try to determine if the livegps plugin was already loaded:
-//        PluginInformation pluginInfo = PluginInformation.getLoaded("livegps");
-//        if (pluginInfo == null) {
-//          JOptionPane.showMessageDialog(null, "Please install wmsplugin");
-//          return;
-//        }
-//        if (!pluginInfo.version.equals("2")) {
-//          JOptionPane.showMessageDialog(null, "livegps Version 2 required.");
-//          return;
-//        }
-        try {
-            Class.forName("livegps.LiveGpsPlugin");
-        } catch(ClassNotFoundException cnfe) {
-            String message =
-                tr("SurveyorPlugin depends on LiveGpsPlugin!") + "\n" +
-                tr("LiveGpsPlugin not found, please install and activate.") + "\n" +
-                tr("SurveyorPlugin is disabled for the moment");
-            JOptionPane.showMessageDialog(Main.parent, message, tr("SurveyorPlugin"), JOptionPane.ERROR_MESSAGE);
-            return;
-        }
-
-
-        LiveGpsPlugin gpsPlugin = null;
-        Iterator<PluginProxy> proxyIter = Main.plugins.iterator();
-        while(proxyIter.hasNext()) {
-            Object plugin = proxyIter.next().plugin;
-            if(plugin instanceof LiveGpsPlugin) {
-                gpsPlugin = (LiveGpsPlugin) plugin;
-                break;
-            }
-        }
+        LiveGpsPlugin gpsPlugin = (LiveGpsPlugin) PluginHandler.getPlugin("livegps");
         if(gpsPlugin == null)
             throw new IllegalStateException(tr("SurveyorPlugin needs LiveGpsPlugin, but could not find it!"));
Index: applications/editors/josm/plugins/validator/build.xml
===================================================================
--- applications/editors/josm/plugins/validator/build.xml	(revision 13328)
+++ applications/editors/josm/plugins/validator/build.xml	(revision 13332)
@@ -1,12 +1,7 @@
 <project name="validator" default="dist" basedir=".">
-<!-- compilation properties -->
-    <property name="josm.build.dir"   value="../../core"/>
-    <property name="josm.home.dir"    value="${user.home}/.josm"/>
-    <property name="plugin.build.dir" value="build"/>
-    <property name="plugin.dist.dir"  value="../../dist"/>
-    <property name="plugin.name"      value="${ant.project.name}"/>
-    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
-<!-- point to your JOSM directory -->
-    <property name="josm" location="../../core/dist/josm-custom.jar" />
+    <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"/>
     <property name="ant.build.javac.target" value="1.5"/>
     <target name="init">
@@ -15,10 +10,12 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" destdir="build" debug="true" encoding="UTF-8">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" encoding="UTF-8">
+            <compilerarg value="-Xlint:deprecation"/>
+            <compilerarg value="-Xlint:unchecked"/>
             <include name="**/*.java" />
         </javac>
     </target>
-    <target name="dist" depends="clean, compile">
-        <copy todir="build/images">
+    <target name="dist" depends="compile">
+        <copy todir="${plugin.build.dir}/images">
             <fileset dir="images"/>
         </copy>
@@ -31,5 +28,5 @@
         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
         <delete file="REVISION"/>
-        <jar destfile="${plugin.jar}" basedir="build">
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
             <manifest>
                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin"/>
@@ -42,14 +39,7 @@
         </jar>
     </target>
-<!-- clean target -->
     <target name="clean">
         <delete dir="${plugin.build.dir}" />
         <delete file="${plugin.jar}" />
     </target>
-    <target name="install" depends="dist">
-        <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
-    </target>
-    <target name="test" depends="install">
-        <java jar="${josm}" fork="true"></java>
-    </target>
 </project>
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java	(revision 13328)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java	(revision 13332)
@@ -16,5 +16,4 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.validator.util.Util;
-import org.openstreetmap.josm.plugins.validator.util.Util.Version;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -89,8 +88,5 @@
         testPane.setBorder(null);
 
-        Version ver = Util.getVersion();
         String description = tr("An OSM data validator that checks for common errors made by users and editor programs.");
-        if( ver != null )
-            description += "<br>" + tr("Version {0} - Last change at {1}", ver.revision, ver.time);
         JPanel tab = gui.createPreferenceTab("validator", tr("Data validator"), description);
         tab.add(testPane, GBC.eol().fill(GBC.BOTH));
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Util.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Util.java	(revision 13328)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Util.java	(revision 13332)
@@ -30,41 +30,4 @@
     {
         return Main.pref.getPreferencesDir() + "plugins/validator/";
-    }
-
-    /**
-     * Returns the version
-     * @return The version of the application
-     */
-    public static Version getVersion()
-    {
-        PluginInformation info = PluginInformation.getLoaded("validator");
-        if( info == null )
-            return null;
-
-        return new Version(info.version, info.attr.get("Plugin-Date"));
-    }
-
-    /**
-     * Utility class for displaying versions
-     *
-     * @author frsantos
-     */
-    public static class Version
-    {
-        /** The revision */
-        public String revision;
-        /** The build time */
-        public String time;
-
-        /**
-         * Constructor
-         * @param revision
-         * @param time
-         */
-        public Version(String revision, String time)
-        {
-            this.revision = revision;
-            this.time = time;
-        }
     }
 
Index: applications/editors/josm/plugins/wmsplugin/build.xml
===================================================================
--- applications/editors/josm/plugins/wmsplugin/build.xml	(revision 13328)
+++ applications/editors/josm/plugins/wmsplugin/build.xml	(revision 13332)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>