Changeset 32813 in osm for applications/editors


Ignore:
Timestamp:
2016-08-15T12:27:29+02:00 (8 years ago)
Author:
donvip
Message:

update to geotools 15.1

Location:
applications/editors/josm/plugins/geotools
Files:
24 added
21 deleted
9 edited

Legend:

Unmodified
Added
Removed

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

    r32680 r32813  
    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-14.1.jar">
     8        <classpathentry exported="true" kind="lib" path="lib/gt-api-15.1.jar">
    99                <attributes>
    1010                        <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
    1111                </attributes>
    1212        </classpathentry>
    13         <classpathentry exported="true" kind="lib" path="lib/gt-coverage-14.1.jar">
     13        <classpathentry exported="true" kind="lib" path="lib/gt-coverage-15.1.jar">
    1414                <attributes>
    1515                        <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
    1616                </attributes>
    1717        </classpathentry>
    18         <classpathentry exported="true" kind="lib" path="lib/gt-data-14.1.jar">
     18        <classpathentry exported="true" kind="lib" path="lib/gt-data-15.1.jar">
    1919                <attributes>
    2020                        <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
    2121                </attributes>
    2222        </classpathentry>
    23         <classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-14.1.jar">
     23        <classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-15.1.jar">
    2424                <attributes>
    2525                        <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
    2626                </attributes>
    2727        </classpathentry>
    28         <classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-14.1.jar">
     28        <classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-15.1.jar">
    2929                <attributes>
    3030                        <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
    3131                </attributes>
    3232        </classpathentry>
    33         <classpathentry exported="true" kind="lib" path="lib/gt-geotiff-14.1.jar">
     33        <classpathentry exported="true" kind="lib" path="lib/gt-geotiff-15.1.jar">
    3434                <attributes>
    3535                        <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
    3636                </attributes>
    3737        </classpathentry>
    38         <classpathentry exported="true" kind="lib" path="lib/gt-main-14.1.jar">
     38        <classpathentry exported="true" kind="lib" path="lib/gt-main-15.1.jar">
    3939                <attributes>
    4040                        <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
    4141                </attributes>
    4242        </classpathentry>
    43         <classpathentry exported="true" kind="lib" path="lib/gt-metadata-14.1.jar">
     43        <classpathentry exported="true" kind="lib" path="lib/gt-metadata-15.1.jar">
    4444                <attributes>
    4545                        <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
    4646                </attributes>
    4747        </classpathentry>
    48         <classpathentry exported="true" kind="lib" path="lib/gt-opengis-14.1.jar">
     48        <classpathentry exported="true" kind="lib" path="lib/gt-opengis-15.1.jar">
    4949                <attributes>
    5050                        <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
    5151                </attributes>
    5252        </classpathentry>
    53         <classpathentry exported="true" kind="lib" path="lib/gt-referencing-14.1.jar">
     53        <classpathentry exported="true" kind="lib" path="lib/gt-referencing-15.1.jar">
    5454                <attributes>
    5555                        <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
    5656                </attributes>
    5757        </classpathentry>
    58         <classpathentry exported="true" kind="lib" path="lib/gt-shapefile-14.1.jar">
     58        <classpathentry exported="true" kind="lib" path="lib/gt-shapefile-15.1.jar">
    5959                <attributes>
    6060                        <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
    … …  
    6262        </classpathentry>
    6363        <classpathentry exported="true" kind="lib" path="lib/hsqldb-2.3.0.jar"/>
    64         <classpathentry exported="true" kind="lib" path="lib/imageio-ext-geocore-1.1.13.jar"/>
    65         <classpathentry exported="true" kind="lib" path="lib/imageio-ext-streams-1.1.13.jar"/>
    66         <classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.13.jar"/>
    67         <classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.1.13.jar"/>
     64        <classpathentry exported="true" kind="lib" path="lib/imageio-ext-geocore-1.1.15.jar"/>
     65        <classpathentry exported="true" kind="lib" path="lib/imageio-ext-streams-1.1.15.jar"/>
     66        <classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.15.jar"/>
     67        <classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.1.15.jar"/>
    6868        <classpathentry exported="true" kind="lib" path="lib/jai_codec-1.1.3.jar"/>
    6969        <classpathentry exported="true" kind="lib" path="lib/jai_core-1.1.3.jar"/>
    … …  
    7171        <classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
    7272        <classpathentry exported="true" kind="lib" path="lib/jsr-275-1.0-beta-2.jar"/>
    73         <classpathentry exported="true" kind="lib" path="lib/jt-colorconvert-1.0.8.jar"/>
     73        <classpathentry exported="true" kind="lib" path="lib/jt-colorconvert-1.0.9.jar"/>
    7474        <classpathentry exported="true" kind="lib" path="lib/jt-contour-1.4.0.jar"/>
    7575        <classpathentry exported="true" kind="lib" path="lib/jt-rangelookup-1.4.0.jar"/>
    76         <classpathentry exported="true" kind="lib" path="lib/jt-stats-1.0.8.jar"/>
    77         <classpathentry exported="true" kind="lib" path="lib/jt-utilities-1.0.8.jar"/>
     76        <classpathentry exported="true" kind="lib" path="lib/jt-stats-1.0.9.jar"/>
     77        <classpathentry exported="true" kind="lib" path="lib/jt-utilities-1.0.9.jar"/>
    7878        <classpathentry exported="true" kind="lib" path="lib/jt-utils-1.4.0.jar"/>
    7979        <classpathentry exported="true" kind="lib" path="lib/jt-vectorbinarize-1.4.0.jar"/>
    8080        <classpathentry exported="true" kind="lib" path="lib/jt-vectorize-1.4.0.jar"/>
    81         <classpathentry exported="true" kind="lib" path="lib/jt-warp-1.0.8.jar"/>
    82         <classpathentry exported="true" kind="lib" path="lib/jt-zonal-1.0.8.jar"/>
     81        <classpathentry exported="true" kind="lib" path="lib/jt-warp-1.0.9.jar"/>
     82        <classpathentry exported="true" kind="lib" path="lib/jt-zonal-1.0.9.jar"/>
    8383        <classpathentry exported="true" kind="lib" path="lib/jt-zonalstats-1.4.0.jar"/>
    8484        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>

  • applications/editors/josm/plugins/geotools/README

    r31774 r32813  
    44    * Licensed under GPL v3 (see LICENSE)
    55
    6 The current embedded version of GeoTools is 14.1.
     6The current embedded version of GeoTools is 15.1.

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

    r32680 r32813  
    2121        <include name="ejml.jar"/>
    2222    </fileset>
     23
     24    <target name="merge-geotools-services">
     25        <taskdef resource="org/pescuma/mergeservices/antlib.xml" classpath="tools/merge-services.jar" />
     26        <delete dir="jar/META-INF/services"/>
     27        <merge-services dest="jar">
     28            <fileset dir="lib">
     29                <include name="**/*.jar" />
     30                <exclude name="**/*-javadoc.jar" />
     31                <exclude name="**/*-source.jar" />
     32            </fileset>
     33        </merge-services>
     34    </target>
    2335
    2436    <!--
    … …  
    5567                     see http://stackoverflow.com/a/18495658/2257172 -->
    5668            <attribute name="Specification-Title" value="JOSM GeoTools plugin"/>
    57             <attribute name="Specification-Version" value="14.1"/>
     69            <attribute name="Specification-Version" value="15.1"/>
    5870            <attribute name="Specification-Vendor" value="JOSM developers" />
    5971            <attribute name="Implementation-Title" value="org.openstreetmap.josm.plugins.geotools" />
    60             <attribute name="Implementation-Version" value="14.1" />
     72            <attribute name="Implementation-Version" value="15.1" />
    6173            <attribute name="Implementation-Vendor" value="JOSM developers"/>
    6274        </manifest>

  • applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider

    r31599 r32813  
    1313org.geotools.referencing.operation.transform.NTv2Transform$Provider
    1414org.geotools.referencing.operation.transform.SimilarityTransformProvider
    15 org.geotools.referencing.operation.transform.WarpTransform2D$Provider
     15org.geotools.referencing.operation.transform.WarpTransform2DProvider
    1616org.geotools.referencing.operation.projection.EquidistantCylindrical$Provider
    1717org.geotools.referencing.operation.projection.EquidistantCylindrical$SphericalProvider
    … …  
    5454org.geotools.referencing.operation.projection.GeneralOblique$Provider
    5555org.geotools.referencing.operation.projection.MeteosatSG$Provider
     56org.geotools.referencing.operation.projection.GeostationarySatellite$Provider
     57org.geotools.referencing.operation.projection.RotatedPole$Provider

  • applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function

    r31599 r32813  
    1 org.geotools.filter.AreaFunction
     1org.geotools.resources.coverage.FilterFunction_isCoverageorg.geotools.filter.AreaFunction
    22org.geotools.filter.LengthFunction
    33org.geotools.filter.function.CategorizeFunction
    … …  
    174174org.geotools.filter.function.FilterFunction_list
    175175org.geotools.styling.visitor.RescaleToPixelsFunction
    176 org.geotools.resources.coverage.FilterFunction_isCoverage

  • applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory

    r31599 r32813  
    1 #############################
    2 # FROM gt-referencing-14.0.jar
    3 #############################
     1org.geotools.referencing.factory.epsg.UnnamedExtension
     2org.geotools.referencing.factory.epsg.EsriExtension
     3org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
     4# pending review
     5# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
    46org.geotools.referencing.factory.epsg.DefaultFactory
    57org.geotools.referencing.factory.epsg.FactoryUsingWKT
    … …  
    1315# pending review
    1416org.geotools.referencing.factory.epsg.LongitudeFirstEpsgDecorator
    15 
    16 ###########################
    17 # FROM gt-epsg-hsql-14.0.jar
    18 ###########################
    19 org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
    20 # pending review
    21 # org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
    22 
    23 ################################
    24 # FROM gt-epsg-extension-14.0.jar
    25 ################################
    26 org.geotools.referencing.factory.epsg.UnnamedExtension
    27 org.geotools.referencing.factory.epsg.EsriExtension

  • applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.cs.CSAuthorityFactory

    r31599 r32813  
    1 #############################
    2 # FROM gt-referencing-14.0.jar
    3 #############################
     1org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
     2# pending review
     3# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
    44org.geotools.referencing.factory.epsg.DefaultFactory
    55org.geotools.referencing.factory.epsg.LongitudeFirstFactory
    … …  
    99# pending review
    1010org.geotools.referencing.factory.epsg.LongitudeFirstEpsgDecorator
    11 
    12 ###########################
    13 # FROM gt-epsg-hsql-14.0.jar
    14 ###########################
    15 org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
    16 # pending review
    17 # org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator

  • applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.datum.DatumAuthorityFactory

    r31599 r32813  
    1 #############################
    2 # FROM gt-referencing-14.0.jar
    3 #############################
     1org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
     2# pending review
     3# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
    44org.geotools.referencing.factory.epsg.DefaultFactory
    55org.geotools.referencing.factory.epsg.LongitudeFirstFactory
    … …  
    99# pending review
    1010org.geotools.referencing.factory.epsg.LongitudeFirstEpsgDecorator
    11 
    12 ###########################
    13 # FROM gt-epsg-hsql-14.0.jar
    14 ###########################
    15 org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
    16 # pending review
    17 # org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator

  • applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.operation.CoordinateOperationAuthorityFactory

    r31599 r32813  
    1 #############################
    2 # FROM gt-referencing-14.0.jar
    3 #############################
     1org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
     2# pending review
     3# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
    44org.geotools.referencing.factory.epsg.CoordinateOperationFactoryUsingWKT
    55org.geotools.referencing.factory.epsg.DefaultFactory
    … …  
    1010# pending review
    1111org.geotools.referencing.factory.epsg.LongitudeFirstEpsgDecorator
    12 
    13 ###########################
    14 # FROM gt-epsg-hsql-14.0.jar
    15 ###########################
    16 org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
    17 # pending review
    18 # org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
Note: See TracChangeset for help on using the changeset viewer.