Changeset 31677 in osm for applications/editors/josm/plugins/opendata

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/opendata

Files:

• .classpath (modified) (2 diffs)
• .settings/org.sonar.ide.eclipse.core.prefs (modified) (1 diff)
• README (modified) (1 diff)
• build.xml (modified) (5 diffs)
• includes/org/apache/commons/lang3 (deleted)

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

@@ -16 +16 @@
         <classpathentry kind="src" path="util"/>
         <classpathentry kind="src" path="test/unit"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM-utilsplugin2"/>
@@ -22 +21 @@
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>
         <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+                <attributes>
+                        <attribute name="owner.project.facets" value="java"/>
+                </attributes>
+        </classpathentry>
+        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-commons"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

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

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

applications/editors/josm/plugins/opendata/README

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

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

@@ -8 +8 @@
     <property name="plugin.canloadatruntime" value="true"/>
     <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/OpenData"/>
-    <property name="plugin.requires" value="jts;geotools;utilsplugin2"/>
+    <property name="plugin.requires" value="apache-commons;jts;geotools;utilsplugin2"/>
 
     <!-- ** include targets that all plugins have in common ** -->
@@ -14 +14 @@
     
     <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
+        <include name="apache-commons.jar"/>
         <include name="jts.jar"/>
         <include name="geotools.jar"/>
@@ -19 +20 @@
     </fileset>
 
+    <property name="apache-commons" location="${plugin.dist.dir}/apache-commons.jar"/>
     <property name="jts" location="${plugin.dist.dir}/jts.jar"/>
     <property name="geotools" location="${plugin.dist.dir}/geotools.jar"/>
     
-    <!--
-    **********************************************************
-    ** compile_lang3 - compiles Apache Commons Lang 3 needed classes
-    **********************************************************
-    -->
-    <target name="compile_lang3" depends="init">
-        <echo message="compiling Apache Commons Lang 3 ... "/>
-        <javac srcdir="includes/org/apache/commons/lang3" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" />
-    </target>
     <!--
     **********************************************************
@@ -86 +79 @@
     **********************************************************
     -->
-    <target name="compile" depends="init, compile_lang3, compile_poi, compile_jopendoc, compile_neptune, compile_j7zip">
+    <target name="compile" depends="init, compile_poi, compile_jopendoc, compile_neptune, compile_j7zip">
         <echo message="compiling sources for ${plugin.jar} ... "/>
         <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8">
@@ -92 +85 @@
                 <pathelement path="${plugin.build.dir}"/>
                 <pathelement location="${josm}"/>
+                <pathelement location="${apache-commons}"/>
                 <pathelement location="${jts}"/>
                 <pathelement location="${geotools}"/>