Author: jflesch Date: 2008-02-07 20:46:53 +0000 (Thu, 07 Feb 2008) New Revision: 17678
Added: trunk/apps/Thaw/README.distrib.txt trunk/apps/Thaw/README.txt Removed: trunk/apps/Thaw/readme.txt Modified: trunk/apps/Thaw/src/thaw/core/Main.java trunk/apps/Thaw/src/thaw/plugins/Signatures.java Log: Add a readme explaining how to compile Thaw without including its dependencies in the .jar (will need a build.xml update) Added: trunk/apps/Thaw/README.distrib.txt =================================================================== --- trunk/apps/Thaw/README.distrib.txt (rev 0) +++ trunk/apps/Thaw/README.distrib.txt 2008-02-07 20:46:53 UTC (rev 17678) @@ -0,0 +1,24 @@ +Notes for the people wanting to bundle Thaw in a distribution +============================================================= + +You can specify to ant where it must look for Thaw dependencies: + +% ant \ + -Djmdns.location=[pathToJmdns]/jmdns.jar \ + -Dhsqldb.location=[pathToHsqldb]/hsqldb.jar \ + -Dbouncycastle.location=[pathToBouncyCastle]/BouncyCastle.jar + + +And you can compile a version of Thaw not including all its dependencies +by specifying the target 'jar-nodeps'. + +So in the end, you can use the following line to compile Thaw: + + +% ant \ + -Djmdns.location=[pathToJmdns]/jmdns.jar \ + -Dhsqldb.location=[pathToHsqldb]/hsqldb.jar \ + -Dbouncycastle.location=[pathToBouncyCastle]/BouncyCastle.jar \ + jar-nodeps + +If you use the target "jar-nodeps", the final .jar will be bin/Thaw-light.jar Copied: trunk/apps/Thaw/README.txt (from rev 17547, trunk/apps/Thaw/readme.txt) =================================================================== --- trunk/apps/Thaw/README.txt (rev 0) +++ trunk/apps/Thaw/README.txt 2008-02-07 20:46:53 UTC (rev 17678) @@ -0,0 +1,69 @@ +COPYRIGHT +========= + +Thaw copyright is held by Freenet Project Incorporated. Thaw is +distributed under the GPLv2 license. You can find it in a file called +"gpl.txt" in the folder "licenses". This file is included in every +.jar files of Thaw. + +---------------- + +Thaw, Freenet coffe machine +Copyright (C) 2007 Freenet Project Incorporated + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. + +--------------- + +COMPILATION +=========== + +In order to compile Thaw, you need to obtain the latest version of hsqldb.jar. + +Here is a link to the current (06/11/2006) version of hsqldb: +http://switch.dl.sourceforge.net/sourceforge/hsqldb/hsqldb_1_8_0_4.zip + +Extract the zip, and copy "hsqldb/lib/hsqldb.jar" to "Thaw/lib". + +You need also BouncyCastle: +* Download the provider for the JDK 1.4 +* Rename the file to BouncyCastle.jar +* Put this .jar in lib/ + +and jmDNS: +* download the jar and put it in lib/ +* (expected filename : jmdns.jar) + +To compile: + $ ant + +To build the jar file: + $ ant jar + +To build the javadoc: + $ ant javadoc + + +RUNNING +======= + +With Unix / Linux / etc: +$ cd lib ; java -jar Thaw.jar +or +$ ant run + + +With Windows: +err ... we will see that later ... + Deleted: trunk/apps/Thaw/readme.txt =================================================================== --- trunk/apps/Thaw/readme.txt 2008-02-07 20:23:12 UTC (rev 17677) +++ trunk/apps/Thaw/readme.txt 2008-02-07 20:46:53 UTC (rev 17678) @@ -1,69 +0,0 @@ -COPYRIGHT -========= - -Thaw copyright is held by Freenet Project Incorporated. Thaw is -distributed under the GPLv2 license. You can find it in a file called -"gpl.txt" in the folder "licenses". This file is included in every -.jar files of Thaw. - ----------------- - -Thaw, Freenet coffe machine -Copyright (C) 2007 Freenet Project Incorporated - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. - ---------------- - -COMPILATION -=========== - -In order to compile Thaw, you need to obtain the latest version of hsqldb.jar. - -Here is a link to the current (06/11/2006) version of hsqldb: -http://switch.dl.sourceforge.net/sourceforge/hsqldb/hsqldb_1_8_0_4.zip - -Extract the zip, and copy "hsqldb/lib/hsqldb.jar" to "Thaw/lib". - -You need also BouncyCastle: -* Download the provider for the JDK 1.4 -* Rename the file to BouncyCastle.jar -* Put this .jar in lib/ - -and jmDNS: -* download the jar and put it in lib/ -* (expected filename : jmdns.jar) - -To compile: - $ ant - -To build the jar file: - $ ant jar - -To build the javadoc: - $ ant javadoc - - -RUNNING -======= - -With Unix / Linux / etc: -$ cd lib ; java -jar Thaw.jar -or -$ ant run - - -With Windows: -err ... we will see that later ... - Modified: trunk/apps/Thaw/src/thaw/core/Main.java =================================================================== --- trunk/apps/Thaw/src/thaw/core/Main.java 2008-02-07 20:23:12 UTC (rev 17677) +++ trunk/apps/Thaw/src/thaw/core/Main.java 2008-02-07 20:46:53 UTC (rev 17678) @@ -179,9 +179,9 @@ return; } catch(java.io.IOException e) { - Logger.error(this, "Can't extract '"+src+"' because : "+e.toString()); + Logger.warning(this, "Can't extract '"+src+"' because : "+e.toString()); if (e.getCause() != null) - Logger.error(this, "Cause : "+e.getCause().toString()); + Logger.warning(this, "Cause : "+e.getCause().toString()); e.printStackTrace(); } Modified: trunk/apps/Thaw/src/thaw/plugins/Signatures.java =================================================================== --- trunk/apps/Thaw/src/thaw/plugins/Signatures.java 2008-02-07 20:23:12 UTC (rev 17677) +++ trunk/apps/Thaw/src/thaw/plugins/Signatures.java 2008-02-07 20:46:53 UTC (rev 17678) @@ -1,5 +1,7 @@ package thaw.plugins; +import java.util.Iterator; +import java.util.HashSet; import thaw.core.I18n; import thaw.core.Core; @@ -139,4 +141,22 @@ public javax.swing.ImageIcon getIcon() { return IconBox.identity; } + + + public static interface SignaturesObserver { + public void publicIdentityAdded(Identity i); + public void privateIdentityAdded(Identity i); + public void trustLevelUpdated(Identity i); + /* we never remove identities ? ... hmmmm */ + } + + private static HashSet observers = new HashSet(); + + public void addObserver(SignaturesObserver o) { + + } + + public void removeObserver(SignaturesObserver o) { + + } }
