Changeset 31677 in osm for applications


Ignore:
Timestamp:
2015-10-25T01:09:59+02:00 (9 years ago)
Author:
donvip
Message:

[joms_plugins] use apache-commons plugin

Location:
applications/editors/josm/plugins
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed

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

    r31465 r31677  
    1010        <classpathentry kind="lib" path="lib/httpcore-4.4.1.jar"/>
    1111        <classpathentry kind="lib" path="lib/httpmime-4.5.jar"/>
    12         <classpathentry combineaccessrules="false" kind="src" path="/JOSM-commons-imaging"/>
     12        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-commons"/>
    1313        <classpathentry kind="output" path="bin"/>
    1414</classpath>

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

    r31550 r31677  
    1212    <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/Mapillary"/>
    1313    <!--<property name="plugin.early" value="..."/>-->
    14     <property name="plugin.requires" value="commons-imaging"/>
     14    <property name="plugin.requires" value="apache-commons"/>
    1515    <!--<property name="plugin.stage" value="..."/>-->
    1616   
    … …  
    2323   
    2424    <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
    25         <include name="commons-imaging.jar"/>
     25        <include name="apache-commons.jar"/>
    2626    </fileset>
    2727</project>

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

    r30550 r31677  
    1616        <classpathentry kind="src" path="util"/>
    1717        <classpathentry kind="src" path="test/unit"/>
    18         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
    1918        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    2019        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-utilsplugin2"/>
    … …  
    2221        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>
    2322        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
     23        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
     24                <attributes>
     25                        <attribute name="owner.project.facets" value="java"/>
     26                </attributes>
     27        </classpathentry>
     28        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-commons"/>
    2429        <classpathentry kind="output" path="bin"/>
    2530</classpath>

  • applications/editors/josm/plugins/opendata/.settings/org.sonar.ide.eclipse.core.prefs

    r30731 r31677  
    11eclipse.preferences.version=1
    22extraProperties=sonar.sources\=src,modules/*/src\r\nsonar.tests\=test/functional,test/performance,test/unit\r\nsonar.exclusions\=includes/**/*.java
    3 lastAnalysisDate=1413638065029
     3lastAnalysisDate=1438388786000
    44projectKey=josm-plugins
    5 serverUrl=http\://donvip.fr/sonar
     5serverUrl=https\://josm.openstreetmap.de/sonar
    66version=2

  • applications/editors/josm/plugins/opendata/README

    r29679 r31677  
    2020    - org/apache: three Apache COTS (Apache License 2.0, see LICENSE-2.0.txt)
    2121        - commons/collections: Apache Commons Collections 3.2.1 (used by jOpenDocument)
    22         - commons/lang3: Apache Commons Lang 3.1 (stuff related to WordUtils, used by the plugin itself)
    2322        - poi: Apache POI 3.7 (Excel format support without styles, formulas and writing capabilities, used by the plugin itself)
    2423    - org/j7zip: J7zip 4.43alpha2 (7z archive read support, LGPL v2.1, see LGPL-2.1.txt)

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

    r31655 r31677  
    88    <property name="plugin.canloadatruntime" value="true"/>
    99    <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/OpenData"/>
    10     <property name="plugin.requires" value="jts;geotools;utilsplugin2"/>
     10    <property name="plugin.requires" value="apache-commons;jts;geotools;utilsplugin2"/>
    1111
    1212    <!-- ** include targets that all plugins have in common ** -->
    … …  
    1414   
    1515    <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
     16        <include name="apache-commons.jar"/>
    1617        <include name="jts.jar"/>
    1718        <include name="geotools.jar"/>
    … …  
    1920    </fileset>
    2021
     22    <property name="apache-commons" location="${plugin.dist.dir}/apache-commons.jar"/>
    2123    <property name="jts" location="${plugin.dist.dir}/jts.jar"/>
    2224    <property name="geotools" location="${plugin.dist.dir}/geotools.jar"/>
    2325   
    24     <!--
    25     **********************************************************
    26     ** compile_lang3 - compiles Apache Commons Lang 3 needed classes
    27     **********************************************************
    28     -->
    29     <target name="compile_lang3" depends="init">
    30         <echo message="compiling Apache Commons Lang 3 ... "/>
    31         <javac srcdir="includes/org/apache/commons/lang3" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" />
    32     </target>
    3326    <!--
    3427    **********************************************************
    … …  
    8679    **********************************************************
    8780    -->
    88     <target name="compile" depends="init, compile_lang3, compile_poi, compile_jopendoc, compile_neptune, compile_j7zip">
     81    <target name="compile" depends="init, compile_poi, compile_jopendoc, compile_neptune, compile_j7zip">
    8982        <echo message="compiling sources for ${plugin.jar} ... "/>
    9083        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8">
    … …  
    9285                <pathelement path="${plugin.build.dir}"/>
    9386                <pathelement location="${josm}"/>
     87                <pathelement location="${apache-commons}"/>
    9488                <pathelement location="${jts}"/>
    9589                <pathelement location="${geotools}"/>

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

    r31204 r31677  
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
    55        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    6         <classpathentry combineaccessrules="false" kind="src" path="/JOSM-commons-imaging"/>
     6        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-commons"/>
    77        <classpathentry kind="output" path="bin"/>
    88</classpath>

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

    r31204 r31677  
    1313    <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/Photo_Geotagging"/>
    1414    <property name="plugin.canloadatruntime" value="true"/>
    15     <property name="plugin.requires" value="commons-imaging"/>
     15    <property name="plugin.requires" value="apache-commons"/>
    1616
    1717    <!-- ** include targets that all plugins have in common ** -->
    … …  
    1919
    2020    <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
    21         <include name="commons-imaging.jar"/>
     21        <include name="apache-commons.jar"/>
    2222    </fileset>
    2323
Note: See TracChangeset for help on using the changeset viewer.