From 6677780cffbb2404cc52cab78c46deced35b67b2 Mon Sep 17 00:00:00 2001
From: dev <dev@robertfoss.se>
Date: Tue, 28 Jun 2011 07:20:04 +0000
Subject: [PATCH] Fixed build.

---
 apps/itoopie/build.xml                            | 12 ++++++++----
 apps/itoopie/src/net/i2p/itoopie/TrayManager.java |  7 ++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/apps/itoopie/build.xml b/apps/itoopie/build.xml
index 55f6d6bb9..b4c90ea0b 100644
--- a/apps/itoopie/build.xml
+++ b/apps/itoopie/build.xml
@@ -11,13 +11,14 @@
 
 	<property name="javac.compilerargs" value=""/>
 
+
 	<target name="init">
 		<mkdir dir="${build}"/>
 		<mkdir dir="${build}/${lib}"/>
         <mkdir dir="${build}/${resources}"/>
         <mkdir dir="${build}/${javadoc}"/>
 		<mkdir dir="${dist}"/>
-		<copy todir="${build}/${lib}">
+		<copy todir="${dist}/${lib}">
             <fileset dir="${lib}" />
         </copy>
 	</target>
@@ -36,9 +37,9 @@
             srcdir="${src}" 
 			destdir="${build}">
             <classpath>
-            	<pathelement location="${lib}/json-smart-1.0.6.4.jar" />
+                <pathelement location="${lib}/commons-logging-1.1.1.jar" />
+                <pathelement location="${lib}/json-smart-1.0.6.4.jar" />
             </classpath>
-            <compilerarg line="${javac.compilerargs}" />
 		</javac>
         <copy todir="${build}/${resources}">
             <fileset dir="${resources}" />
@@ -56,6 +57,7 @@
 		<jar basedir="${build}" destfile="${dist}/${jar}">
 			<manifest>
 				<attribute name="Main-Class" value="net.i2p.itoopie.Main"/>
+				<attribute name="Class-Path" value="${lib}/commons-logging-1.1.1.jar ${lib}/json-smart-1.0.6.4.jar" />
 			</manifest>
 		</jar>
 	</target>
@@ -70,7 +72,9 @@
             splitindex="true" 
             windowtitle="itoopie">
             <classpath>
-            	<pathelement location="${lib}/json-smart-1.0.6.4.jar" />
+                <path refid="classpath"/>
+                <pathelement location="${lib}/commons-logging-1.1.1.jar" />
+                <pathelement location="${lib}/json-smart-1.0.6.4.jar" />
             </classpath>
         </javadoc>
     </target>
diff --git a/apps/itoopie/src/net/i2p/itoopie/TrayManager.java b/apps/itoopie/src/net/i2p/itoopie/TrayManager.java
index 6aea5a60b..e2265b1f4 100644
--- a/apps/itoopie/src/net/i2p/itoopie/TrayManager.java
+++ b/apps/itoopie/src/net/i2p/itoopie/TrayManager.java
@@ -9,6 +9,9 @@ import java.awt.Toolkit;
 import java.awt.TrayIcon;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.net.URL;
+
+import javax.swing.ImageIcon;
 import javax.swing.SwingWorker;
 
 import net.i2p.itoopie.i18n.ItoopieTranslator;
@@ -63,7 +66,9 @@ public class TrayManager {
      * @return image used for the tray icon
      */
     private Image getTrayImage() {
-        //URL url = getClass().getResource("/itoopie/resources/images/itoopie.png");
+        URL url = getClass().getResource("/resources/images/itoopie.png");
+        System.out.println("URL"+url.getFile());
+        //Image image = Toolkit.getDefaultToolkit().getImage(url);
         Image image = Toolkit.getDefaultToolkit().getImage("resources/images/itoopie.png");
         return image;
     }