Index: /applications/editors/josm/plugins/duplicateway/build.xml
===================================================================
--- /applications/editors/josm/plugins/duplicateway/build.xml	(revision 14127)
+++ /applications/editors/josm/plugins/duplicateway/build.xml	(revision 14128)
@@ -1,11 +1,7 @@
 <project name="Duplicate-Way" default="dist" basedir=".">
-<!-- compilation properties -->
-    <property name="josm.build.dir"   value="../../core"/>
-    <property name="josm.home.dir"    value="${user.home}/.josm"/>
-    <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="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">
@@ -14,36 +10,45 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <mkdir dir="build"></mkdir>
-        <mkdir dir="${plugin.build.dir}/images"></mkdir>
-        <copy todir="build">
-            <fileset dir="${plugin.build.dir}" casesensitive="yes">
-                <filename name="**/*.class"/>
-            </fileset>
-        </copy>
-        <copy todir="${plugin.build.dir}/images">
-            <fileset dir="images" casesensitive="yes">
-                <filename name="**/*.png"/>
-            </fileset>
-        </copy>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
-            <include name="**/*.java" />
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+            <compilerarg value="-Xlint:deprecation"/>
+            <compilerarg value="-Xlint:unchecked"/>
         </javac>
     </target>
-    <target name="dist" depends="compile">
-        <jar destfile="${plugin.jar}" basedir="build">
+    <target name="dist" depends="compile,revision">
+        <copy todir="${plugin.build.dir}/images">
+            <fileset dir="images"/>
+        </copy>
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
             <manifest>
+                <attribute name="Author" value="Brent Easton"/>
                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.duplicateway.DuplicateWayPlugin" />
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Duplicate Ways with an offset" />
-                <attribute name="Plugin-Version" value="0.1"/>
-                <attribute name="Author" value="Brent Easton &lt;b.easton@uws.edu.au>"/>
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
         </jar>
     </target>
+    <target name="revision">
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+    </target>
     <target name="clean">
-        <delete dir="${plugin.build.dir}" />
-        <delete file="${plugin.jar}" />
+        <delete dir="${plugin.build.dir}"/>
+        <delete file="${plugin.jar}"/>
     </target>
     <target name="install" depends="dist">
-        <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
+        <property environment="env"/>
+        <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+            <and>
+                <os family="windows"/>
+            </and>
+        </condition>
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     </target>
 </project>
Index: /applications/editors/josm/plugins/grid/build.xml
===================================================================
--- /applications/editors/josm/plugins/grid/build.xml	(revision 14127)
+++ /applications/editors/josm/plugins/grid/build.xml	(revision 14128)
@@ -1,41 +1,53 @@
 <project name="grid" default="dist" basedir=".">
-<!-- compilation properties -->
-    <property name="josm.build.dir"   value="../../core"/>
-    <property name="josm.home.dir"    value="${user.home}/.josm"/>
-    <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"/>
-<!-- point to your JOSM directory -->
-    <property name="josm" location="${josm.build.dir}/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">
-        <mkdir dir="build"></mkdir>
-        <mkdir dir="dist"></mkdir>
+        <mkdir dir="${plugin.build.dir}"/>
     </target>
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
-            <include name="**/*.java" />
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+            <compilerarg value="-Xlint:deprecation"/>
+            <compilerarg value="-Xlint:unchecked"/>
         </javac>
     </target>
-    <target name="dist" depends="compile">
-        <copy todir="build/images" >
-            <fileset dir="images" />
+    <target name="dist" depends="compile,revision">
+        <copy todir="${plugin.build.dir}/images">
+            <fileset dir="images"/>
         </copy>
-        <jar destfile="${plugin.jar}" basedir="build">
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
             <manifest>
                 <attribute name="Plugin-Class" value="grid.GridPlugin" />
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Provide a background layer that displays a map grid" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
         </jar>
     </target>
+    <target name="revision">
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+    </target>
     <target name="clean">
-        <delete dir="${plugin.build.dir}" />
-        <delete file="${plugin.jar}" />
+        <delete dir="${plugin.build.dir}"/>
+        <delete file="${plugin.jar}"/>
     </target>
     <target name="install" depends="dist">
-        <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
+        <property environment="env"/>
+        <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+            <and>
+                <os family="windows"/>
+            </and>
+        </condition>
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     </target>
 </project>
Index: /applications/editors/josm/plugins/navigator/build.xml
===================================================================
--- /applications/editors/josm/plugins/navigator/build.xml	(revision 14127)
+++ /applications/editors/josm/plugins/navigator/build.xml	(revision 14128)
@@ -1,54 +1,18 @@
 <project name="navigator" default="dist" basedir=".">
-<!-- compilation properties -->
-    <property name="josm.build.dir"   value="../../core"/>
-    <property name="josm.home.dir"    value="${user.home}/.josm"/>
-    <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"/>
-<!-- plugin meta data (enter new version number if anything changed!) -->
-    <property name="plugin.version" value="0.3.1"/>
-    <property name="plugin.description" value="Provides navigation/autorouting functionality (V${plugin.version})."/>
-    <property name="plugin.stage" value="50"/>
-    <property name="plugin.class" value="at.dallermassl.josm.plugin.navigator.NavigatorPlugin"/>
-<!-- update site meta data -->
-    <property name="plugin.site.file" value="josm-site.xml"/>
-    <property name="plugin.site.description" value="Josm's Surveyor Update Site"/>
-    <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/${ant.project.name}/"/>
-    <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/${ant.project.name}/"/>
+    <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="dist" depends="compile,site">
-<!-- images -->
-        <copy todir="${plugin.build.dir}/images">
-            <fileset dir="src/images" />
-        </copy>
-<!-- copy configuration xml files
-     <copy todir="${plugin.build.dir}">
-       <fileset dir="src">
-         <include name="*.xml"/>
-       </fileset>
-     </copy>
-     -->
-<!-- create jar file -->
-        <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-Version" value="${plugin.version}" />
-                <attribute name="Plugin-Dependencies" value="jgrapht-jdk1.5" />
-                <attribute name="Plugin-Stage" value="${plugin.stage}" />
-            </manifest>
-        </jar>
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}"/>
     </target>
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <mkdir dir="${plugin.build.dir}"/>
-        <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
+        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
+            <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="${josm}"/>
                 <fileset dir="lib">
                     <include name="**/*.jar"/>
@@ -57,66 +21,44 @@
         </javac>
     </target>
-    <target name="install" depends="dist">
-        <copy file="${plugin.jar}" todir="${josm.home.dir}/plugins" />
-        <copy todir="${josm.home.dir}/plugins">
-            <fileset dir="lib">
-                <include name="**/*.jar"/>
-            </fileset>
+    <target name="dist" depends="compile,revision">
+        <unjar dest="${plugin.build.dir}">
+            <fileset dir="lib"/>
+        </unjar>
+        <copy todir="${plugin.build.dir}/images">
+            <fileset dir="images"/>
         </copy>
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Author" value="Christof Dallermassl" />
+                <attribute name="Plugin-Class" value="at.dallermassl.josm.plugin.navigator.NavigatorPlugin" />
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Description" value="Provides navigation/autorouting functionality" />
+                <attribute name="Plugin-Stage" value="50" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+            </manifest>
+        </jar>
     </target>
-    <target name="init">
-        <echo>java version: ${java.version}</echo>
+    <target name="revision">
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
     </target>
     <target name="clean">
-        <delete dir="${plugin.build.dir}" />
-        <delete dir="${plugin.site.file}" />
-        <delete file="${plugin.jar}" />
+        <delete dir="${plugin.build.dir}"/>
+        <delete file="${plugin.jar}"/>
     </target>
-<!-- write site description for the given plugin so josm will accept it -->
-    <target name="site">
-        <echo message="creating site description in ${plugin.site.file}"/>
-        <echo file="${plugin.site.file}">&lt;!-- plugins available on this site -->
-  &lt;plugins>
-  &lt;plugin id="${ant.project.name}" version="${plugin.version}">
-  &lt;name>${ant.project.name}&lt;/name>
-  &lt;description>${plugin.description}&lt;/description>
-  &lt;resource>${plugin.site.url}${plugin.jar}&lt;/resource>
-  &lt;/plugin>
-  &lt;/plugins>
-</echo>
-    </target>
-<!-- write site description for the given plugin (not implemented in JOSM as full version yet!) -->
-    <target name="site-full-donotuse">
-        <echo message="creating site description in ${plugin.site.file}"/>
-        <echo file="${plugin.site.file}">&lt;?xml version="1.0"?>
-    &lt;site version="1.0">
-    &lt;!-- meta data of site -->
-&lt;site-info>
-&lt;site-name>${plugin.site.description}&lt;/site-name>
-&lt;site-url>${plugin.site.url}&lt;/site-url>
-&lt;/site-info>
-
-&lt;!-- plugins available on this site -->
-&lt;plugins>
-&lt;plugin id="${ant.project.name}" version="${plugin.version}">
-&lt;name>${ant.project.name}&lt;/name>
-&lt;description>${plugin.description}&lt;/description>
-&lt;resources>
-&lt;resource src="${plugin.site.url}${plugin.jar}"
-target="${josm.home.dir}/plugins/${plugin.jar}"/>
-&lt;/resources>
-&lt;/plugin>
-&lt;/plugins>
-&lt;/site>
-</echo>
-    </target>
-<!-- upload the site description and the jar file via ssh -->
-    <target name="upload" depends="dist,site">
-        <echo message="uploading jar and site description to ${plugin.site.upload.target}"/>
-        <exec executable="scp">
-            <arg value="${plugin.jar}"/>
-            <arg value="${plugin.site.file}"/>
-            <arg value="${plugin.site.upload.target}"/>
-        </exec>
+    <target name="install" depends="dist">
+        <property environment="env"/>
+        <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+            <and>
+                <os family="windows"/>
+            </and>
+        </condition>
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     </target>
 </project>