Index: applications/editors/josm/plugins/alignways/build.xml
===================================================================
--- applications/editors/josm/plugins/alignways/build.xml	(revision 25199)
+++ applications/editors/josm/plugins/alignways/build.xml	(revision 26174)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 ** This is a template build file for a JOSM  plugin.
@@ -29,259 +29,228 @@
 -->
 <project name="alignways" default="dist" basedir=".">
+    <!-- enter the SVN commit message -->
+    <property name="commit.message" value="fix shortcut conflict"/>
+    <!--
+        enter the *lowest* JOSM version this plugin is currently compatible
+        with
+    -->
+    <property name="plugin.main.version" value="3835"/>
+    <!--
+        ************************************************ ** should not be
+        necessary to change the following properties
+    -->
+    <property name="josm" location="../../core/dist/josm-custom.jar"/>
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.src.dir" value="src"/>
+    <property name="plugin.lib.dir" value="lib"/>
+    <!-- this is the directory where the plugin jar is copied to -->
+    <property name="plugin.dist.dir" value="../../dist"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <property name="plugin.dist.dir" value="../../dist"/>
+    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+    <!--
+        ********************************************************** ** init -
+        initializes the build
+        **********************************************************
+    -->
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}"/>
+    </target>
+    <!--
+        ********************************************************** ** compile
+        - complies the source tree
+        **********************************************************
+    -->
+    <target name="compile" depends="init">
+        <echo message="compiling sources for  ${plugin.jar} ... "/>
+        <javac srcdir="src" classpath="${josm};${plugin.lib.dir}" debug="true" destdir="${plugin.build.dir}">
+            <compilerarg value="-Xlint:deprecation"/>
+            <compilerarg value="-Xlint:unchecked"/>
+        </javac>
+        <copy todir="${plugin.build.dir}">
+            <fileset dir="lib"/>
+        </copy>
+    </target>
+    <!--
+        ********************************************************** ** dist -
+        creates the plugin jar
+        **********************************************************
+    -->
+    <target name="dist" depends="compile,revision">
+        <echo message="creating ${ant.project.name}.jar ... "/>
+        <copy todir="${plugin.build.dir}/resources">
+            <fileset dir="resources"/>
+        </copy>
+        <copy todir="${plugin.build.dir}/images">
+            <fileset dir="images"/>
+        </copy>
+        <copy todir="${plugin.build.dir}/data">
+            <fileset dir="data"/>
+        </copy>
+        <copy todir="${plugin.build.dir}">
+            <fileset dir=".">
+                <include name="README"/>
+                <include name="LICENSE"/>
+            </fileset>
+        </copy>
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <!--
+                ************************************************ ** configure these
+                properties. Most of them will be copied to the plugins ** manifest
+                file. Property values will also show up in the list available **
+                plugins: http://josm.openstreetmap.de/wiki/Plugins. **
+                ************************************************
+            -->
+            <manifest>
+                <attribute name="Author" value="Attila Szász"/>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.alignways.AlignWaysPlugin"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Description" value="Makes a pair of selected way segments parallel by rotating one of them around a chosen pivot."/>
+                <attribute name="Plugin-Icon" value="images/alignways.png"/>
+                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/AlignWayS"/>
+            </manifest>
+        </jar>
+    </target>
+    <!--
+        ********************************************************** ** revision
+        - extracts the current revision number for the ** file build.number
+        and stores it in the XML property ** version.*
+        **********************************************************
+    -->
+    <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>
+    <!--
+        ********************************************************** ** clean -
+        clean up the build environment
+        **********************************************************
+    -->
+    <target name="clean">
+        <delete dir="${plugin.build.dir}"/>
+        <delete file="${plugin.jar}"/>
+    </target>
+    <!--
+        ********************************************************** ** install
+        - install the plugin in your local JOSM installation
+        **********************************************************
+    -->
+    <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>
+    <!--
+        ************************** Publishing the plugin
+        ***********************************
+    -->
+    <!--
+        ** extracts the JOSM release for the JOSM version in ../core and saves
+        it in the ** property ${coreversion.info.entry.revision} **
+    -->
+    <target name="core-info">
+        <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="../../core"/>
+        </exec>
+        <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+        <echo>Building against core revision
+            ${coreversion.info.entry.revision}.</echo>
+        <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+        <delete file="core.info.xml"/>
+    </target>
+    <!--
+        ** commits the source tree for this plugin
+        -->
+    <target name="commit-current">
+        <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="commit"/>
+            <arg value="-m '${commit.message}'"/>
+            <arg value="."/>
+        </exec>
+    </target>
+    <!--
+        ** updates (svn up) the source tree for this plugin
+        -->
+    <target name="update-current">
+        <echo>Updating plugin source ...</echo>
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="up"/>
+            <arg value="."/>
+        </exec>
+        <echo>Updating ${plugin.jar} ...</echo>
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="up"/>
+            <arg value="../dist/${plugin.jar}"/>
+        </exec>
+    </target>
+    <!--
+        ** commits the plugin.jar
+        -->
+    <target name="commit-dist">
+        <echo>
+            ***** Properties of published ${plugin.jar} *****
+            Commit message
+            : '${commit.message}'
+            Plugin-Mainversion: ${plugin.main.version}
+            JOSM
+            build version: ${coreversion.info.entry.revision}
+            Plugin-Version :
+            ${version.entry.commit.revision}
+            ***** / Properties of published
+            ${plugin.jar} *****
 
-	<!-- enter the SVN commit message -->
-	<property name="commit.message" value="fix shortcut conflict" />
-	<!--
-		enter the *lowest* JOSM version this plugin is currently compatible
-		with
-	-->
-	<property name="plugin.main.version" value="3835" />
-
-
-	<!--
-		************************************************ ** should not be
-		necessary to change the following properties
-	-->
-	<property name="josm" location="../../core/dist/josm-custom.jar" />
-	<property name="plugin.build.dir" value="build" />
-	<property name="plugin.src.dir" value="src" />
-	<property name="plugin.lib.dir" value="lib" />
-	<!-- this is the directory where the plugin jar is copied to -->
-	<property name="plugin.dist.dir" value="../../dist" />
-	<property name="ant.build.javac.target" value="1.5" />
-	<property name="plugin.dist.dir" value="../../dist" />
-	<property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar" />
-
-	<!--
-		********************************************************** ** init -
-		initializes the build
-		**********************************************************
-	-->
-	<target name="init">
-		<mkdir dir="${plugin.build.dir}" />
-	</target>
-
-	<!--
-		********************************************************** ** compile
-		- complies the source tree
-		**********************************************************
-	-->
-	<target name="compile" depends="init">
-		<echo message="compiling sources for  ${plugin.jar} ... " />
-		<javac srcdir="src" classpath="${josm};${plugin.lib.dir}" debug="true"
-			destdir="${plugin.build.dir}">
-			<compilerarg value="-Xlint:deprecation" />
-			<compilerarg value="-Xlint:unchecked" />
-		</javac>
-		<copy todir="${plugin.build.dir}">
-			<fileset dir="lib" />
-		</copy>
-	</target>
-
-	<!--
-		********************************************************** ** dist -
-		creates the plugin jar
-		**********************************************************
-	-->
-	<target name="dist" depends="compile,revision">
-		<echo message="creating ${ant.project.name}.jar ... " />
-		<copy todir="${plugin.build.dir}/resources">
-			<fileset dir="resources" />
-		</copy>
-		<copy todir="${plugin.build.dir}/images">
-			<fileset dir="images" />
-		</copy>
-		<copy todir="${plugin.build.dir}">
-			<fileset dir=".">
-				<include name="README" />
-				<include name="LICENSE" />
-			</fileset>
-		</copy>
-		<jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-			<!--
-				************************************************ ** configure these
-				properties. Most of them will be copied to the plugins ** manifest
-				file. Property values will also show up in the list available **
-				plugins: http://josm.openstreetmap.de/wiki/Plugins. **
-				************************************************
-			-->
-			<manifest>
-				<attribute name="Author" value="Attila Szász" />
-				<attribute name="Plugin-Class"
-					value="org.openstreetmap.josm.plugins.alignways.AlignWaysPlugin" />
-				<attribute name="Plugin-Date" value="${version.entry.commit.date}" />
-				<attribute name="Plugin-Description"
-					value="Makes a pair of selected way segments parallel by rotating one of them around a chosen pivot." />
-				<attribute name="Plugin-Icon" value="images/alignways.png"/>
-				<attribute name="Plugin-Mainversion" value="${plugin.main.version}" />
-				<attribute name="Plugin-Version" value="${version.entry.commit.revision}" />
-				<attribute name="Plugin-Link"
-					value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/AlignWayS" />
-			</manifest>
-		</jar>
-	</target>
-
-	<!--
-		********************************************************** ** revision
-		- extracts the current revision number for the ** file build.number
-		and stores it in the XML property ** version.*
-		**********************************************************
-	-->
-	<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>
-
-	<!--
-		********************************************************** ** clean -
-		clean up the build environment
-		**********************************************************
-	-->
-	<target name="clean">
-		<delete dir="${plugin.build.dir}" />
-		<delete file="${plugin.jar}" />
-	</target>
-
-	<!--
-		********************************************************** ** install
-		- install the plugin in your local JOSM installation
-		**********************************************************
-	-->
-	<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>
-
-
-	<!--
-		************************** Publishing the plugin
-		***********************************
-	-->
-	<!--
-		** extracts the JOSM release for the JOSM version in ../core and saves
-		it in the ** property ${coreversion.info.entry.revision} **
-	-->
-	<target name="core-info">
-		<exec append="false" output="core.info.xml" executable="svn"
-			failifexecutionfails="false">
-			<env key="LANG" value="C" />
-			<arg value="info" />
-			<arg value="--xml" />
-			<arg value="../../core" />
-		</exec>
-		<xmlproperty file="core.info.xml" prefix="coreversion"
-			keepRoot="true" collapseAttributes="true" />
-		<echo>Building against core revision
-			${coreversion.info.entry.revision}.</echo>
-		<echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
-		<delete file="core.info.xml" />
-	</target>
-
-	<!--
-		** commits the source tree for this plugin
-		-->
-	<target name="commit-current">
-		<echo>Commiting the plugin source with message '${commit.message}' ...</echo>
-		<exec append="true" output="svn.log" executable="svn"
-			failifexecutionfails="false">
-			<env key="LANG" value="C" />
-			<arg value="commit" />
-			<arg value="-m '${commit.message}'" />
-			<arg value="." />
-		</exec>
-	</target>
-
-	<!--
-		** updates (svn up) the source tree for this plugin
-		-->
-	<target name="update-current">
-		<echo>Updating plugin source ...</echo>
-		<exec append="true" output="svn.log" executable="svn"
-			failifexecutionfails="false">
-			<env key="LANG" value="C" />
-			<arg value="up" />
-			<arg value="." />
-		</exec>
-		<echo>Updating ${plugin.jar} ...</echo>
-		<exec append="true" output="svn.log" executable="svn"
-			failifexecutionfails="false">
-			<env key="LANG" value="C" />
-			<arg value="up" />
-			<arg value="../dist/${plugin.jar}" />
-		</exec>
-	</target>
-
-	<!--
-		** commits the plugin.jar
-		-->
-	<target name="commit-dist">
-		<echo>
-			***** Properties of published ${plugin.jar} *****
-			Commit message
-			: '${commit.message}'
-			Plugin-Mainversion: ${plugin.main.version}
-			JOSM
-			build version: ${coreversion.info.entry.revision}
-			Plugin-Version :
-			${version.entry.commit.revision}
-			***** / Properties of published
-			${plugin.jar} *****
-
-			Now commiting ${plugin.jar} ...
-	</echo>
-		<exec append="true" output="svn.log" executable="svn"
-			failifexecutionfails="false">
-			<env key="LANG" value="C" />
-			<arg value="-m '${commit.message}'" />
-			<arg value="commit" />
-			<arg value="${plugin.jar}" />
-		</exec>
-	</target>
-
-	<!-- ** make sure svn is present as a command line tool ** -->
-	<target name="ensure-svn-present">
-		<exec append="true" output="svn.log" executable="svn"
-			failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
-			<env key="LANG" value="C" />
-			<arg value="--version" />
-		</exec>
-		<fail
-			message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
-			<!-- return code not set at all? Most likely svn isn't installed -->
-			<condition>
-				<not>
-					<isset property="svn.exit.code" />
-				</not>
-			</condition>
-		</fail>
-		<fail
-			message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
-			<!--
-				error code from SVN? Most likely svn is not what we are looking on
-				this system
-			-->
-			<condition>
-				<isfailure code="${svn.exit.code}" />
-			</condition>
-		</fail>
-	</target>
-
-	<target name="publish"
-		depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
-	</target>
+            Now commiting ${plugin.jar} ...
+    </echo>
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="-m '${commit.message}'"/>
+            <arg value="commit"/>
+            <arg value="${plugin.jar}"/>
+        </exec>
+    </target>
+    <!-- ** make sure svn is present as a command line tool ** -->
+    <target name="ensure-svn-present">
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+            <env key="LANG" value="C"/>
+            <arg value="--version"/>
+        </exec>
+        <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+            <!-- return code not set at all? Most likely svn isn't installed -->
+            <condition>
+                <not>
+                    <isset property="svn.exit.code"/>
+                </not>
+            </condition>
+        </fail>
+        <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+            <!--
+                error code from SVN? Most likely svn is not what we are looking on
+                this system
+            -->
+            <condition>
+                <isfailure code="${svn.exit.code}"/>
+            </condition>
+        </fail>
+    </target>
+    <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+    </target>
 </project>