[josm/f13/master: 8/8] Merge branch 'master' into f13
Cédric OLIVIER
cquad at fedoraproject.org
Tue Sep 7 20:01:49 UTC 2010
commit a72e697c877d72c11f26a9f767cfa65e3a1612e0
Merge: 7fb2ad7 56a3faa
Author: cquad <cquad at fedoraproject.org>
Date: Tue Sep 7 21:55:33 2010 +0200
Merge branch 'master' into f13
Conflicts:
.gitignore
REVISION.XML
josm-0-add_javadoc.patch
josm-0-disable_oauth.patch
josm-0-remove_metadata-extractor.patch
josm-0-remove_svn_call.patch
josm.spec
sources
josm-0-disable_oauth.patch | 562 ++++++++++++++++++++++----------------------
1 files changed, 281 insertions(+), 281 deletions(-)
---
diff --cc josm-0-disable_oauth.patch
index 3cfaeb5,b16e1a7..11a726c
--- a/josm-0-disable_oauth.patch
+++ b/josm-0-disable_oauth.patch
@@@ -1,572 -1,27 +1,572 @@@
-diff -uNr josm-0-3376-original/build.xml josm-0/build.xml
---- josm-0-3376-original/build.xml 2010-05-08 17:44:45.000000000 +0200
-+++ josm-0/build.xml 2010-07-21 23:00:18.483143707 +0200
-@@ -99,7 +99,6 @@
-
- <!-- All jar files necessary to run only JOSM (no tests) -->
- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
-- <zipfileset src="lib/signpost-core-1.1.jar" />
- </jar>
- </target>
-
-@@ -119,7 +118,8 @@
-
- <target name="compile" depends="init">
- <javac srcdir="src" classpathref="classpath" destdir="build"
-- target="1.5" source="1.5" debug="on" encoding="UTF-8">
-+ target="1.5" source="1.5" debug="on" encoding="UTF-8"
-+ excludes="org/openstreetmap/josm/gui/oauth/,org/openstreetmap/josm/data/oauth/">
- <compilerarg value="-Xlint:deprecation"/>
- <compilerarg value="-Xlint:unchecked"/>
- </javac>
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
---- josm-0-3376-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java 2010-05-15 21:57:19.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java 2010-07-21 23:00:18.484143506 +0200
+diff -uNr josm-0-3514-original/build.xml josm-0/build.xml
+--- josm-0-3514-original/build.xml 2010-09-02 20:01:29.000000000 +0200
++++ josm-0/build.xml 2010-09-07 06:59:40.577824784 +0200
+@@ -1,281 +1,281 @@
- -<!-- ** build.xml - main ant file for JOSM
- -**
- -** To build run
- -** ant clean
- -** ant dist
- -** This will create 'josm-custom.jar' in directory 'dist'. See also
- -** https://josm.openstreetmap.de/wiki/CreateBuild
- -**
- -**
- --->
- -<project name="josm" default="dist" basedir="." xmlns:as="antlib:org.codehaus.mojo.animal_sniffer">
- - <property name="test.dir" value="test" />
- - <property name="src.dir" value="src" />
- - <property name="build.dir" value="build"/>
- - <!-- build parameter: compression level (ant -Dclevel=N)
- - N ranges from 0 (no compression) to 9 (maximum compression)
- - default: 9 -->
- - <condition property="clevel" value="${clevel}" else="9">
- - <isset property="clevel" />
- - </condition>
- -
- - <!-- Java classpath addition (all jar files to compile tests with this) -->
- - <path id="classpath">
- - <fileset dir="lib">
- - <include name="**/*.jar"/>
- - </fileset>
- - </path>
- -
- -
- - <!--
- - ** Used by Eclipse ant builder for updating
- - ** the REVISION file used by JOSM
- - -->
- - <target name="create-revision-eclipse">
- - <copy file="styles/standard/elemstyles.xml" todir="data"/>
- - <property name="revision.dir" value="bin"/>
- - <antcall target="create-revision" />
- - </target>
- -
- - <!--
- - ** Creates the REVISION file to be included in the distribution
- - -->
- - <target name="create-revision">
- - <property name="revision.dir" value="${build.dir}"/>
- - <exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false">
- - <env key="LANG" value="C"/>
- - <arg value="info"/>
- - <arg value="--xml"/>
- - <arg value="."/>
- - </exec>
- - <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
- - <delete file="REVISION.XML" />
- - <tstamp>
- - <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
- - </tstamp>
- -
- - <property name="version.entry.commit.revision" value="UNKNOWN"/>
- - <mkdir dir="${revision.dir}" />
- - <echo file="${revision.dir}/REVISION">
- -# automatically generated by JOSM build.xml - do not edit
- -Revision: ${version.entry.commit.revision}
- -Is-Local-Build: true
- -Build-Date: ${build.tstamp}
- -</echo>
- - </target>
- -
- -
- - <target name="dist" depends="compile,create-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"/>
- - <property name="version.entry.commit.revision" value="UNKNOWN"/>
- - <property name="version.entry.commit.date" value="UNKNOWN"/>
- - <echo>Revision ${version.entry.commit.revision}</echo>
- - <copy file="CONTRIBUTION" todir="build"/>
- - <copy file="README" todir="build"/>
- - <copy file="LICENSE" todir="build"/>
- -
- - <!-- styles -->
- - <copy file="styles/standard/elemstyles.xml" todir="build/data"/>
- -
- - <!-- create josm-custom.jar -->
- - <delete file="dist/josm-custom.jar"/>
- - <jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}">
- - <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
- - <manifest>
- - <attribute name="Main-class" value="JOSM" />
- - <attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/>
- - <attribute name="Main-Date" value="${version.entry.commit.date}"/>
- - </manifest>
- - <zipfileset dir="images" prefix="images" />
- - <zipfileset dir="data" prefix="data" />
- -
- - <!-- All jar files necessary to run only JOSM (no tests) -->
- - <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
- - <zipfileset src="lib/signpost-core-1.2.1.1.jar" />
- - </jar>
- - </target>
- -
- - <target name="distmac" depends="dist">
- - <!-- modify MacOS X Info.plist file to hold the SVN version number -->
- - <copy file="macosx/JOSM.app/Contents/Info.plist" todir="build"/>
- - <replace file="build/Info.plist" token="@SVNVersion@" value="${version.entry.commit.revision}"/>
- - <!-- create ZIP file with MacOS X application bundle -->
- - <zip destfile="dist/josm-custom-macosx.zip" update="true">
- - <zipfileset dir="build" includes="CONTRIBUTION README LICENSE"/>
- - <zipfileset dir="macosx" includes="JOSM.app/Contents JOSM.app/Contents/MacOS JOSM.app/Contents/Resources JOSM.app/Contents/Resources/Java JOSM.app/Contents/PkgInfo JOSM.app/Contents/Resources/JOSM.icns"/>
- - <zipfileset dir="build" includes="Info.plist" prefix="JOSM.app/Contents"/>
- - <zipfileset dir="dist" includes="josm-custom.jar" prefix="JOSM.app/Contents/Resources/Java"/>
- - <zipfileset dir="macosx" includes="JOSM.app/Contents/MacOS/JOSM" filemode="755"/>
- - </zip>
- - </target>
- -
- - <target name="compile" depends="init">
- - <javac srcdir="src" classpathref="classpath" destdir="build"
- - target="1.5" source="1.5" debug="on" encoding="UTF-8">
- - <compilerarg value="-Xlint:deprecation"/>
- - <compilerarg value="-Xlint:unchecked"/>
- - </javac>
- - </target>
- -
- - <target name="init">
- - <mkdir dir="build" />
- - <mkdir dir="dist" />
- - </target>
- -
- - <target name="clean">
- - <delete dir="build" />
- - <delete dir="dist" />
- - </target>
- -
- - <path id="test.classpath">
- - <fileset dir="${test.dir}/lib">
- - <include name="**/*.jar"/>
- - </fileset>
- - <fileset dir="lib">
- - <include name="**/*.jar"/>
- - </fileset>
- - </path>
- -
- - <target name="test-init">
- - <mkdir dir="${test.dir}/${build.dir}" />
- - <mkdir dir="${test.dir}/report" />
- - </target>
- -
- - <target name="test-clean">
- - <delete dir="${test.dir}/${build.dir}"/>
- - <delete dir="${test.dir}/report"/>
- - </target>
- -
- - <target name="test-compile" depends="test-init">
- - <javac srcdir="${src.dir}:${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
- - target="1.5" source="1.5" debug="on" encoding="UTF-8">
- - <compilerarg value="-Xlint:deprecation"/>
- - <compilerarg value="-Xlint:unchecked"/>
- - </javac>
- - <javac srcdir="${src.dir}:${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
- - target="1.5" source="1.5" debug="on" encoding="UTF-8">
- - <compilerarg value="-Xlint:deprecation"/>
- - <compilerarg value="-Xlint:unchecked"/>
- - </javac>
- - </target>
- -
- - <target name="test" depends="test-compile">
- - <junit printsummary="yes">
- - <sysproperty key="josm.home" value="${test.dir}/config/unit-josm.home"/>
- - <classpath>
- - <path refid="test.classpath"/>
- - <pathelement path="${test.dir}/${build.dir}"/>
- - <pathelement path="${test.dir}/config"/>
- - </classpath>
- - <formatter type="plain"/>
- - <formatter type="xml"/>
- - <batchtest fork="yes" todir="${test.dir}/report">
- - <fileset dir="${test.dir}/unit" includes="**/*.java"/>
- - </batchtest>
- - </junit>
- - </target>
- -
- - <target name="dist-optimized" depends="dist">
- - <taskdef resource="proguard/ant/task.properties" classpath="tools/proguard.jar" />
- - <proguard>
- - -injars dist/josm-custom.jar
- - -outjars dist/josm-custom-optimized.jar
- -
- - -libraryjars ${java.home}/lib/rt.jar
- - -libraryjars ${java.home}/lib/jce.jar
- -
- - -dontoptimize
- - -dontobfuscate
- -
- - -dontskipnonpubliclibraryclasses
- -
- - -keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplication {
- - public static void main(java.lang.String[]);
- - }
- -
- - -keep class JOSM
- - -keep class * extends org.openstreetmap.josm.io.FileImporter
- - -keep class * extends org.openstreetmap.josm.io.FileExporter
- - -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
- -
- - -keepclassmembers enum * {
- - public static **[] values();
- - public static ** valueOf(java.lang.String);
- - }
- -
- - -keepclassmembers class * {
- - public protected *;
- - }
- - </proguard>
- - </target>
- -
- - <target name="check-plugins" depends="dist-optimized">
- - <echo message="Check of plugins binary compatibility (needs ant 1.8)"/>
- -
- - <local name="dir"/>
- - <local name="plugins"/>
- -
- - <property name="dir" value="plugin-check"/>
- -
- - <typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
- - <classpath path="tools/animal-sniffer-ant-tasks-1.5.jar" />
- - </typedef>
- -
- - <delete dir="${dir}"/>
- -
- - <mkdir dir="${dir}"/>
- -
- - <as:build-signatures destfile="${dir}/api.sig">
- - <path>
- - <fileset file="dist/josm-custom-optimized.jar" />
- - <fileset file="${java.home}/lib/rt.jar" />
- - </path>
- - </as:build-signatures>
- -
- - <!-- Download plugins -->
- - <loadresource property="plugins">
- - <url url="http://josm.openstreetmap.de/plugin"/>
- - <filterchain>
- - <linecontainsregexp negate="true">
- - <regexp pattern="^\t.*"/>
- - </linecontainsregexp>
- - <linecontainsregexp negate="true">
- - <!-- List from PluginHandler.DEPRECATED_PLUGINS -->
- - <regexp pattern="mappaint|unglueplugin|ewmsplugin|ywms|tways-0.2|geotagged|landsat|namefinder|waypoints|slippy_map_chooser|tcx-support|usertools|AgPifoJ|utilsplugin"/>
- - </linecontainsregexp>
- - <tokenfilter>
- - <replaceregex pattern="^.*;" replace="" flags="gi"/>
- - </tokenfilter>
- - </filterchain>
- - </loadresource>
- -
- - <copy todir="${dir}" flatten="true">
- - <resourcelist>
- - <string value="${plugins}"/>
- - </resourcelist>
- - </copy>
- -
- - <!-- Check plugins -->
- - <as:check-signature signature="${dir}/api.sig">
- - <ignore classname="org.jgraph.*"/>
- - <ignore classname="com.touchgraph.*"/>
- - <ignore classname="com.sun.xml.fastinfoset.*"/>
- - <ignore classname="javax.jms.*"/>
- - <ignore classname="org.jvnet.staxex.*"/>
- - <ignore classname="javax.mail.*"/>
- - <ignore classname="com.sun.jdmk.*"/>
- - <path path="${dir}"/>
- - </as:check-signature>
- -
- - </target>
- -
- -
- -</project>
++-<!-- ** build.xml - main ant file for JOSM
++-**
++-** To build run
++-** ant clean
++-** ant dist
++-** This will create 'josm-custom.jar' in directory 'dist'. See also
++-** https://josm.openstreetmap.de/wiki/CreateBuild
++-**
++-**
++--->
++-<project name="josm" default="dist" basedir="." xmlns:as="antlib:org.codehaus.mojo.animal_sniffer">
++- <property name="test.dir" value="test" />
++- <property name="src.dir" value="src" />
++- <property name="build.dir" value="build"/>
++- <!-- build parameter: compression level (ant -Dclevel=N)
++- N ranges from 0 (no compression) to 9 (maximum compression)
++- default: 9 -->
++- <condition property="clevel" value="${clevel}" else="9">
++- <isset property="clevel" />
++- </condition>
++-
++- <!-- Java classpath addition (all jar files to compile tests with this) -->
++- <path id="classpath">
++- <fileset dir="lib">
++- <include name="**/*.jar"/>
++- </fileset>
++- </path>
++-
++-
++- <!--
++- ** Used by Eclipse ant builder for updating
++- ** the REVISION file used by JOSM
++- -->
++- <target name="create-revision-eclipse">
++- <copy file="styles/standard/elemstyles.xml" todir="data"/>
++- <property name="revision.dir" value="bin"/>
++- <antcall target="create-revision" />
++- </target>
++-
++- <!--
++- ** Creates the REVISION file to be included in the distribution
++- -->
++- <target name="create-revision">
++- <property name="revision.dir" value="${build.dir}"/>
++- <exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false">
++- <env key="LANG" value="C"/>
++- <arg value="info"/>
++- <arg value="--xml"/>
++- <arg value="."/>
++- </exec>
++- <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
++- <delete file="REVISION.XML" />
++- <tstamp>
++- <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
++- </tstamp>
++-
++- <property name="version.entry.commit.revision" value="UNKNOWN"/>
++- <mkdir dir="${revision.dir}" />
++- <echo file="${revision.dir}/REVISION">
++-# automatically generated by JOSM build.xml - do not edit
++-Revision: ${version.entry.commit.revision}
++-Is-Local-Build: true
++-Build-Date: ${build.tstamp}
++-</echo>
++- </target>
++-
++-
++- <target name="dist" depends="compile,create-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"/>
++- <property name="version.entry.commit.revision" value="UNKNOWN"/>
++- <property name="version.entry.commit.date" value="UNKNOWN"/>
++- <echo>Revision ${version.entry.commit.revision}</echo>
++- <copy file="CONTRIBUTION" todir="build"/>
++- <copy file="README" todir="build"/>
++- <copy file="LICENSE" todir="build"/>
++-
++- <!-- styles -->
++- <copy file="styles/standard/elemstyles.xml" todir="build/data"/>
++-
++- <!-- create josm-custom.jar -->
++- <delete file="dist/josm-custom.jar"/>
++- <jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}">
++- <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
++- <manifest>
++- <attribute name="Main-class" value="JOSM" />
++- <attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/>
++- <attribute name="Main-Date" value="${version.entry.commit.date}"/>
++- </manifest>
++- <zipfileset dir="images" prefix="images" />
++- <zipfileset dir="data" prefix="data" />
++-
++- <!-- All jar files necessary to run only JOSM (no tests) -->
++- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
++- <zipfileset src="lib/signpost-core-1.2.1.1.jar" />
++- </jar>
++- </target>
++-
++- <target name="distmac" depends="dist">
++- <!-- modify MacOS X Info.plist file to hold the SVN version number -->
++- <copy file="macosx/JOSM.app/Contents/Info.plist" todir="build"/>
++- <replace file="build/Info.plist" token="@SVNVersion@" value="${version.entry.commit.revision}"/>
++- <!-- create ZIP file with MacOS X application bundle -->
++- <zip destfile="dist/josm-custom-macosx.zip" update="true">
++- <zipfileset dir="build" includes="CONTRIBUTION README LICENSE"/>
++- <zipfileset dir="macosx" includes="JOSM.app/Contents JOSM.app/Contents/MacOS JOSM.app/Contents/Resources JOSM.app/Contents/Resources/Java JOSM.app/Contents/PkgInfo JOSM.app/Contents/Resources/JOSM.icns"/>
++- <zipfileset dir="build" includes="Info.plist" prefix="JOSM.app/Contents"/>
++- <zipfileset dir="dist" includes="josm-custom.jar" prefix="JOSM.app/Contents/Resources/Java"/>
++- <zipfileset dir="macosx" includes="JOSM.app/Contents/MacOS/JOSM" filemode="755"/>
++- </zip>
++- </target>
++-
++- <target name="compile" depends="init">
++- <javac srcdir="src" classpathref="classpath" destdir="build"
++- target="1.5" source="1.5" debug="on" encoding="UTF-8">
++- <compilerarg value="-Xlint:deprecation"/>
++- <compilerarg value="-Xlint:unchecked"/>
++- </javac>
++- </target>
++-
++- <target name="init">
++- <mkdir dir="build" />
++- <mkdir dir="dist" />
++- </target>
++-
++- <target name="clean">
++- <delete dir="build" />
++- <delete dir="dist" />
++- </target>
++-
++- <path id="test.classpath">
++- <fileset dir="${test.dir}/lib">
++- <include name="**/*.jar"/>
++- </fileset>
++- <fileset dir="lib">
++- <include name="**/*.jar"/>
++- </fileset>
++- </path>
++-
++- <target name="test-init">
++- <mkdir dir="${test.dir}/${build.dir}" />
++- <mkdir dir="${test.dir}/report" />
++- </target>
++-
++- <target name="test-clean">
++- <delete dir="${test.dir}/${build.dir}"/>
++- <delete dir="${test.dir}/report"/>
++- </target>
++-
++- <target name="test-compile" depends="test-init">
++- <javac srcdir="${src.dir}:${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
++- target="1.5" source="1.5" debug="on" encoding="UTF-8">
++- <compilerarg value="-Xlint:deprecation"/>
++- <compilerarg value="-Xlint:unchecked"/>
++- </javac>
++- <javac srcdir="${src.dir}:${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
++- target="1.5" source="1.5" debug="on" encoding="UTF-8">
++- <compilerarg value="-Xlint:deprecation"/>
++- <compilerarg value="-Xlint:unchecked"/>
++- </javac>
++- </target>
++-
++- <target name="test" depends="test-compile">
++- <junit printsummary="yes">
++- <sysproperty key="josm.home" value="${test.dir}/config/unit-josm.home"/>
++- <classpath>
++- <path refid="test.classpath"/>
++- <pathelement path="${test.dir}/${build.dir}"/>
++- <pathelement path="${test.dir}/config"/>
++- </classpath>
++- <formatter type="plain"/>
++- <formatter type="xml"/>
++- <batchtest fork="yes" todir="${test.dir}/report">
++- <fileset dir="${test.dir}/unit" includes="**/*.java"/>
++- </batchtest>
++- </junit>
++- </target>
++-
++- <target name="dist-optimized" depends="dist">
++- <taskdef resource="proguard/ant/task.properties" classpath="tools/proguard.jar" />
++- <proguard>
++- -injars dist/josm-custom.jar
++- -outjars dist/josm-custom-optimized.jar
++-
++- -libraryjars ${java.home}/lib/rt.jar
++- -libraryjars ${java.home}/lib/jce.jar
++-
++- -dontoptimize
++- -dontobfuscate
++-
++- -dontskipnonpubliclibraryclasses
++-
++- -keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplication {
++- public static void main(java.lang.String[]);
++- }
++-
++- -keep class JOSM
++- -keep class * extends org.openstreetmap.josm.io.FileImporter
++- -keep class * extends org.openstreetmap.josm.io.FileExporter
++- -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
++-
++- -keepclassmembers enum * {
++- public static **[] values();
++- public static ** valueOf(java.lang.String);
++- }
++-
++- -keepclassmembers class * {
++- public protected *;
++- }
++- </proguard>
++- </target>
++-
++- <target name="check-plugins" depends="dist-optimized">
++- <echo message="Check of plugins binary compatibility (needs ant 1.8)"/>
++-
++- <local name="dir"/>
++- <local name="plugins"/>
++-
++- <property name="dir" value="plugin-check"/>
++-
++- <typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
++- <classpath path="tools/animal-sniffer-ant-tasks-1.5.jar" />
++- </typedef>
++-
++- <delete dir="${dir}"/>
++-
++- <mkdir dir="${dir}"/>
++-
++- <as:build-signatures destfile="${dir}/api.sig">
++- <path>
++- <fileset file="dist/josm-custom-optimized.jar" />
++- <fileset file="${java.home}/lib/rt.jar" />
++- </path>
++- </as:build-signatures>
++-
++- <!-- Download plugins -->
++- <loadresource property="plugins">
++- <url url="http://josm.openstreetmap.de/plugin"/>
++- <filterchain>
++- <linecontainsregexp negate="true">
++- <regexp pattern="^\t.*"/>
++- </linecontainsregexp>
++- <linecontainsregexp negate="true">
++- <!-- List from PluginHandler.DEPRECATED_PLUGINS -->
++- <regexp pattern="mappaint|unglueplugin|ewmsplugin|ywms|tways-0.2|geotagged|landsat|namefinder|waypoints|slippy_map_chooser|tcx-support|usertools|AgPifoJ|utilsplugin"/>
++- </linecontainsregexp>
++- <tokenfilter>
++- <replaceregex pattern="^.*;" replace="" flags="gi"/>
++- </tokenfilter>
++- </filterchain>
++- </loadresource>
++-
++- <copy todir="${dir}" flatten="true">
++- <resourcelist>
++- <string value="${plugins}"/>
++- </resourcelist>
++- </copy>
++-
++- <!-- Check plugins -->
++- <as:check-signature signature="${dir}/api.sig">
++- <ignore classname="org.jgraph.*"/>
++- <ignore classname="com.touchgraph.*"/>
++- <ignore classname="com.sun.xml.fastinfoset.*"/>
++- <ignore classname="javax.jms.*"/>
++- <ignore classname="org.jvnet.staxex.*"/>
++- <ignore classname="javax.mail.*"/>
++- <ignore classname="com.sun.jdmk.*"/>
++- <path path="${dir}"/>
++- </as:check-signature>
++-
++- </target>
++-
++-
++-</project>
++<!-- ** build.xml - main ant file for JOSM
++**
++** To build run
++** ant clean
++** ant dist
++** This will create 'josm-custom.jar' in directory 'dist'. See also
++** https://josm.openstreetmap.de/wiki/CreateBuild
++**
++**
++-->
++<project name="josm" default="dist" basedir="." xmlns:as="antlib:org.codehaus.mojo.animal_sniffer">
++ <property name="test.dir" value="test" />
++ <property name="src.dir" value="src" />
++ <property name="build.dir" value="build"/>
++ <!-- build parameter: compression level (ant -Dclevel=N)
++ N ranges from 0 (no compression) to 9 (maximum compression)
++ default: 9 -->
++ <condition property="clevel" value="${clevel}" else="9">
++ <isset property="clevel" />
++ </condition>
++
++ <!-- Java classpath addition (all jar files to compile tests with this) -->
++ <path id="classpath">
++ <fileset dir="lib">
++ <include name="**/*.jar"/>
++ </fileset>
++ </path>
++
++
++ <!--
++ ** Used by Eclipse ant builder for updating
++ ** the REVISION file used by JOSM
++ -->
++ <target name="create-revision-eclipse">
++ <copy file="styles/standard/elemstyles.xml" todir="data"/>
++ <property name="revision.dir" value="bin"/>
++ <antcall target="create-revision" />
++ </target>
++
++ <!--
++ ** Creates the REVISION file to be included in the distribution
++ -->
++ <target name="create-revision">
++ <property name="revision.dir" value="${build.dir}"/>
++ <exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false">
++ <env key="LANG" value="C"/>
++ <arg value="info"/>
++ <arg value="--xml"/>
++ <arg value="."/>
++ </exec>
++ <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
++ <delete file="REVISION.XML" />
++ <tstamp>
++ <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
++ </tstamp>
++
++ <property name="version.entry.commit.revision" value="UNKNOWN"/>
++ <mkdir dir="${revision.dir}" />
++ <echo file="${revision.dir}/REVISION">
++# automatically generated by JOSM build.xml - do not edit
++Revision: ${version.entry.commit.revision}
++Is-Local-Build: true
++Build-Date: ${build.tstamp}
++</echo>
++ </target>
++
++
++ <target name="dist" depends="compile,create-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"/>
++ <property name="version.entry.commit.revision" value="UNKNOWN"/>
++ <property name="version.entry.commit.date" value="UNKNOWN"/>
++ <echo>Revision ${version.entry.commit.revision}</echo>
++ <copy file="CONTRIBUTION" todir="build"/>
++ <copy file="README" todir="build"/>
++ <copy file="LICENSE" todir="build"/>
++
++ <!-- styles -->
++ <copy file="styles/standard/elemstyles.xml" todir="build/data"/>
++
++ <!-- create josm-custom.jar -->
++ <delete file="dist/josm-custom.jar"/>
++ <jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}">
++ <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
++ <manifest>
++ <attribute name="Main-class" value="JOSM" />
++ <attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/>
++ <attribute name="Main-Date" value="${version.entry.commit.date}"/>
++ </manifest>
++ <zipfileset dir="images" prefix="images" />
++ <zipfileset dir="data" prefix="data" />
++
++ <!-- All jar files necessary to run only JOSM (no tests) -->
++ <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
++ </jar>
++ </target>
++
++ <target name="distmac" depends="dist">
++ <!-- modify MacOS X Info.plist file to hold the SVN version number -->
++ <copy file="macosx/JOSM.app/Contents/Info.plist" todir="build"/>
++ <replace file="build/Info.plist" token="@SVNVersion@" value="${version.entry.commit.revision}"/>
++ <!-- create ZIP file with MacOS X application bundle -->
++ <zip destfile="dist/josm-custom-macosx.zip" update="true">
++ <zipfileset dir="build" includes="CONTRIBUTION README LICENSE"/>
++ <zipfileset dir="macosx" includes="JOSM.app/Contents JOSM.app/Contents/MacOS JOSM.app/Contents/Resources JOSM.app/Contents/Resources/Java JOSM.app/Contents/PkgInfo JOSM.app/Contents/Resources/JOSM.icns"/>
++ <zipfileset dir="build" includes="Info.plist" prefix="JOSM.app/Contents"/>
++ <zipfileset dir="dist" includes="josm-custom.jar" prefix="JOSM.app/Contents/Resources/Java"/>
++ <zipfileset dir="macosx" includes="JOSM.app/Contents/MacOS/JOSM" filemode="755"/>
++ </zip>
++ </target>
++
++ <target name="compile" depends="init">
++ <javac srcdir="src" classpathref="classpath" destdir="build"
++ target="1.5" source="1.5" debug="on" encoding="UTF-8"
++ excludes="org/openstreetmap/josm/gui/oauth/,org/openstreetmap/josm/data/oauth/">
++ <compilerarg value="-Xlint:deprecation"/>
++ <compilerarg value="-Xlint:unchecked"/>
++ </javac>
++ </target>
++
++ <target name="init">
++ <mkdir dir="build" />
++ <mkdir dir="dist" />
++ </target>
++
++ <target name="clean">
++ <delete dir="build" />
++ <delete dir="dist" />
++ </target>
++
++ <path id="test.classpath">
++ <fileset dir="${test.dir}/lib">
++ <include name="**/*.jar"/>
++ </fileset>
++ <fileset dir="lib">
++ <include name="**/*.jar"/>
++ </fileset>
++ </path>
++
++ <target name="test-init">
++ <mkdir dir="${test.dir}/${build.dir}" />
++ <mkdir dir="${test.dir}/report" />
++ </target>
++
++ <target name="test-clean">
++ <delete dir="${test.dir}/${build.dir}"/>
++ <delete dir="${test.dir}/report"/>
++ </target>
++
++ <target name="test-compile" depends="test-init">
++ <javac srcdir="${src.dir}:${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
++ target="1.5" source="1.5" debug="on" encoding="UTF-8">
++ <compilerarg value="-Xlint:deprecation"/>
++ <compilerarg value="-Xlint:unchecked"/>
++ </javac>
++ <javac srcdir="${src.dir}:${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
++ target="1.5" source="1.5" debug="on" encoding="UTF-8">
++ <compilerarg value="-Xlint:deprecation"/>
++ <compilerarg value="-Xlint:unchecked"/>
++ </javac>
++ </target>
++
++ <target name="test" depends="test-compile">
++ <junit printsummary="yes">
++ <sysproperty key="josm.home" value="${test.dir}/config/unit-josm.home"/>
++ <classpath>
++ <path refid="test.classpath"/>
++ <pathelement path="${test.dir}/${build.dir}"/>
++ <pathelement path="${test.dir}/config"/>
++ </classpath>
++ <formatter type="plain"/>
++ <formatter type="xml"/>
++ <batchtest fork="yes" todir="${test.dir}/report">
++ <fileset dir="${test.dir}/unit" includes="**/*.java"/>
++ </batchtest>
++ </junit>
++ </target>
++
++ <target name="dist-optimized" depends="dist">
++ <taskdef resource="proguard/ant/task.properties" classpath="tools/proguard.jar" />
++ <proguard>
++ -injars dist/josm-custom.jar
++ -outjars dist/josm-custom-optimized.jar
++
++ -libraryjars ${java.home}/lib/rt.jar
++ -libraryjars ${java.home}/lib/jce.jar
++
++ -dontoptimize
++ -dontobfuscate
++
++ -dontskipnonpubliclibraryclasses
++
++ -keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplication {
++ public static void main(java.lang.String[]);
++ }
++
++ -keep class JOSM
++ -keep class * extends org.openstreetmap.josm.io.FileImporter
++ -keep class * extends org.openstreetmap.josm.io.FileExporter
++ -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
++
++ -keepclassmembers enum * {
++ public static **[] values();
++ public static ** valueOf(java.lang.String);
++ }
++
++ -keepclassmembers class * {
++ public protected *;
++ }
++ </proguard>
++ </target>
++
++ <target name="check-plugins" depends="dist-optimized">
++ <echo message="Check of plugins binary compatibility (needs ant 1.8)"/>
++
++ <local name="dir"/>
++ <local name="plugins"/>
++
++ <property name="dir" value="plugin-check"/>
++
++ <typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
++ <classpath path="tools/animal-sniffer-ant-tasks-1.5.jar" />
++ </typedef>
++
++ <delete dir="${dir}"/>
++
++ <mkdir dir="${dir}"/>
++
++ <as:build-signatures destfile="${dir}/api.sig">
++ <path>
++ <fileset file="dist/josm-custom-optimized.jar" />
++ <fileset file="${java.home}/lib/rt.jar" />
++ </path>
++ </as:build-signatures>
++
++ <!-- Download plugins -->
++ <loadresource property="plugins">
++ <url url="http://josm.openstreetmap.de/plugin"/>
++ <filterchain>
++ <linecontainsregexp negate="true">
++ <regexp pattern="^\t.*"/>
++ </linecontainsregexp>
++ <linecontainsregexp negate="true">
++ <!-- List from PluginHandler.DEPRECATED_PLUGINS -->
++ <regexp pattern="mappaint|unglueplugin|ewmsplugin|ywms|tways-0.2|geotagged|landsat|namefinder|waypoints|slippy_map_chooser|tcx-support|usertools|AgPifoJ|utilsplugin"/>
++ </linecontainsregexp>
++ <tokenfilter>
++ <replaceregex pattern="^.*;" replace="" flags="gi"/>
++ </tokenfilter>
++ </filterchain>
++ </loadresource>
++
++ <copy todir="${dir}" flatten="true">
++ <resourcelist>
++ <string value="${plugins}"/>
++ </resourcelist>
++ </copy>
++
++ <!-- Check plugins -->
++ <as:check-signature signature="${dir}/api.sig">
++ <ignore classname="org.jgraph.*"/>
++ <ignore classname="com.touchgraph.*"/>
++ <ignore classname="com.sun.xml.fastinfoset.*"/>
++ <ignore classname="javax.jms.*"/>
++ <ignore classname="org.jvnet.staxex.*"/>
++ <ignore classname="javax.mail.*"/>
++ <ignore classname="com.sun.jdmk.*"/>
++ <path path="${dir}"/>
++ </as:check-signature>
++
++ </target>
++
++
++</project>
+diff -uNr josm-0-3514-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
+--- josm-0-3514-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java 2010-05-15 21:57:19.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java 2010-09-07 07:02:20.916949729 +0200
@@ -15,7 +15,7 @@
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.io.ChangesetClosedException;
More information about the scm-commits
mailing list