Changeset 29319 in osm


Ignore:
Timestamp:
2013-03-02T22:11:26+01:00 (12 years ago)
Author:
donvip
Message:

[josm_plugins] Update to jts 1.13 and GeoTools 8.7

Location:
applications/editors/josm/plugins
Files:
20 added
14 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/ImportImagePlugin/.classpath

    r28965 r29319  
    66        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-GeoTools"/>
    77        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>
    8         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/commons-beanutils-1.7.0.jar"/>
    9         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/commons-pool-1.5.4.jar"/>
    10         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/hsqldb-1.8.0.7.jar"/>
    11         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/jai_codec-1.1.3.jar"/>
    12         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/jai_core-1.1.3.jar"/>
    13         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/jai_imageio-1.1.jar"/>
    14         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/jdom-1.0.jar"/>
    15         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/jsr-275-1.0-beta-2.jar"/>
    16         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/vecmath-1.3.2.jar"/>
    17         <classpathentry kind="lib" path="/JOSM-jts/lib/jts-1.12.jar"/>
    18         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/gt-api-8.3.jar"/>
    19         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/gt-coverage-8.3.jar"/>
    20         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/gt-epsg-extension-8.3.jar"/>
    21         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/gt-epsg-hsql-8.3.jar"/>
    22         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/gt-geotiff-8.3.jar"/>
    23         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/gt-main-8.3.jar"/>
    24         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/gt-metadata-8.3.jar"/>
    25         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/gt-referencing-8.3.jar"/>
    26         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/imageio-ext-tiff-1.1.5.jar"/>
    27         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/imageio-ext-utilities-1.1.5.jar"/>
    28         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/gt-opengis-8.3.jar"/>
    298        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-log4j"/>
    309        <classpathentry kind="output" path="bin"/>

  • applications/editors/josm/plugins/geotools/.classpath

    r29116 r29319  
    66        <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar"/>
    77        <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
     8        <classpathentry exported="true" kind="lib" path="lib/gt-api-8.7.jar"/>
     9        <classpathentry exported="true" kind="lib" path="lib/gt-coverage-8.7.jar"/>
     10        <classpathentry exported="true" kind="lib" path="lib/gt-data-8.7.jar"/>
     11        <classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-8.7.jar"/>
     12        <classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-8.7.jar"/>
     13        <classpathentry exported="true" kind="lib" path="lib/gt-geotiff-8.7.jar"/>
     14        <classpathentry exported="true" kind="lib" path="lib/gt-main-8.7.jar"/>
     15        <classpathentry exported="true" kind="lib" path="lib/gt-metadata-8.7.jar"/>
     16        <classpathentry exported="true" kind="lib" path="lib/gt-opengis-8.7.jar"/>
     17        <classpathentry exported="true" kind="lib" path="lib/gt-referencing-8.7.jar"/>
     18        <classpathentry exported="true" kind="lib" path="lib/gt-shapefile-8.7.jar"/>
    819        <classpathentry exported="true" kind="lib" path="lib/hsqldb-1.8.0.7.jar"/>
     20        <classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.6.jar"/>
     21        <classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.1.6.jar"/>
    922        <classpathentry exported="true" kind="lib" path="lib/jai_codec-1.1.3.jar"/>
    1023        <classpathentry exported="true" kind="lib" path="lib/jai_core-1.1.3.jar"/>
    … …  
    1225        <classpathentry exported="true" kind="lib" path="lib/jdom-1.0.jar"/>
    1326        <classpathentry exported="true" kind="lib" path="lib/jsr-275-1.0-beta-2.jar"/>
    14         <classpathentry exported="true" kind="lib" path="lib/vecmath-1.3.2.jar"/>
    15         <classpathentry exported="true" kind="lib" path="/JOSM-jts/lib/jts-1.12.jar"/>
    16         <classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.5.jar"/>
    17         <classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.1.5.jar"/>
    1827        <classpathentry exported="true" kind="lib" path="lib/jt-contour-1.3.0.jar"/>
    1928        <classpathentry exported="true" kind="lib" path="lib/jt-rangelookup-1.3.0.jar"/>
    … …  
    2231        <classpathentry exported="true" kind="lib" path="lib/jt-vectorize-1.3.0.jar"/>
    2332        <classpathentry exported="true" kind="lib" path="lib/jt-zonalstats-1.3.0.jar"/>
    24         <classpathentry exported="true" kind="lib" path="lib/gt-api-8.5.jar"/>
    25         <classpathentry exported="true" kind="lib" path="lib/gt-coverage-8.5.jar"/>
    26         <classpathentry exported="true" kind="lib" path="lib/gt-data-8.5.jar"/>
    27         <classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-8.5.jar"/>
    28         <classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-8.5.jar"/>
    29         <classpathentry exported="true" kind="lib" path="lib/gt-geotiff-8.5.jar"/>
    30         <classpathentry exported="true" kind="lib" path="lib/gt-main-8.5.jar"/>
    31         <classpathentry exported="true" kind="lib" path="lib/gt-metadata-8.5.jar"/>
    32         <classpathentry exported="true" kind="lib" path="lib/gt-opengis-8.5.jar"/>
    33         <classpathentry exported="true" kind="lib" path="lib/gt-referencing-8.5.jar"/>
    34         <classpathentry exported="true" kind="lib" path="lib/gt-shapefile-8.5.jar"/>
     33        <classpathentry exported="true" kind="lib" path="lib/vecmath-1.3.2.jar"/>
     34        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>
    3535        <classpathentry kind="output" path="bin"/>
    3636</classpath>

  • applications/editors/josm/plugins/jts/build.xml

    r28945 r29319  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <!--
    3 ** This is a template build file for a JOSM  plugin.
    4 **
    5 ** Maintaining versions
    6 ** ====================
    7 ** see README.template
    8 **
    9 ** Usage
    10 ** =====
    11 ** To build it run
    12 **
    13 **    > ant  dist
    14 **
    15 ** To install the generated plugin locally (in you default plugin directory) run
    16 **
    17 **    > ant  install
    18 **
    19 ** The generated plugin jar is not automatically available in JOSMs plugin configuration
    20 ** dialog. You have to check it in first.
    21 **
    22 ** Use the ant target 'publish' to check in the plugin and make it available to other
    23 ** JOSM users:
    24 **    set the properties commit.message and plugin.main.version
    25 ** and run
    26 **    > ant  publish
    27 **
    28 **
    29 -->
    302<project name="jts" default="dist" basedir=".">
    313    <!-- enter the SVN commit message -->
    … …  
    335    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    346    <property name="plugin.main.version" value="4394"/>
    35     <!-- should not be necessary to change the following properties -->
    36     <property name="josm" location="../../core/dist/josm-custom.jar"/>
    37     <property name="plugin.build.dir" value="build"/>
    38     <property name="plugin.src.dir" value="src"/>
    39     <!-- this is the directory where the plugin jar is copied to -->
    40     <property name="plugin.dist.dir" value="../../dist"/>
    41     <property name="ant.build.javac.target" value="1.6"/>
    42     <property name="ant.build.javac.source" value="1.6"/>
    43     <property name="plugin.dist.dir" value="../../dist"/>
    44     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    45     <!--
    46     **********************************************************
    47     ** init - initializes the build
    48     **********************************************************
    49     -->
    50     <target name="init">
    51         <mkdir dir="${plugin.build.dir}"/>
    52     </target>
    53     <!--
    54     **********************************************************
    55     ** compile - complies the source tree
    56     **********************************************************
    57     -->
    58     <target name="compile" depends="init">
    59         <echo message="compiling sources for  ${plugin.jar} ... "/>
    60         <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
    61             <classpath>
    62                 <pathelement location="${josm}"/>
    63                 <fileset dir="lib">
    64                     <include name="**/*.jar"/>
    65                 </fileset>
    66             </classpath>
    67             <compilerarg value="-Xlint:deprecation"/>
    68             <compilerarg value="-Xlint:unchecked"/>
    69         </javac>
    70     </target>
    71     <!--
    72     **********************************************************
    73     ** dist - creates the plugin jar
    74     **********************************************************
    75     -->
    76     <target name="dist" depends="compile,revision">
    77         <echo message="creating ${ant.project.name}.jar ... "/>
    78         <copy todir="${plugin.build.dir}/images">
    79             <fileset dir="images"/>
    80         </copy>
    81         <copy todir="${plugin.build.dir}/lib">
    82             <fileset dir="lib"/>
    83         </copy>
    84         <copy todir="${plugin.build.dir}">
    85             <fileset dir=".">
    86                 <include name="README"/>
    87                 <include name="LICENSE"/>
    88             </fileset>
    89             <zipfileset src="lib/jts-1.12.jar"/>
    90         </copy>
    91         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    92             <!--
    93             ************************************************
    94             ** configure these properties. Most of them will be copied to the plugins
    95             ** manifest file. Property values will also show up in the list available
    96             ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
    97             **
    98             ************************************************
    99             -->
    100             <manifest>
    101                 <attribute name="Author" value="Josh Doe &lt;josh@joshdoe.com&gt;"/>
    102                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.jts.JTSPlugin"/>
    103                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    104                 <attribute name="Plugin-Description" value="Provides Java Topology Suite (JTS) library and related utilities. Not meant to be installed directly by users, but rather as a dependency for other plugins."/>
    105                 <attribute name="Plugin-Icon" value="images/jts.png"/>
    106                 <!--<attribute name="Plugin-Link" value="http://fixme.com"/>-->
    107                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    108                 <attribute name="Plugin-Stage" value="10"/>
    109                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    110             </manifest>
    111         </jar>
    112     </target>
    113     <!--
    114     **********************************************************
    115     ** revision - extracts the current revision number for the
    116     **    file build.number and stores it in the XML property
    117     **    version.*
    118     **********************************************************
    119     -->
    120     <target name="revision">
    121         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    122             <env key="LANG" value="C"/>
    123             <arg value="info"/>
    124             <arg value="--xml"/>
    125             <arg value="."/>
    126         </exec>
    127         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    128         <delete file="REVISION"/>
    129     </target>
    130     <!--
    131     **********************************************************
    132     ** clean - clean up the build environment
    133     **********************************************************
    134     -->
    135     <target name="clean">
    136         <delete dir="${plugin.build.dir}"/>
    137         <delete file="${plugin.jar}"/>
    138     </target>
    139     <!--
    140     **********************************************************
    141     ** install - install the plugin in your local JOSM installation
    142     **********************************************************
    143     -->
    144     <target name="install" depends="dist">
    145         <property environment="env"/>
    146         <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
    147             <and>
    148                 <os family="windows"/>
    149             </and>
    150         </condition>
    151         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    152     </target>
    153     <!--
    154     ************************** Publishing the plugin ***********************************
    155     -->
    156     <!--
    157     ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    158     ** property ${coreversion.info.entry.revision}
    159     -->
    160     <target name="core-info">
    161         <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
    162             <env key="LANG" value="C"/>
    163             <arg value="info"/>
    164             <arg value="--xml"/>
    165             <arg value="../../core"/>
    166         </exec>
    167         <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
    168         <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
    169         <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
    170         <delete file="core.info.xml"/>
    171     </target>
    172     <!-- commits the source tree for this plugin -->
    173     <target name="commit-current">
    174         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
    175         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    176             <env key="LANG" value="C"/>
    177             <arg value="commit"/>
    178             <arg value="-m '${commit.message}'"/>
    179             <arg value="."/>
    180         </exec>
    181     </target>
    182     <!-- updates (svn up) the source tree for this plugin -->
    183     <target name="update-current">
    184         <echo>Updating plugin source ...</echo>
    185         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    186             <env key="LANG" value="C"/>
    187             <arg value="up"/>
    188             <arg value="."/>
    189         </exec>
    190         <echo>Updating ${plugin.jar} ...</echo>
    191         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    192             <env key="LANG" value="C"/>
    193             <arg value="up"/>
    194             <arg value="../dist/${plugin.jar}"/>
    195         </exec>
    196     </target>
    197     <!-- commits the plugin.jar -->
    198     <target name="commit-dist">
    199         <echo>
    200     ***** Properties of published ${plugin.jar} *****
    201     Commit message    : '${commit.message}'                   
    202     Plugin-Mainversion: ${plugin.main.version}
    203     JOSM build version: ${coreversion.info.entry.revision}
    204     Plugin-Version    : ${version.entry.commit.revision}
    205     ***** / Properties of published ${plugin.jar} *****                   
    206                        
    207     Now commiting ${plugin.jar} ...
    208     </echo>
    209         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    210             <env key="LANG" value="C"/>
    211             <arg value="-m '${commit.message}'"/>
    212             <arg value="commit"/>
    213             <arg value="${plugin.jar}"/>
    214         </exec>
    215     </target>
    216     <!-- make sure svn is present as a command line tool -->
    217     <target name="ensure-svn-present">
    218         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    219             <env key="LANG" value="C"/>
    220             <arg value="--version"/>
    221         </exec>
    222         <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
    223             <!-- return code not set at all? Most likely svn isn't installed -->
    224             <condition>
    225                 <not>
    226                     <isset property="svn.exit.code"/>
    227                 </not>
    228             </condition>
    229         </fail>
    230         <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
    231             <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    232             <condition>
    233                 <isfailure code="${svn.exit.code}"/>
    234             </condition>
    235         </fail>
    236     </target>
    237     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
    238     </target>
     7   
     8    <property name="plugin.author" value="Josh Doe &lt;josh@joshdoe.com&gt;"/>
     9    <property name="plugin.class" value="org.openstreetmap.josm.plugins.jts.JTSPlugin"/>
     10    <property name="plugin.description" value="Provides Java Topology Suite (JTS) library and related utilities. Not meant to be installed directly by users, but rather as a dependency for other plugins."/>
     11    <property name="plugin.icon" value="images/jts.png"/>
     12    <!--<property name="plugin.link" value="..."/>-->
     13    <!--<property name="plugin.early" value="..."/>-->
     14    <property name="plugin.requires" value="jts"/>
     15    <property name="plugin.stage" value="10"/>
     16
     17    <!-- ** include targets that all plugins have in common ** -->
     18    <import file="../build-common.xml"/>
    23919</project>

  • applications/editors/josm/plugins/opendata/.classpath

    r29014 r29319  
    1717        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
    1818        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    19         <classpathentry kind="lib" path="/JOSM/dist/jts.jar"/>
    2019        <classpathentry combineaccessrules="false" kind="src" path="/josm-utilsplugin2"/>
    2120        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-GeoTools"/>
Note: See TracChangeset for help on using the changeset viewer.