Changeset 28966 in osm

Timestamp:

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

Author:

donvip

Message:

[josm_routing] Make plugin use log4j plugin

Location:

applications/editors/josm/plugins/routing

Files:

• .classpath (modified) (1 diff)
• .settings (added)
• .settings/org.eclipse.jdt.core.prefs (added)
• build.xml (modified) (2 diffs)
• lib/log4j-1.2.15.jar (deleted)

applications/editors/josm/plugins/routing/.classpath

@@ -3 +3 @@
         <classpathentry kind="src" path="src"/>
         <classpathentry kind="lib" path="lib/jgrapht-jdk1.5.jar"/>
-        <classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-log4j"/>
         <classpathentry kind="output" path="build"/>
 </classpath>

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

@@ -43 +43 @@
         <fileset dir="${plugin.lib.dir}" includes="**/*.jar"/>
         <pathelement path="${josm}"/>
+        <fileset dir="../log4j/lib">
+            <include name="**/*.jar"/>
+        </fileset>
     </path>
     <!--
@@ -89 +92 @@
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
                 <attribute name="Plugin-Stage" value="50"/>
+                <attribute name="Plugin-Requires" value="log4j"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
             <zipfileset src="${plugin.lib.dir}/jgrapht-jdk1.5.jar"/>
-            <zipfileset src="${plugin.lib.dir}/log4j-1.2.15.jar"/>
         </jar>
     </target>