Changeset 28965 in osm for applications

Timestamp:

2012-11-22T00:17:30+01:00 (12 years ago)

Author:

donvip

Message:

[josm_importimage] Make plugin use log4j plugin

Location:

applications/editors/josm/plugins/ImportImagePlugin

Files:

• .classpath (modified) (2 diffs)
• build.xml (modified) (3 diffs)
• lib/log4j-1.2.17.jar (deleted)

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

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
-        <classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
@@ -28 +27 @@
         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/imageio-ext-utilities-1.1.5.jar"/>
         <classpathentry kind="lib" path="/JOSM-GeoTools/lib/gt-opengis-8.3.jar"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-log4j"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -68 +68 @@
             <classpath>
                 <pathelement location="${josm}"/>
-                <fileset dir="lib">
+                <fileset dir="../log4j/lib">
                     <include name="**/*.jar"/>
                 </fileset>
@@ -91 +91 @@
                 <echo message="creating ${ant.project.name}.jar ... "/>
                 
-        <unjar src="lib/log4j-1.2.17.jar" dest="${plugin.build.dir}"/>
                 <copy todir="${plugin.build.dir}/images">
                         <fileset dir="images"/>
@@ -123 +122 @@
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/ImportImagePlugin"/>
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
-                <attribute name="Plugin-Requires" value="geotools"/>
+                <attribute name="Plugin-Requires" value="log4j, geotools"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
                         </manifest>